feat: 同舟端首次提交不需要填写行动项中的变更完成时间

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

@@ -56,10 +56,11 @@ public class ChangeExecRecordBiz {
 
     /**
      * 校验行动项的必填字段
-     * 
+     *
      * @param changeExecProjectList 行动项列表
+     * @param checkTime
      */
-    public void validateChangeExecProjectRequiredFields(List<ChangeExecConfigReq> changeExecProjectList) {
+    public void validateChangeExecProjectRequiredFields(List<ChangeExecConfigReq> changeExecProjectList, boolean checkTime) {
         if (CollectionUtils.isEmpty(changeExecProjectList)) {
             return;
         }
@@ -74,7 +75,7 @@ public class ChangeExecRecordBiz {
             if (StringUtils.isBlank(c.getChangeExecProject())) {
                 throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "行动项中行动项内容不能为空");
             }
-            if (c.getChangeExecFinishTime() == null || c.getChangeExecFinishTime() <= 0) {
+            if (checkTime && (c.getChangeExecFinishTime() == null || c.getChangeExecFinishTime() <= 0)) {
                 throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "行动项中变更完成时间不能为空");
             }
         });

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

@@ -25,7 +25,6 @@ import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 
 import com.alibaba.fastjson.JSON;
@@ -259,8 +258,9 @@ public class ChangeFlowBiz {
         }
         Assert.isTrue(changeExecProject.size() <= appConfig.getChangeExecLimit(),
                 "变更行动方案配置数超限");
-        // 校验每个行动项的必填字段
-        changeExecRecordBiz.validateChangeExecProjectRequiredFields(changeExecProject);
+        // 校验每个行动项的必填字段,首次提交，其他端不会自动提交，行动实践非必填
+        boolean tongzhouCreateSource = CreateSourceEnum.TONG_ZHOU.getType().equals(changeFlowCreateReq.getCreateSource());
+        changeExecRecordBiz.validateChangeExecProjectRequiredFields(changeExecProject, !tongzhouCreateSource);
         // 校验变更行动方案中是否有重复的变更行动人
         validateDuplicateChangeExecUser(changeExecProject);
         // 结束时间不可晚于第二天定时任务执行时间
@@ -649,7 +649,7 @@ public class ChangeFlowBiz {
                     throw ExceptionFactory.createBiz(ResponseCode.BAD_REQUEST, "变更行动方案配置数超限");
                 }
                 // 校验每个行动项的必填字段
-                changeExecRecordBiz.validateChangeExecProjectRequiredFields(changeExecProjectList);
+                changeExecRecordBiz.validateChangeExecProjectRequiredFields(changeExecProjectList, true);
                 // 校验变更行动方案中是否有重复的变更行动人
                 validateDuplicateChangeExecUser(changeExecProjectList);
                 changeRecord.setParentChangeClassId(changeFlowSubmitReq.getParentChangeClassId());

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

@@ -286,7 +286,7 @@ public class ChangeSubFlowBiz {
                 });
                 
                 // 校验所有行动项的必填字段（使用公共方法）
-                changeExecRecordBiz.validateChangeExecProjectRequiredFields(changeExecProjectList);
+                changeExecRecordBiz.validateChangeExecProjectRequiredFields(changeExecProjectList, true);
                 
                 // 删除子单下所有行动项
                 changeFlowExecService.deleteBySubFlowRecordId(subFlowRecord.getId());