Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzwf
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzwf
提交
4968039a
提交
4968039a
编写于
11月 18, 2022
作者:
zhouweidong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.审批日志接口增加historyTask与waitTask节点,返回已办与待办任务信息。
2.审批日志展示辅助功能操作记录。 3.修复辅助功能名称显示问题。 4.流程实例查询支持快速搜索。
上级
2abaeb3b
变更
3
展开全部
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
210 行增加
和
52 行删除
+210
-52
WFProcessInstanceExService.java
...b/core/extensions/service/WFProcessInstanceExService.java
+25
-4
WFCoreService.java
...izlab/core/workflow/extensions/service/WFCoreService.java
+154
-35
WFCoreResource.java
...n/java/cn/ibizlab/api/rest/extensions/WFCoreResource.java
+31
-13
未找到文件。
ibzwf-core/src/main/java/cn/ibizlab/core/extensions/service/WFProcessInstanceExService.java
浏览文件 @
4968039a
...
...
@@ -31,9 +31,6 @@ public class WFProcessInstanceExService extends WFProcessInstanceServiceImpl {
@Autowired
WFCoreService
wfCoreService
;
@Autowired
private
RuntimeService
runtimeService
;
/**
* [Jump:流程跳转] 行为扩展
* @param et
...
...
@@ -48,6 +45,30 @@ public class WFProcessInstanceExService extends WFProcessInstanceServiceImpl {
throw
new
BadRequestException
(
"未传入流程步骤用户"
);
}
String
strSystemId
=
null
;
String
strEntityId
=
null
;
String
strBusinessKey
=
null
;
String
strProcessInstanceBusinessKey
=
et
.
getBusinesskey
();
if
(
StringUtils
.
isEmpty
(
strProcessInstanceBusinessKey
)){
throw
new
BadRequestException
(
"未传入业务标识"
);
}
if
(
strProcessInstanceBusinessKey
.
contains
(
":"
)){
String
[]
arrays
=
strProcessInstanceBusinessKey
.
split
(
":"
);
if
(
arrays
.
length
==
3
){
strSystemId
=
arrays
[
0
];
strEntityId
=
arrays
[
1
];
strBusinessKey
=
arrays
[
2
];
if
(
strBusinessKey
.
indexOf
(
":k-"
)>
0
)
strBusinessKey
=
strBusinessKey
.
split
(
":k-"
)[
1
];
}
}
if
(
StringUtils
.
isEmpty
(
strSystemId
)
||
StringUtils
.
isEmpty
(
strEntityId
)
||
StringUtils
.
isEmpty
(
strBusinessKey
)){
throw
new
BadRequestException
(
"未传入流程参数失败"
);
}
//参数格式转换
Set
<
String
>
userSets
=
new
LinkedHashSet
();
JSONArray
.
parseArray
(
users
.
toString
()).
forEach
(
item
->
{
...
...
@@ -59,7 +80,7 @@ public class WFProcessInstanceExService extends WFProcessInstanceServiceImpl {
});
et
.
set
(
"wfusers"
,
String
.
join
(
","
,
userSets
));
wfCoreService
.
jump
(
et
);
wfCoreService
.
jump
(
strSystemId
,
strEntityId
,
strBusinessKey
,
et
);
return
et
;
}
...
...
ibzwf-core/src/main/java/cn/ibizlab/core/workflow/extensions/service/WFCoreService.java
浏览文件 @
4968039a
此差异已折叠。
点击以展开。
ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/rest/extensions/WFCoreResource.java
浏览文件 @
4968039a
...
...
@@ -158,7 +158,7 @@ public class WFCoreResource
@ApiOperation
(
value
=
"getWayByTaskId"
,
tags
=
{
"WFTaskWay"
},
notes
=
"根据业务主键和当前步骤获取操作路径"
)
@RequestMapping
(
method
=
RequestMethod
.
GET
,
value
=
"/{system}-app-{appname}/{entity}/{businessKey}/tasks/{taskId}/ways"
)
public
ResponseEntity
<
List
<
WFTaskWay
>>
get
t
asklink
(
@PathVariable
(
"system"
)
String
system
,
@PathVariable
(
"appname"
)
String
appname
,
public
ResponseEntity
<
List
<
WFTaskWay
>>
get
T
asklink
(
@PathVariable
(
"system"
)
String
system
,
@PathVariable
(
"appname"
)
String
appname
,
@PathVariable
(
"entity"
)
String
entity
,
@PathVariable
(
"businessKey"
)
String
businessKey
,
@PathVariable
(
"taskId"
)
String
taskId
)
{
List
<
WFTaskWay
>
taskWays
=
wfCoreService
.
getTaskLink
(
system
,
appname
,
entity
,
businessKey
,
taskId
);
...
...
@@ -188,8 +188,11 @@ public class WFCoreResource
@ApiOperation
(
value
=
"sendback"
,
tags
=
{
"sendback"
},
notes
=
"流程步骤回退"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/{system}-app-{appname}/{entity}/{businessKey}/tasks/{taskId}/sendback"
)
public
ResponseEntity
<
Boolean
>
sendback
(
@PathVariable
(
"taskId"
)
String
taskId
){
return
ResponseEntity
.
ok
(
wfCoreService
.
sendBack
(
taskId
));
public
ResponseEntity
<
Boolean
>
sendback
(
@PathVariable
(
"system"
)
String
system
,
@PathVariable
(
"appname"
)
String
appname
,
@PathVariable
(
"entity"
)
String
entity
,
@PathVariable
(
"businessKey"
)
String
businessKey
,
@PathVariable
(
"taskId"
)
String
taskId
,
@RequestBody
WFTaskWay
taskWay
){
return
ResponseEntity
.
ok
(
wfCoreService
.
sendBack
(
system
,
appname
,
entity
,
businessKey
,
taskId
,
taskWay
));
}
// @ApiOperation(value = "delegatetask", tags = {"delegatetask" }, notes = "委派任务")
...
...
@@ -307,21 +310,30 @@ public class WFCoreResource
@ApiOperation
(
value
=
"withDraw"
,
tags
=
{
"withDraw"
},
notes
=
"根据实例将流程撤回前一步"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/{system}-app-{appname}/{entity}/{businessKey}/tasks/{taskId}/withdraw"
)
public
ResponseEntity
<
Boolean
>
withDraw
(
@PathVariable
(
"taskId"
)
String
taskId
,
@RequestBody
WFTaskWay
taskWay
){
return
ResponseEntity
.
ok
(
wfCoreService
.
withDraw
(
taskId
,
taskWay
));
public
ResponseEntity
<
Boolean
>
withDraw
(
@PathVariable
(
"system"
)
String
system
,
@PathVariable
(
"appname"
)
String
appname
,
@PathVariable
(
"entity"
)
String
entity
,
@PathVariable
(
"businessKey"
)
String
businessKey
,
@PathVariable
(
"taskId"
)
String
taskId
,
@RequestBody
WFTaskWay
taskWay
){
taskWay
.
setTaskid
(
taskId
);
return
ResponseEntity
.
ok
(
wfCoreService
.
withDraw
(
system
,
appname
,
entity
,
businessKey
,
taskWay
));
}
@ApiOperation
(
value
=
"dataAccessMode"
,
tags
=
{
"流程跳转"
},
notes
=
"流程跳转"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/{system}-{entity}/{businessKey}/process-instances/{processInstanceId}/jump"
)
public
ResponseEntity
<
Boolean
>
jump
(
@PathVariable
(
"processInstanceId"
)
String
processInstanceId
,
@RequestBody
WFProcessInstance
instance
)
{
public
ResponseEntity
<
Boolean
>
jump
(
@PathVariable
(
"system"
)
String
system
,
@PathVariable
(
"entity"
)
String
entity
,
@PathVariable
(
"businessKey"
)
String
businessKey
,
@PathVariable
(
"processInstanceId"
)
String
processInstanceId
,
@RequestBody
WFProcessInstance
instance
)
{
instance
.
setId
(
processInstanceId
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
wfCoreService
.
jump
(
instance
));
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
wfCoreService
.
jump
(
system
,
entity
,
businessKey
,
instance
));
}
@ApiOperation
(
value
=
"restartwf"
,
tags
=
{
"重启流程"
},
notes
=
"重启流程"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/{system}-{entity}/{businessKey}/process-instances/{processInstanceId}/restart"
)
public
ResponseEntity
<
Boolean
>
restart
(
@PathVariable
(
"system"
)
String
system
,
@PathVariable
(
"entity"
)
String
entity
,
@PathVariable
(
"businessKey"
)
String
businessKey
,
@PathVariable
(
"processInstanceId"
)
String
processInstanceId
,
@RequestBody
WFProcessInstance
instance
)
{
public
ResponseEntity
<
Boolean
>
restart
(
@PathVariable
(
"system"
)
String
system
,
@PathVariable
(
"entity"
)
String
entity
,
@PathVariable
(
"businessKey"
)
String
businessKey
,
@PathVariable
(
"processInstanceId"
)
String
processInstanceId
,
@RequestBody
WFProcessInstance
instance
)
{
instance
.
setId
(
processInstanceId
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
wfCoreService
.
restart
(
system
,
entity
,
businessKey
,
instance
));
}
...
...
@@ -332,7 +344,8 @@ public class WFCoreResource
@PathVariable
(
"entity"
)
String
entity
,
@PathVariable
(
"businessKey"
)
String
businessKey
,
@PathVariable
(
"taskId"
)
String
taskId
,
@RequestBody
WFTaskWay
taskWay
)
{
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
wfCoreService
.
beforeSign
(
system
,
appname
,
entity
,
businessKey
,
taskId
,
taskWay
));
taskWay
.
setTaskid
(
taskId
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
wfCoreService
.
beforeSign
(
system
,
appname
,
entity
,
businessKey
,
taskWay
));
}
@ApiOperation
(
value
=
"转办任务"
,
tags
=
{
"工作流转办任务"
},
notes
=
"转办任务"
)
...
...
@@ -341,13 +354,18 @@ public class WFCoreResource
@PathVariable
(
"entity"
)
String
entity
,
@PathVariable
(
"businessKey"
)
String
businessKey
,
@PathVariable
(
"taskId"
)
String
taskId
,
@RequestBody
WFTaskWay
taskWay
)
{
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
wfCoreService
.
reassign
(
system
,
appname
,
entity
,
businessKey
,
taskId
,
taskWay
));
taskWay
.
setTaskid
(
taskId
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
wfCoreService
.
reassign
(
system
,
appname
,
entity
,
businessKey
,
taskWay
));
}
@ApiOperation
(
value
=
"将文件抄送给选定人员"
,
tags
=
{
"将文件抄送给选定人员"
}
,
notes
=
"将文件抄送给选定人员"
)
@RequestMapping
(
method
=
RequestMethod
.
POST
,
value
=
"/{system}-app-{appname}/{entity}/{businessKey}/tasks/{taskId}/sendcopy"
)
public
ResponseEntity
<
Boolean
>
sendCopy
(
@PathVariable
(
"taskId"
)
String
taskId
,
@RequestBody
WFTaskWay
taskWay
)
{
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
wfCoreService
.
sendCopy
(
taskId
,
taskWay
));
public
ResponseEntity
<
Boolean
>
sendCopy
(
@PathVariable
(
"system"
)
String
system
,
@PathVariable
(
"appname"
)
String
appname
,
@PathVariable
(
"entity"
)
String
entity
,
@PathVariable
(
"businessKey"
)
String
businessKey
,
@PathVariable
(
"taskId"
)
String
taskId
,
@RequestBody
WFTaskWay
taskWay
)
{
taskWay
.
setTaskid
(
taskId
);
return
ResponseEntity
.
status
(
HttpStatus
.
OK
).
body
(
wfCoreService
.
sendCopy
(
system
,
appname
,
entity
,
businessKey
,
taskWay
));
}
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录