提交 4968039a 编写于 作者: zhouweidong's avatar zhouweidong

1.审批日志接口增加historyTask与waitTask节点,返回已办与待办任务信息。

2.审批日志展示辅助功能操作记录。
3.修复辅助功能名称显示问题。
4.流程实例查询支持快速搜索。
上级 2abaeb3b
...@@ -31,9 +31,6 @@ public class WFProcessInstanceExService extends WFProcessInstanceServiceImpl { ...@@ -31,9 +31,6 @@ public class WFProcessInstanceExService extends WFProcessInstanceServiceImpl {
@Autowired @Autowired
WFCoreService wfCoreService; WFCoreService wfCoreService;
@Autowired
private RuntimeService runtimeService;
/** /**
* [Jump:流程跳转] 行为扩展 * [Jump:流程跳转] 行为扩展
* @param et * @param et
...@@ -48,6 +45,30 @@ public class WFProcessInstanceExService extends WFProcessInstanceServiceImpl { ...@@ -48,6 +45,30 @@ public class WFProcessInstanceExService extends WFProcessInstanceServiceImpl {
throw new BadRequestException("未传入流程步骤用户"); 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(); Set <String> userSets = new LinkedHashSet();
JSONArray.parseArray(users.toString()).forEach(item -> { JSONArray.parseArray(users.toString()).forEach(item -> {
...@@ -59,7 +80,7 @@ public class WFProcessInstanceExService extends WFProcessInstanceServiceImpl { ...@@ -59,7 +80,7 @@ public class WFProcessInstanceExService extends WFProcessInstanceServiceImpl {
}); });
et.set("wfusers",String.join(",",userSets)); et.set("wfusers",String.join(",",userSets));
wfCoreService.jump(et); wfCoreService.jump(strSystemId,strEntityId,strBusinessKey,et);
return et; return et;
} }
......
...@@ -158,7 +158,7 @@ public class WFCoreResource ...@@ -158,7 +158,7 @@ public class WFCoreResource
@ApiOperation(value = "getWayByTaskId", tags = {"WFTaskWay" }, notes = "根据业务主键和当前步骤获取操作路径") @ApiOperation(value = "getWayByTaskId", tags = {"WFTaskWay" }, notes = "根据业务主键和当前步骤获取操作路径")
@RequestMapping(method = RequestMethod.GET, value = "/{system}-app-{appname}/{entity}/{businessKey}/tasks/{taskId}/ways") @RequestMapping(method = RequestMethod.GET, value = "/{system}-app-{appname}/{entity}/{businessKey}/tasks/{taskId}/ways")
public ResponseEntity<List<WFTaskWay>> gettasklink(@PathVariable("system") String system,@PathVariable("appname") String appname, public ResponseEntity<List<WFTaskWay>> getTasklink(@PathVariable("system") String system,@PathVariable("appname") String appname,
@PathVariable("entity") String entity, @PathVariable("entity") String entity,
@PathVariable("businessKey") String businessKey,@PathVariable("taskId") String taskId) { @PathVariable("businessKey") String businessKey,@PathVariable("taskId") String taskId) {
List<WFTaskWay> taskWays=wfCoreService.getTaskLink(system,appname,entity,businessKey,taskId); List<WFTaskWay> taskWays=wfCoreService.getTaskLink(system,appname,entity,businessKey,taskId);
...@@ -188,8 +188,11 @@ public class WFCoreResource ...@@ -188,8 +188,11 @@ public class WFCoreResource
@ApiOperation(value = "sendback", tags = {"sendback" }, notes = "流程步骤回退") @ApiOperation(value = "sendback", tags = {"sendback" }, notes = "流程步骤回退")
@RequestMapping(method = RequestMethod.POST, value = "/{system}-app-{appname}/{entity}/{businessKey}/tasks/{taskId}/sendback") @RequestMapping(method = RequestMethod.POST, value = "/{system}-app-{appname}/{entity}/{businessKey}/tasks/{taskId}/sendback")
public ResponseEntity<Boolean> sendback(@PathVariable("taskId") String taskId){ public ResponseEntity<Boolean> sendback(@PathVariable("system") String system,@PathVariable("appname") String appname,
return ResponseEntity.ok(wfCoreService.sendBack(taskId)); @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 = "委派任务") // @ApiOperation(value = "delegatetask", tags = {"delegatetask" }, notes = "委派任务")
...@@ -307,21 +310,30 @@ public class WFCoreResource ...@@ -307,21 +310,30 @@ public class WFCoreResource
@ApiOperation(value = "withDraw", tags = {"withDraw" }, notes = "根据实例将流程撤回前一步") @ApiOperation(value = "withDraw", tags = {"withDraw" }, notes = "根据实例将流程撤回前一步")
@RequestMapping(method = RequestMethod.POST, value = "/{system}-app-{appname}/{entity}/{businessKey}/tasks/{taskId}/withdraw") @RequestMapping(method = RequestMethod.POST, value = "/{system}-app-{appname}/{entity}/{businessKey}/tasks/{taskId}/withdraw")
public ResponseEntity<Boolean> withDraw(@PathVariable("taskId") String taskId ,@RequestBody WFTaskWay taskWay){ public ResponseEntity<Boolean> withDraw(@PathVariable("system") String system,@PathVariable("appname") String appname,
return ResponseEntity.ok(wfCoreService.withDraw(taskId , taskWay)); @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 = "流程跳转") @ApiOperation(value = "dataAccessMode", tags = {"流程跳转" }, notes = "流程跳转")
@RequestMapping(method = RequestMethod.POST, value = "/{system}-{entity}/{businessKey}/process-instances/{processInstanceId}/jump") @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); 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 = "重启流程") @ApiOperation(value = "restartwf", tags = {"重启流程" }, notes = "重启流程")
@RequestMapping(method = RequestMethod.POST, value = "/{system}-{entity}/{businessKey}/process-instances/{processInstanceId}/restart") @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, public ResponseEntity<Boolean> restart(@PathVariable("system") String system,
@PathVariable("processInstanceId") String processInstanceId, @RequestBody WFProcessInstance instance) { @PathVariable("entity") String entity,
@PathVariable("businessKey") String businessKey, @PathVariable("processInstanceId") String processInstanceId,
@RequestBody WFProcessInstance instance) {
instance.setId(processInstanceId); instance.setId(processInstanceId);
return ResponseEntity.status(HttpStatus.OK).body(wfCoreService.restart(system,entity,businessKey,instance)); return ResponseEntity.status(HttpStatus.OK).body(wfCoreService.restart(system,entity,businessKey,instance));
} }
...@@ -332,7 +344,8 @@ public class WFCoreResource ...@@ -332,7 +344,8 @@ public class WFCoreResource
@PathVariable("entity") String entity, @PathVariable("entity") String entity,
@PathVariable("businessKey") String businessKey,@PathVariable("taskId") String taskId, @PathVariable("businessKey") String businessKey,@PathVariable("taskId") String taskId,
@RequestBody WFTaskWay taskWay) { @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 = "转办任务") @ApiOperation(value = "转办任务", tags = {"工作流转办任务" }, notes = "转办任务")
...@@ -341,13 +354,18 @@ public class WFCoreResource ...@@ -341,13 +354,18 @@ public class WFCoreResource
@PathVariable("entity") String entity, @PathVariable("entity") String entity,
@PathVariable("businessKey") String businessKey,@PathVariable("taskId") String taskId, @PathVariable("businessKey") String businessKey,@PathVariable("taskId") String taskId,
@RequestBody WFTaskWay taskWay) { @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 = "将文件抄送给选定人员") @ApiOperation(value = "将文件抄送给选定人员", tags = {"将文件抄送给选定人员" } ,notes = "将文件抄送给选定人员")
@RequestMapping(method = RequestMethod.POST, value = "/{system}-app-{appname}/{entity}/{businessKey}/tasks/{taskId}/sendcopy") @RequestMapping(method = RequestMethod.POST, value = "/{system}-app-{appname}/{entity}/{businessKey}/tasks/{taskId}/sendcopy")
public ResponseEntity<Boolean> sendCopy(@PathVariable("taskId") String taskId,@RequestBody WFTaskWay taskWay) { public ResponseEntity<Boolean> sendCopy(@PathVariable("system") String system,@PathVariable("appname") String appname,
return ResponseEntity.status(HttpStatus.OK).body(wfCoreService.sendCopy(taskId,taskWay)); @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 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册