refactor(): 增加重点作业处罚人员数据判空逻辑

web-app/src/main/java/com/zcloud/key/project/command/project/KeyProjectAddExe.java

@@ -2,6 +2,7 @@ package com.zcloud.key.project.command.project;
 
 import cn.hutool.core.collection.CollUtil;
 import com.alibaba.cola.exception.BizException;
+import com.alibaba.nacos.client.naming.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.zcloud.gbscommon.utils.Tools;
 import com.zcloud.key.project.command.convertor.project.KeyProjectCameraCoConvertor;
@@ -30,6 +31,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 
 /**
@@ -52,6 +54,15 @@ public class KeyProjectAddExe {
 
     @Transactional(rollbackFor = Exception.class)
     public KeyProjectCO execute(KeyProjectAddCmd cmd) {
+        List<KeyProjectPenaltyPersonnelAddCmd> penaltyPersonnelAddCmdList = null;
+        if (cmd.getKeyProjectPenaltyPersonnelAddCmdList() != null) {
+            penaltyPersonnelAddCmdList = cmd.getKeyProjectPenaltyPersonnelAddCmdList().stream()
+                    .filter(item -> item != null && (item.getUserId() != null
+                            || item.getDepartmentId() != null
+                            || StringUtils.isNotBlank(item.getUserName())
+                            || StringUtils.isNotBlank(item.getDepartmentName())))
+                    .collect(Collectors.toList());
+        }
 
 //        if (StringUtils.isNotBlank(cmd.getProjectId()) && StringUtils.isNotBlank(cmd.getProjectName())) {
 //            QueryWrapper<KeyProjectDO> queryWrapper = new QueryWrapper<>();
@@ -65,7 +76,7 @@ public class KeyProjectAddExe {
 //        }
 
         // 流程一（手动创建）：处罚人员必填
-        if (CreateSourceEnum.MANUAL.getCode().equals(cmd.getCreateSource()) && CollUtil.isEmpty(cmd.getKeyProjectPenaltyPersonnelAddCmdList())) {
+        if (CreateSourceEnum.MANUAL.getCode().equals(cmd.getCreateSource()) && CollUtil.isEmpty(penaltyPersonnelAddCmdList)) {
             throw new BizException("处罚人员为必填项");
         }
 
@@ -96,8 +107,7 @@ public class KeyProjectAddExe {
             });
             keyProjectCameraRepository.saveBatch(keyProjectCameraDOList);
         }
-        if (cmd.getKeyProjectPenaltyPersonnelAddCmdList() != null) {
+        if (!CollectionUtils.isEmpty(penaltyPersonnelAddCmdList)) {
-            List<KeyProjectPenaltyPersonnelAddCmd> penaltyPersonnelAddCmdList = cmd.getKeyProjectPenaltyPersonnelAddCmdList();
             List<KeyProjectPenaltyPersonnelDO> penaltyPersonnelDOList = keyProjectPenaltyPersonnelCoConvertor.converCmdsToDOs(penaltyPersonnelAddCmdList);
             penaltyPersonnelDOList.forEach(item -> {
                 item.setKeyProjectId(keyProjectE.getKeyProjectId());

web-app/src/main/java/com/zcloud/key/project/command/project/KeyProjectUpdateExe.java

@@ -2,6 +2,7 @@ package com.zcloud.key.project.command.project;
 
 import cn.hutool.core.collection.CollUtil;
 import com.alibaba.cola.exception.BizException;
+import com.alibaba.nacos.client.naming.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.zcloud.gbscommon.utils.Tools;
 import com.zcloud.key.project.command.convertor.project.KeyProjectCameraCoConvertor;
@@ -32,6 +33,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 
 /**
@@ -54,6 +56,7 @@ public class KeyProjectUpdateExe {
 
     @Transactional(rollbackFor = Exception.class)
     public void execute(KeyProjectUpdateCmd keyProjectUpdateCmd) {
+        List<KeyProjectPenaltyPersonnelAddCmd> penaltyPersonnelAddCmdList = filterPenaltyPersonnelAddCmdList(keyProjectUpdateCmd.getKeyProjectPenaltyPersonnelAddCmdList());
         KeyProjectDO byId = keyProjectRepository.getById(keyProjectUpdateCmd.getId());
         if (byId == null) {
             throw new BizException("数据不存在");
@@ -99,7 +102,7 @@ public class KeyProjectUpdateExe {
         }
         if (keyProjectUpdateCmd.getKeyProjectPenaltyPersonnelAddCmdList() != null) {
             keyProjectPenaltyPersonnelRepository.deleteByKeyProjectId(keyProjectE.getKeyProjectId());
-            List<KeyProjectPenaltyPersonnelAddCmd> penaltyPersonnelAddCmdList = keyProjectUpdateCmd.getKeyProjectPenaltyPersonnelAddCmdList();
+            if (!CollectionUtils.isEmpty(penaltyPersonnelAddCmdList)) {
                 List<KeyProjectPenaltyPersonnelDO> penaltyPersonnelDOList = keyProjectPenaltyPersonnelCoConvertor.converCmdsToDOs(penaltyPersonnelAddCmdList);
                 penaltyPersonnelDOList.forEach(item -> {
                     item.setKeyProjectId(keyProjectE.getKeyProjectId());
@@ -107,6 +110,7 @@ public class KeyProjectUpdateExe {
                 });
                 keyProjectPenaltyPersonnelRepository.saveBatch(penaltyPersonnelDOList);
             }
+        }
 
 
 
@@ -123,6 +127,7 @@ public class KeyProjectUpdateExe {
     }
 
     public void editStatus(KeyProjectUpdateStatusCmd keyProjectUpdateStatusCmd) {
+        List<KeyProjectPenaltyPersonnelAddCmd> penaltyPersonnelAddCmdList = filterPenaltyPersonnelAddCmdList(keyProjectUpdateStatusCmd.getKeyProjectPenaltyPersonnelAddCmdList());
         KeyProjectDO byId = keyProjectRepository.getById(keyProjectUpdateStatusCmd.getId());
         if (byId == null) {
             throw new BizException("数据不存在");
@@ -187,7 +192,7 @@ public class KeyProjectUpdateExe {
             }
             if (keyProjectUpdateStatusCmd.getKeyProjectPenaltyPersonnelAddCmdList() != null) {
                 keyProjectPenaltyPersonnelRepository.deleteByKeyProjectId(byId.getKeyProjectId());
-                List<KeyProjectPenaltyPersonnelAddCmd> penaltyPersonnelAddCmdList = keyProjectUpdateStatusCmd.getKeyProjectPenaltyPersonnelAddCmdList();
+                if (!CollectionUtils.isEmpty(penaltyPersonnelAddCmdList)) {
                     List<KeyProjectPenaltyPersonnelDO> penaltyPersonnelDOList = keyProjectPenaltyPersonnelCoConvertor.converCmdsToDOs(penaltyPersonnelAddCmdList);
                     penaltyPersonnelDOList.forEach(item -> {
                         item.setKeyProjectId(byId.getKeyProjectId());
@@ -197,6 +202,7 @@ public class KeyProjectUpdateExe {
                 }
             }
         }
+    }
 
     public void updatExecuteStatusJob() {
         //查找昨日过期的数据，进行消息提醒
@@ -211,5 +217,17 @@ public class KeyProjectUpdateExe {
        });
 
     }
+
+    private List<KeyProjectPenaltyPersonnelAddCmd> filterPenaltyPersonnelAddCmdList(List<KeyProjectPenaltyPersonnelAddCmd> penaltyPersonnelAddCmdList) {
+        if (penaltyPersonnelAddCmdList == null) {
+            return null;
+        }
+        return penaltyPersonnelAddCmdList.stream()
+                .filter(item -> item != null && (item.getUserId() != null
+                        || item.getDepartmentId() != null
+                        || StringUtils.isNotBlank(item.getUserName())
+                        || StringUtils.isNotBlank(item.getDepartmentName())))
+                .collect(Collectors.toList());
+    }
 }