feat: 行动项必填项校验

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

 package com.netease.mail.yanxuan.change.biz.biz;
 
-import com.netease.mail.yanxuan.change.biz.meta.exception.ExceptionFactory;
-import com.netease.mail.yanxuan.change.common.bean.ResponseCode;
 import com.netease.mail.yanxuan.change.common.util.DateUtils;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeExecRecord;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeExecConfigReq;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -34,30 +30,6 @@ public class ChangeExecRecordBiz {
                                                         List<ChangeExecConfigReq> changeExecProjectList,
                                                         String subFlowId,
                                                         Long subFlowRecordId) {
-        // 校验列表不为空
-        if (CollectionUtils.isEmpty(changeExecProjectList)) {
-            throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "行动项列表不能为空");
-        }
-        
-        // 校验每个行动项的必填字段
-        changeExecProjectList.forEach(c -> {
-            if (StringUtils.isBlank(c.getChangeExecUser())) {
-                throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "行动项中变更行动人不能为空");
-            }
-            if (StringUtils.isBlank(c.getChangeExecUserEmail())) {
-                throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "行动项中变更行动人邮箱不能为空");
-            }
-            if (StringUtils.isBlank(c.getChangeRiskDesc())) {
-                throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "行动项中变更风险描述不能为空");
-            }
-            if (StringUtils.isBlank(c.getChangeExecProject())) {
-                throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "行动项中行动项内容不能为空");
-            }
-            if (c.getChangeExecFinishTime() == null || c.getChangeExecFinishTime() <= 0) {
-                throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "行动项中变更完成时间不能为空");
-            }
-        });
-        
         return changeExecProjectList.stream().map(c -> {
             ChangeExecRecord changeExecRecord = new ChangeExecRecord();
             changeExecRecord.setChangeRecordId(changeRecordId);

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

@@ -249,10 +249,31 @@ public class ChangeFlowBiz {
         changeFlowCreateReq.setChangeDepartment(changeConfig.getChangeDepartment());
         // 变更行动项不可为空，最多20项
         List<ChangeExecConfigReq> changeExecProject = changeFlowCreateReq.getChangeExecProject();
+        if (CollectionUtils.isEmpty(changeExecProject)) {
+            throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "行动项列表不能为空");
+        }
         Assert.isTrue(changeExecProject.size() <= appConfig.getChangeExecLimit(),
                 "变更行动方案配置数超限");
         // 校验变更行动方案中是否有重复的变更行动人
         validateDuplicateChangeExecUser(changeExecProject);
+        // 校验每个行动项的必填字段
+        changeExecProject.forEach(c -> {
+            if (StringUtils.isBlank(c.getChangeExecUser())) {
+                throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "行动项中变更行动人不能为空");
+            }
+            if (StringUtils.isBlank(c.getChangeExecUserEmail())) {
+                throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "行动项中变更行动人邮箱不能为空");
+            }
+            if (StringUtils.isBlank(c.getChangeRiskDesc())) {
+                throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "行动项中变更风险描述不能为空");
+            }
+            if (StringUtils.isBlank(c.getChangeExecProject())) {
+                throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "行动项中行动项内容不能为空");
+            }
+            if (c.getChangeExecFinishTime() == null || c.getChangeExecFinishTime() <= 0) {
+                throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "行动项中变更完成时间不能为空");
+            }
+        });
         // 结束时间不可晚于第二天定时任务执行时间
         Long tomorrowSpecificTime = DateUtils.getTomorrowSpecificTime("00:00:00");
         Assert.isTrue(changeFlowCreateReq.getChangeConfirmResultTime() >= tomorrowSpecificTime, "时间不可晚于下次执行时间");