Commit 3b58f52b by “zcwang”

modify: 变更确认取消更新行动项时间

parent 555add59
......@@ -751,6 +751,15 @@ public class ChangeFlowBiz {
String cancelReason = changeFlowSubmitReq.getCancelReason();
Assert.isTrue(StringUtils.isNotBlank(cancelReason), "变更取消原因不可为空");
changeRecord.setCancelReason(cancelReason);
List<ChangeExecRecord> cancelChangeExecRecordList = execProjectList.stream().map(exec -> {
Long changeExecFinishTime = exec.getChangeExecFinishTime();
Assert.notNull(changeExecFinishTime, "行动完成时间不可为空" + exec.getChangeTemplateId());
ChangeExecRecord changeExecRecord = new ChangeExecRecord();
changeExecRecord.setId(exec.getChangeExecId());
changeExecRecord.setChangeExecFinishTime(exec.getChangeExecFinishTime());
changeExecRecord.setChangeExecFinishDesc(exec.getChangeExecFinishDesc());
return changeExecRecord;
}).collect(Collectors.toList());
String cancelNode = flowService.submitFlow(flowId.toString(), flowDataDTO, uid,
ChangeFlowEnum.CHANGE_FLOW_CONFIRM.getTopoId(), JSON.toJSONString(content), true,
FlowxOperationEnum.SUBMIT.getName(), "提交工单", changeRecord.getCreateTime());
......@@ -758,6 +767,7 @@ public class ChangeFlowBiz {
changeRecord.setFlowNode(cancelNode);
changeRecord.setUpdateTime(DateUtils.getCurrentTime());
changeFlowService.updateRecord(changeRecord);
cancelChangeExecRecordList.forEach(exec -> changeFlowExecService.update(exec));
// 发送邮件
HashMap<String, Object> cancelMap = new HashMap<>();
cancelMap.put("changeId", changeRecord.getFlowId());
......
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