Commit 21bb4b30 by “zcwang”

fix bug:变更确认更新状态

parent da06f085
...@@ -445,6 +445,7 @@ public class ChangeFlowBiz { ...@@ -445,6 +445,7 @@ public class ChangeFlowBiz {
// 完成直接完结 // 完成直接完结
String confirmNode = flowService.submitFlow(flowId.toString(), flowDataDTO, uid, String confirmNode = flowService.submitFlow(flowId.toString(), flowDataDTO, uid,
ChangeFlowEnum.CHANGE_FLOW_CONFIRM.getTopoId(), JSON.toJSONString(content), true); ChangeFlowEnum.CHANGE_FLOW_CONFIRM.getTopoId(), JSON.toJSONString(content), true);
changeRecord.setState(ChangeStatusEnum.END.getStatus());
changeRecord.setFlowNode(confirmNode); changeRecord.setFlowNode(confirmNode);
changeRecord.setUpdateTime(DateUtils.getCurrentTime()); changeRecord.setUpdateTime(DateUtils.getCurrentTime());
changeFlowService.updateRecord(changeRecord); changeFlowService.updateRecord(changeRecord);
...@@ -459,6 +460,7 @@ public class ChangeFlowBiz { ...@@ -459,6 +460,7 @@ public class ChangeFlowBiz {
changeRecord.setCancelReason(cancelReason); changeRecord.setCancelReason(cancelReason);
String cancelNode = flowService.submitFlow(flowId.toString(), flowDataDTO, uid, String cancelNode = flowService.submitFlow(flowId.toString(), flowDataDTO, uid,
ChangeFlowEnum.CHANGE_FLOW_CONFIRM.getTopoId(), JSON.toJSONString(content), true); ChangeFlowEnum.CHANGE_FLOW_CONFIRM.getTopoId(), JSON.toJSONString(content), true);
changeRecord.setState(ChangeStatusEnum.CANCEL.getStatus());
changeRecord.setFlowNode(cancelNode); changeRecord.setFlowNode(cancelNode);
changeRecord.setUpdateTime(DateUtils.getCurrentTime()); changeRecord.setUpdateTime(DateUtils.getCurrentTime());
changeFlowService.updateRecord(changeRecord); changeFlowService.updateRecord(changeRecord);
...@@ -475,11 +477,12 @@ public class ChangeFlowBiz { ...@@ -475,11 +477,12 @@ public class ChangeFlowBiz {
Long changeExecFinishTime = exec.getChangeExecFinishTime(); Long changeExecFinishTime = exec.getChangeExecFinishTime();
Assert.notNull(changeExecFinishTime, "行动完成时间不可为空" + exec.getChangeTemplateId()); Assert.notNull(changeExecFinishTime, "行动完成时间不可为空" + exec.getChangeTemplateId());
ChangeExecRecord changeExecRecord = new ChangeExecRecord(); ChangeExecRecord changeExecRecord = new ChangeExecRecord();
changeExecRecord.setId(exec.getChangeTemplateId()); changeExecRecord.setId(exec.getChangeExecId());
changeExecRecord.setChangeExecFinishTime(exec.getChangeExecFinishTime()); changeExecRecord.setChangeExecFinishTime(exec.getChangeExecFinishTime());
changeExecRecord.setChangeExecFinishDesc(exec.getChangeExecFinishDesc()); changeExecRecord.setChangeExecFinishDesc(exec.getChangeExecFinishDesc());
return changeExecRecord; return changeExecRecord;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
changeRecord.setState(ChangeStatusEnum.DELAY.getStatus());
// 更改变更结果确认时间 // 更改变更结果确认时间
changeRecord.setChangeConfirmResultTime(changeConfirmResultTime); changeRecord.setChangeConfirmResultTime(changeConfirmResultTime);
changeRecord.setUpdateTime(DateUtils.getCurrentTime()); changeRecord.setUpdateTime(DateUtils.getCurrentTime());
......
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