Merge branch 'feature-changeFlow-221110' of…

Merge branch 'feature-changeFlow-221110' of https://yxwbgit.mail.netease.com/yx-qc-change-flow/yanxuan-qc-change-system into feature-changeFlow-221110

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java

@@ -570,7 +570,7 @@ public class ChangeFlowBiz {
                 changeFlowService.updateRecord(changeRecord);
                 // 更新行动执行方案，覆盖操作，先删除，后插入
                 Integer changeExecCount = changeFlowExecService.deleteByChangeRecordId(changeRecord.getId());
-                log.info("[CHANGE_FLOW_SUBMIT] delete changeExecCount:{}", changeExecCount);
+                log.info("[CHANGE_FLOW_SUBMIT] delete id:{},  changeExecCount:{}", changeRecord.getId(), changeExecCount);
                 // 保存变更行动方案记录
                 List<ChangeExecRecord> changeExecRecords = buildChangeExecRecord(changeRecord.getId(),
                         changeFlowSubmitReq.getChangeExecProjectList());
@@ -758,26 +758,15 @@ public class ChangeFlowBiz {
                         return cancelNode;
                     case DELAY:
                         // 延期不流转工单
-                        long changeConfirmResultTime = changeFlowSubmitReq.getChangeConfirmResultTime();
-                        Long tomorrowSpecificTime = DateUtils.getTomorrowSpecificTime("09:00:00");
-                        Assert.isTrue(changeConfirmResultTime >= tomorrowSpecificTime, "时间不可晚于下次执行时间");
-                        List<ChangeExecConfigReq> execProjectList1 = changeFlowSubmitReq.getChangeExecProjectList();
-                        List<ChangeExecRecord> changeExecRecords1 = execProjectList1.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());
-                        changeRecord.setState(ChangeStatusEnum.DELAY.getStatus());
+                        Long changeConfirmResultTime = changeFlowSubmitReq.getChangeConfirmResultTime();
+                        Long tomorrowSpecificTime = DateUtils.getTomorrowSpecificTime("00:00:00");
+                        Assert.isTrue(
+                            changeConfirmResultTime != null && changeConfirmResultTime >= tomorrowSpecificTime,
+                            "时间不可晚于下次执行时间");
                         // 更改变更结果确认时间
                         changeRecord.setChangeConfirmResultTime(changeConfirmResultTime);
                         changeRecord.setUpdateTime(DateUtils.getCurrentTime());
                         changeFlowService.updateRecord(changeRecord);
-                        changeExecRecords1.forEach(exec -> changeFlowExecService.update(exec));
-                        // 变更行动项
                         return null;
                     default:
                         return null;

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/req/ChangeFlowSubmitReq.java

@@ -92,7 +92,7 @@ public class ChangeFlowSubmitReq {
     /**
      * 变更结果确认时间，时间戳
      */
-    private long changeConfirmResultTime;
+    private Long changeConfirmResultTime;
     /**
      * 变更行动项
      */