Browse Source

流程最后一个环节处理报错的情况

master
yxt_djz 3 years ago
parent
commit
5b7d6fe719
  1. 13
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

13
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@ -217,8 +217,7 @@ public class FlowableRest implements FlowableFeign {
String nextUserSid = dto.getNextNodeUserSids(); String nextUserSid = dto.getNextNodeUserSids();
if(StringUtils.isBlank(nextUserSid)){ if(StringUtils.isBlank(nextUserSid)){
ResultBean<UserAndOrgPath> nextNodeUserSidsOfSubmit = getNextNodeUserSidsOfSubmit(dto); ResultBean<UserAndOrgPath> nextNodeUserSidsOfSubmit = getNextNodeUserSidsOfSubmit(dto);
if (!nextNodeUserSidsOfSubmit.getSuccess()|| nextNodeUserSidsOfSubmit.getData()==null if (!nextNodeUserSidsOfSubmit.getSuccess()) {
|| StringUtils.isBlank(nextNodeUserSidsOfSubmit.getData().getUserSid())) {
return rb.setMsg("nextUserSid 不能为空!"); return rb.setMsg("nextUserSid 不能为空!");
} }
nextUserSid=nextNodeUserSidsOfSubmit.getData().getUserSid(); nextUserSid=nextNodeUserSidsOfSubmit.getData().getUserSid();
@ -265,10 +264,10 @@ public class FlowableRest implements FlowableFeign {
log.error("formVariables:{}",JSON.toJSONString(formVariables)); log.error("formVariables:{}",JSON.toJSONString(formVariables));
taskService.setAssignee(taskId, userSid); taskService.setAssignee(taskId, userSid);
//formVariables.remove("userSid"); //formVariables.remove("userSid");
for(Map.Entry<String, Object> entry:formVariables.entrySet()){ /*for(Map.Entry<String, Object> entry:formVariables.entrySet()){
taskService.setVariable(taskId,entry.getKey(),entry.getValue()); taskService.setVariable(taskId,entry.getKey(),entry.getValue());
System.out.println(entry.getKey()+"--->"+entry.getValue()); System.out.println(entry.getKey()+"--->"+entry.getValue());
} }*/
taskService.complete(taskId, formVariables); taskService.complete(taskId, formVariables);
//根据流程实例的id取最新的待办环节,给环节设置上用户sid //根据流程实例的id取最新的待办环节,给环节设置上用户sid
ResultBean<List<LatestTaskVo>> ll = flowtaskService.getLatestTasksNew(instanceId); ResultBean<List<LatestTaskVo>> ll = flowtaskService.getLatestTasksNew(instanceId);
@ -284,6 +283,7 @@ public class FlowableRest implements FlowableFeign {
System.out.println(entry.getKey()+"--->"+entry.getValue()); System.out.println(entry.getKey()+"--->"+entry.getValue());
}*/ }*/
// taskService.setVariables(id_,formVariables); // taskService.setVariables(id_,formVariables);
//在act_ru_variable表中增加环节上的业务参数的变量
taskService.setVariablesLocal(id_,formVariables); taskService.setVariablesLocal(id_,formVariables);
nodeState = latestTaskVo.getName_(); nodeState = latestTaskVo.getName_();
taskDefKey = latestTaskVo.getTask_def_key_(); taskDefKey = latestTaskVo.getTask_def_key_();
@ -391,6 +391,7 @@ public class FlowableRest implements FlowableFeign {
if (!resultBean.getSuccess()) { if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg()); return rb.setMsg(resultBean.getMsg());
} }
String orgPath = resultBean.getData().get(0).getOrgPath();
String nodeState = resultBean.getData().get(0).getName_(); String nodeState = resultBean.getData().get(0).getName_();
String taskDefKey = resultBean.getData().get(0).getTask_def_key_(); String taskDefKey = resultBean.getData().get(0).getTask_def_key_();
String incomingSourceRef = resultBean.getData().get(0).getIncomingSourceRef(); String incomingSourceRef = resultBean.getData().get(0).getIncomingSourceRef();
@ -402,6 +403,10 @@ public class FlowableRest implements FlowableFeign {
/* if (incomingSourceRef.contains("start")) { /* if (incomingSourceRef.contains("start")) {
vo.setNodeState( SysFormLinkFlowStateEnum.REJECT.getCode()); vo.setNodeState( SysFormLinkFlowStateEnum.REJECT.getCode());
}*/ }*/
Map<String, Object> formVariables=new HashMap<>();
formVariables.put("orgPath",orgPath);
//在act_ru_variable表中增加环节上的业务参数的变量
taskService.setVariablesLocal(taskId,formVariables);
ResultBean resultBean1 = ResultBean.fireSuccess(); ResultBean resultBean1 = ResultBean.fireSuccess();
return resultBean1.success().setData(vo); return resultBean1.success().setData(vo);
} }

Loading…
Cancel
Save