diff --git a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java index a2565d78..547ea67c 100644 --- a/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java +++ b/yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java @@ -322,11 +322,6 @@ public class FlowableRest implements FlowableFeign { log.error("taskid:{},userSid:{}",taskId, userSid); log.error("formVariables:{}",JSON.toJSONString(formVariables)); taskService.setAssignee(taskId, userSid); - //formVariables.remove("userSid"); - /*for(Map.Entry entry:formVariables.entrySet()){ - taskService.setVariable(taskId,entry.getKey(),entry.getValue()); - System.out.println(entry.getKey()+"--->"+entry.getValue()); - }*/ taskService.complete(taskId, formVariables); //根据流程实例的id取最新的待办环节,给环节设置上用户sid ResultBean> ll = flowtaskService.getLatestTasksNew(instanceId); @@ -335,13 +330,6 @@ public class FlowableRest implements FlowableFeign { String id_ = latestTaskVo.getId_(); taskService.setAssignee(id_, nextUserSid); vo.setTaskId(id_); - /* for(Map.Entry entry:formVariables.entrySet()){ - taskService.setVariable(id_,entry.getKey(),entry.getValue()); - taskService.setVariableLocal(id_,entry.getKey(),entry.getValue()); - - System.out.println(entry.getKey()+"--->"+entry.getValue()); - }*/ - // taskService.setVariables(id_,formVariables); //在act_ru_variable表中增加环节上的业务参数的变量 taskService.setVariablesLocal(id_,formVariables); nodeState = latestTaskVo.getName_(); @@ -352,7 +340,6 @@ public class FlowableRest implements FlowableFeign { vo.setNodeState(FlowComment.SETTLE.getRemark()); } } - //ResultBean flowRecordVoResultBean = flowableService.flowRecord(dto.getInstanceId(), dto.getModelId()); List flowElements = processService.calApprovePath(dto.getModelId(), dto.getModelId(), dto.getFormVariables()); boolean contains=false; diff --git a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/sealrecord/SealRecordService.java b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/sealrecord/SealRecordService.java index 0329922e..a42e1664 100644 --- a/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/sealrecord/SealRecordService.java +++ b/yxt_supervise/yxt-supervise-enterprisecentre/yxt-supervise-enterprisecentre-biz/src/main/java/com/yxt/supervise/enterprisecentre/biz/sealrecord/SealRecordService.java @@ -394,7 +394,7 @@ public class SealRecordService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + updateFlowFiled( resultBean.getData()); + return rb.success().setData(resultBean.getData()); + } else { + return rb.setMsg("操作失败!提交的数据不一致"); + } + } + public ResultBean revokeProcess(String userSid, String businessSid, FlowTaskVo flowTaskVo) { FlowTaskVo fl = new FlowTaskVo(); BeanUtil.copyProperties(flowTaskVo, fl);