Commit be6931ff by “zcwang”

modify: 日志修改

parent c144fe8c
...@@ -101,8 +101,9 @@ public class ChangeFlowBiz { ...@@ -101,8 +101,9 @@ public class ChangeFlowBiz {
// 保存工单数据 // 保存工单数据
ChangeRecord changeRecord = buildRecord(flowId, nodeId, changeFlowCreateReq); ChangeRecord changeRecord = buildRecord(flowId, nodeId, changeFlowCreateReq);
changeFlowService.saveRecord(changeRecord); changeFlowService.saveRecord(changeRecord);
Integer occLock = flowDataDTO.getOccLock();
// 如果发起人=变更负责人 // 如果发起人=变更负责人
return submitFlow(flowId, nodeId, flowCreateReqDTO); return submitFlow(flowId, nodeId, occLock, flowCreateReqDTO);
} }
private FlowDataDTO detailFlow(String flowId) { private FlowDataDTO detailFlow(String flowId) {
...@@ -130,7 +131,7 @@ public class ChangeFlowBiz { ...@@ -130,7 +131,7 @@ public class ChangeFlowBiz {
return flowCreateReqDTO; return flowCreateReqDTO;
} }
private List<String> submitFlow(String flowId, String nodeId, FlowCreateReqDTO flowCreateReqDTO) { private List<String> submitFlow(String flowId, String nodeId, Integer occLock, FlowCreateReqDTO flowCreateReqDTO) {
NodeSubmitReqDTO nodeSubmitReqDTO = new NodeSubmitReqDTO(); NodeSubmitReqDTO nodeSubmitReqDTO = new NodeSubmitReqDTO();
nodeSubmitReqDTO.setFlowId(flowId); nodeSubmitReqDTO.setFlowId(flowId);
nodeSubmitReqDTO.setNodeId(nodeId); nodeSubmitReqDTO.setNodeId(nodeId);
...@@ -142,6 +143,7 @@ public class ChangeFlowBiz { ...@@ -142,6 +143,7 @@ public class ChangeFlowBiz {
nodeSubmitReqDTO.setOperateResult(FlowxOperationEnum.SUBMIT.getName()); nodeSubmitReqDTO.setOperateResult(FlowxOperationEnum.SUBMIT.getName());
nodeSubmitReqDTO.setCreateTime(System.currentTimeMillis()); nodeSubmitReqDTO.setCreateTime(System.currentTimeMillis());
nodeSubmitReqDTO.setApproved(true); nodeSubmitReqDTO.setApproved(true);
nodeSubmitReqDTO.setOccLock(occLock + 1);
List<String> nextNodeIdList; List<String> nextNodeIdList;
// 提交工单 // 提交工单
AjaxResponse<List<String>> submitResponse = flowRpcService.submit(CommonConstants.FLOWX_PRODUCT, nodeSubmitReqDTO); AjaxResponse<List<String>> submitResponse = flowRpcService.submit(CommonConstants.FLOWX_PRODUCT, nodeSubmitReqDTO);
...@@ -149,7 +151,7 @@ public class ChangeFlowBiz { ...@@ -149,7 +151,7 @@ public class ChangeFlowBiz {
nextNodeIdList = submitResponse.getData(); nextNodeIdList = submitResponse.getData();
log.info("[submitFlow] nextNodeIdList={}", JSON.toJSONString(nextNodeIdList)); log.info("[submitFlow] nextNodeIdList={}", JSON.toJSONString(nextNodeIdList));
} else { } else {
log.error("[submitFlow] submit flow failed, query={}, errMsg={}", JSON.toJSONString(flowId), log.error("[submitFlow] submit flow failed, query={}, errMsg={}", JSON.toJSONString(nodeSubmitReqDTO),
JSON.toJSONString(submitResponse)); JSON.toJSONString(submitResponse));
throw ExceptionFactory.createBiz(ResponseCode.SUBMIT_FLOW_ERROR, submitResponse.getErrorMsg()); throw ExceptionFactory.createBiz(ResponseCode.SUBMIT_FLOW_ERROR, submitResponse.getErrorMsg());
} }
......
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