Commit 10a1f60b by “zcwang”

add: 取消工单节点错误

parent 113bb953
...@@ -152,7 +152,7 @@ public class ChangeFlowBiz { ...@@ -152,7 +152,7 @@ public class ChangeFlowBiz {
if (changeCommander.equals(uid)) { if (changeCommander.equals(uid)) {
log.debug("[createAndSubmit] changeCommander:{}, uid:{}", changeCommander, uid); log.debug("[createAndSubmit] changeCommander:{}, uid:{}", changeCommander, uid);
String nextNodeId = submitFlow(flowId, flowDataDTO, uid, String nextNodeId = submitFlow(flowId, flowDataDTO, uid,
ChangeFlowEnum.CHANGE_FLOW_START.getTopoId(), JSON.toJSONString(content), true); ChangeFlowEnum.CHANGE_FLOW_SUBMIT.getTopoId(), JSON.toJSONString(content), true);
if (null == nextNodeId) { if (null == nextNodeId) {
throw ExceptionFactory.createBiz(ResponseCode.SUBMIT_FLOW_ERROR, "首次提交节点失败"); throw ExceptionFactory.createBiz(ResponseCode.SUBMIT_FLOW_ERROR, "首次提交节点失败");
} }
...@@ -529,7 +529,7 @@ public class ChangeFlowBiz { ...@@ -529,7 +529,7 @@ public class ChangeFlowBiz {
// 查询工单有效性 // 查询工单有效性
ChangeRecord changeRecord = getFlowInfo(flowId); ChangeRecord changeRecord = getFlowInfo(flowId);
// 检查工单节点 // 检查工单节点
this.checkNode(changeRecord.getFlowNode(), ChangeFlowEnum.CHANGE_FLOW_EXE.getNodeId()); this.checkNode(changeRecord.getFlowNode(), ChangeFlowEnum.CHANGE_FLOW_SUBMIT.getNodeId());
String uid = RequestLocalBean.getUid(); String uid = RequestLocalBean.getUid();
// todo:检查审核人 // todo:检查审核人
String changeCommander = changeRecord.getChangeCommander(); String changeCommander = changeRecord.getChangeCommander();
...@@ -546,7 +546,7 @@ public class ChangeFlowBiz { ...@@ -546,7 +546,7 @@ public class ChangeFlowBiz {
content.put("updateTime", System.currentTimeMillis()); content.put("updateTime", System.currentTimeMillis());
content.put(CommonConstants.FLOW_OPERATION_KEY, FlowOperationTypeEnum.REFUSE.getValue()); content.put(CommonConstants.FLOW_OPERATION_KEY, FlowOperationTypeEnum.REFUSE.getValue());
String nextNodeId = this.submitFlow(String.valueOf(flowId), flowDataDTO, uid, String nextNodeId = this.submitFlow(String.valueOf(flowId), flowDataDTO, uid,
ChangeFlowEnum.CHANGE_FLOW_EXE.getTopoId(), JSON.toJSONString(content), false); ChangeFlowEnum.CHANGE_FLOW_SUBMIT.getTopoId(), JSON.toJSONString(content), false);
log.info("[cancel] flowId:{}, nextNodeId:{}", flowId, nextNodeId); log.info("[cancel] flowId:{}, nextNodeId:{}", flowId, nextNodeId);
// 填充更新数据 // 填充更新数据
changeRecord.setFlowNode(nextNodeId); changeRecord.setFlowNode(nextNodeId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment