|
|
|
@ -84,10 +84,8 @@ public class FlowableRest implements FlowableFeign { |
|
|
|
protected TaskService taskService; |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultBean businessStart(@ApiParam(value = "流程定义id") @PathVariable(value = "procDefId") String procDefId, |
|
|
|
@ApiParam(value = "用户sid") @PathVariable(value = "userSid") String userSid, |
|
|
|
@ApiParam(value = "变量集合,json对象") @RequestBody Map<String, Object> variables) { |
|
|
|
return flowableService.businessStart(procDefId, userSid, variables); |
|
|
|
public ResultBean businessStart(BusinessVariables bv) { |
|
|
|
return flowableService.businessStart( bv); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@ -115,10 +113,10 @@ public class FlowableRest implements FlowableFeign { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultBean<String> getNextNodeUserSidsOfCreate(Map<String, Object> variables) { |
|
|
|
String orgSidPath=(String)variables.get("orgSidPath"); |
|
|
|
public ResultBean<String> getNextNodeUserSidsOfCreate(BusinessVariables bv) { |
|
|
|
String orgSidPath=bv.getOrgSidPath(); |
|
|
|
//根据业务参数取流程流转的环节 信息
|
|
|
|
List<Map<String, Object>> list = (List<Map<String, Object>>) flowtaskService.getProcessCirculationNodesByMap(variables).getData(); |
|
|
|
List<Map<String, Object>> list = (List<Map<String, Object>>) flowtaskService.getProcessCirculationNodesByMap(bv).getData(); |
|
|
|
//取第二个环节的配置角色
|
|
|
|
Object o = list.get(1).get("candidateGroups"); |
|
|
|
JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(o)); |
|
|
|
@ -140,12 +138,13 @@ public class FlowableRest implements FlowableFeign { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultBean getNextNodeUserSidsOfSubmit(Map<String, Object> variables) { |
|
|
|
public ResultBean getNextNodeUserSidsOfSubmit(BusinessVariables bv) { |
|
|
|
ResultBean rb = ResultBean.fireSuccess(); |
|
|
|
String orgSidPath=(String)variables.get("orgSidPath"); |
|
|
|
String taskDefKey=(String)variables.get("taskDefKey"); |
|
|
|
String orgSidPath=bv.getOrgSidPath(); |
|
|
|
String taskDefKey=bv.getTaskDefKey(); |
|
|
|
//根据业务参数取流程流转的环节 信息
|
|
|
|
List<Map<String, Object>> list = (List<Map<String, Object>>) flowtaskService.getProcessCirculationNodesByMap(variables).getData(); |
|
|
|
List<Map<String, Object>> list = (List<Map<String, Object>>) |
|
|
|
flowtaskService.getProcessCirculationNodesByMap(bv).getData(); |
|
|
|
Map<String, Object> task_map=new HashMap<>(); |
|
|
|
//取第二个环节的配置角色
|
|
|
|
boolean endTask=true; |
|
|
|
@ -180,16 +179,16 @@ public class FlowableRest implements FlowableFeign { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultBean<UpdateFlowFieldVo> startProcess(StartProcessDto dto) { |
|
|
|
public ResultBean<UpdateFlowFieldVo> startProcess(BusinessVariables dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
String nextNodeUserSids_=getNextNodeUserSidsOfCreate(dto.getVariables()).getData(); |
|
|
|
dto.getVariables().put("nextNodeUserSids",nextNodeUserSids_); |
|
|
|
ResultBean resultBean1 = flowableService.businessStart(ProcDefEnum.BASEOUTSOURCINGAPPLICATION.getProDefId(), dto.getUserSid(), dto.getVariables()); |
|
|
|
String nextNodeUserSids_=getNextNodeUserSidsOfCreate(dto).getData(); |
|
|
|
dto.setNextNodeUserSids(nextNodeUserSids_); |
|
|
|
ResultBean resultBean1 = flowableService.businessStart(dto); |
|
|
|
UpdateFlowFieldVo vo = new UpdateFlowFieldVo(); |
|
|
|
if (resultBean1.getSuccess() && resultBean1.getData() != null) { |
|
|
|
vo.setSid("" + dto.getVariables().get("businessSid")); |
|
|
|
vo.setSid("" + dto.getBusinessSid()); |
|
|
|
Map<String, String> map = (Map<String, String>) resultBean1.getData(); |
|
|
|
vo.setProcDefId(ProcDefEnum.BASEOUTSOURCINGAPPLICATION.getProDefId()); |
|
|
|
vo.setProcDefId(dto.getModelId()); |
|
|
|
vo.setNodeState(map.get("nodeState")); |
|
|
|
vo.setProcInsId(map.get("procInsId")); |
|
|
|
vo.setTaskDefKey(map.get("taskDefKey")); |
|
|
|
@ -205,27 +204,26 @@ public class FlowableRest implements FlowableFeign { |
|
|
|
UpdateFlowFieldVo vo = new UpdateFlowFieldVo(); |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
Map<String, Object> formVariables = dto.getFormVariables(); |
|
|
|
String taskId = (String) formVariables.get("taskId"); |
|
|
|
String taskId = dto.getTaskId(); |
|
|
|
if (StringUtils.isBlank(taskId)) { |
|
|
|
return rb.setMsg("taskId 不能为空！"); |
|
|
|
} |
|
|
|
String procInsId = (String) formVariables.get("instanceId"); |
|
|
|
ResultBean<String> resultBean = getNextNodeUserSidsOfSubmit(dto.getFormVariables()); |
|
|
|
ResultBean<String> resultBean = getNextNodeUserSidsOfSubmit(dto); |
|
|
|
String nextUserSid=resultBean.getData(); |
|
|
|
String comment = (String) formVariables.get("comment"); |
|
|
|
String comment = dto.getComment(); |
|
|
|
if (StringUtils.isBlank(comment)) { |
|
|
|
return rb.setMsg("comment 不能为空！"); |
|
|
|
} |
|
|
|
String instanceId = (String) formVariables.get("instanceId"); |
|
|
|
String instanceId = dto.getInstanceId(); |
|
|
|
if (StringUtils.isBlank(instanceId)) { |
|
|
|
return rb.setMsg("instanceId 不能为空！"); |
|
|
|
} |
|
|
|
String userSid = (String) formVariables.get("userSid"); |
|
|
|
String userSid = dto.getUserSid(); |
|
|
|
if (StringUtils.isBlank(userSid)) { |
|
|
|
return rb.setMsg("userSid 不能为空！"); |
|
|
|
|
|
|
|
} |
|
|
|
String businessSid = (String) formVariables.get("businessSid"); |
|
|
|
String businessSid =dto.getBusinessSid(); |
|
|
|
if (StringUtils.isBlank(businessSid)) { |
|
|
|
return rb.setMsg("业务sid 不能为空！"); |
|
|
|
} |
|
|
|
@ -251,7 +249,7 @@ public class FlowableRest implements FlowableFeign { |
|
|
|
taskService.complete(taskId, formVariables); |
|
|
|
|
|
|
|
//根据流程实例的id取最新的待办环节，给环节设置上用户sid
|
|
|
|
ResultBean<List<LatestTaskVo>> ll = flowtaskService.getLatestTasksNew(procInsId); |
|
|
|
ResultBean<List<LatestTaskVo>> ll = flowtaskService.getLatestTasksNew(instanceId); |
|
|
|
if (ll.getData().size() > 0) { |
|
|
|
LatestTaskVo latestTaskVo = ll.getData().get(0); |
|
|
|
String id_ = latestTaskVo.getId_(); |
|
|
|
|
yxt_djz
3 years ago