漏检统计表

airport-blocked/src/main/java/com/sundot/airport/blocked/service/impl/BlockedMissCheckStatisticsServiceImpl.java

@@ -2,10 +2,14 @@ package com.sundot.airport.blocked.service.impl;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
+import com.sundot.airport.common.core.domain.entity.SysDictData;
+import com.sundot.airport.system.service.ISysDictDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -41,6 +45,9 @@ public class BlockedMissCheckStatisticsServiceImpl implements IBlockedMissCheckS
     @Autowired
     private ISysDeptService sysDeptService;
 
+    @Autowired
+    private ISysDictDataService sysDictDataService;
+
     /**
      * 查询漏检统计
      *
@@ -133,6 +140,7 @@ public class BlockedMissCheckStatisticsServiceImpl implements IBlockedMissCheckS
         StringBuilder failureMsg = new StringBuilder();
 
         for (BlockedMissCheckStatistics data : list) {
+            fillIdsByName(data);
             try {
                 if (ObjUtil.isNull(data.getReviewDate())) {
                     failureNum++;
@@ -144,6 +152,106 @@ public class BlockedMissCheckStatisticsServiceImpl implements IBlockedMissCheckS
                     failureMsg.append("<br/>" + failureNum + "、漏检时间不能为空");
                     continue;
                 }
+                if (ObjUtil.isNull(data.getBrigadeId()) || ObjUtil.isNull(data.getBrigadeName())) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、大队不能为空");
+                    continue;
+                }
+                if (ObjUtil.isNull(data.getTerminalId()) || ObjUtil.isNull(data.getTerminalName())) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、航站楼不能为空");
+                    continue;
+                }
+                if (ObjUtil.isNull(data.getAreaId()) || ObjUtil.isNull(data.getAreaName())) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、区域不能为空");
+                    continue;
+                }
+                if (ObjUtil.isNull(data.getChannelId()) || ObjUtil.isNull(data.getChannelName())) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、上岗位置不能为空");
+                    continue;
+                }
+                if (ObjUtil.isNull(data.getReviewedUserId()) || ObjUtil.isNull(data.getReviewedUserName())) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、被回查人不能为空");
+                    continue;
+                }
+                if (ObjUtil.isNull(data.getReviewUserId()) || ObjUtil.isNull(data.getReviewUserName())) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、回查人不能为空");
+                    continue;
+                }
+                if (ObjUtil.isNull(data.getSupervisorId()) || ObjUtil.isNull(data.getSupervisorName())) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、分管主管不能为空");
+                    continue;
+                }
+                if (ObjUtil.isNull(data.getTeamLeaderId()) || ObjUtil.isNull(data.getTeamLeaderName())) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、分管班组长不能为空");
+                    continue;
+                }
+                if (ObjUtil.isNull(data.getMissCheckTimePeriod())) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、漏检时间段不能为空");
+                    continue;
+                }
+                if (ObjUtil.isNull(data.getMissCheckItem())) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、漏检物品不能为空");
+                    continue;
+                }
+                if (ObjUtil.isNull(data.getItemLocation())) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、物品位置不能为空");
+                    continue;
+                }
+                if (ObjUtil.isNull(data.getDifficultyLevel())) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、难度级别不能为空");
+                    continue;
+                }
+                if (ObjUtil.isNull(data.getDiscriminationType())) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、判别类型不能为空");
+                    continue;
+                }
+                if (ObjUtil.isNull(data.getIsRecovered())) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、是否追回不能为空");
+                    continue;
+                }
+                if (ObjUtil.isNull(data.getMachineOperatingYears())) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、开机年限不能为空");
+                    continue;
+                }
+                if (ObjUtil.isNull(data.getCertificateLevel())) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、证书级别不能为空");
+                    continue;
+                }
+                if (ObjUtil.isNull(data.getGender())) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、人员性别不能为空");
+                    continue;
+                }
+                if (ObjUtil.isNull(data.getMissCheckReasonCategory())) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、漏检原因分类不能为空");
+                    continue;
+                }
+                if (ObjUtil.isNull(data.getMonthlyAssessment())) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、月考核不能为空");
+                    continue;
+                }
+                if (ObjUtil.isNull(data.getSelfTestHasMissCheck())) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、本月自测有无漏检不能为空");
+                    continue;
+                }
 
                 // 查询是否已存在（根据被回查人+回查日期+漏检时间唯一）
                 BlockedMissCheckStatistics queryParam = new BlockedMissCheckStatistics();
@@ -154,7 +262,6 @@ public class BlockedMissCheckStatisticsServiceImpl implements IBlockedMissCheckS
 
                 if (CollUtil.isEmpty(existingList)) {
                     // 新增
-                    fillIdsByName(data);
                     data.setCreateTime(DateUtils.getNowDate());
                     blockedMissCheckStatisticsMapper.insertBlockedMissCheckStatistics(data);
                     successNum++;
@@ -162,7 +269,6 @@ public class BlockedMissCheckStatisticsServiceImpl implements IBlockedMissCheckS
                     // 更新
                     BlockedMissCheckStatistics old = existingList.get(0);
                     data.setId(old.getId());
-                    fillIdsByName(data);
                     data.setUpdateTime(DateUtils.getNowDate());
                     blockedMissCheckStatisticsMapper.updateBlockedMissCheckStatistics(data);
                     successNum++;
@@ -359,5 +465,59 @@ public class BlockedMissCheckStatisticsServiceImpl implements IBlockedMissCheckS
                 data.setTeamLeaderId(userList.get(0).getUserId());
             }
         }
+
+        // 判别类型 - 通过漏检统计判断类型字典查询
+        if (StrUtil.isNotBlank(data.getDiscriminationType())) {
+            SysDictData query = new SysDictData();
+            query.setDictType("discrimination_type");
+            List<SysDictData> sysDictDataList = sysDictDataService.selectDictDataList(query);
+            Map<String, String> sysDictDataMap = sysDictDataList.stream().collect(Collectors.toMap(SysDictData::getDictLabel, SysDictData::getDictValue));
+            data.setDiscriminationType(sysDictDataMap.get(data.getDiscriminationType()));
+        }
+
+        // 开机年限 - 通过查堵开机年限字典查询
+        if (StrUtil.isNotBlank(data.getMachineOperatingYears())) {
+            SysDictData query = new SysDictData();
+            query.setDictType("blocked_operating_years");
+            List<SysDictData> sysDictDataList = sysDictDataService.selectDictDataList(query);
+            Map<String, String> sysDictDataMap = sysDictDataList.stream().collect(Collectors.toMap(SysDictData::getDictLabel, SysDictData::getDictValue));
+            data.setMachineOperatingYears(sysDictDataMap.get(data.getMachineOperatingYears()));
+        }
+
+        // 漏检原因分类 - 通过查堵漏检原因分类字典查询
+        if (StrUtil.isNotBlank(data.getMissCheckReasonCategory())) {
+            SysDictData query = new SysDictData();
+            query.setDictType("blocked_miss_check_reason");
+            List<SysDictData> sysDictDataList = sysDictDataService.selectDictDataList(query);
+            Map<String, String> sysDictDataMap = sysDictDataList.stream().collect(Collectors.toMap(SysDictData::getDictLabel, SysDictData::getDictValue));
+            data.setMissCheckReasonCategory(sysDictDataMap.get(data.getMissCheckReasonCategory()));
+        }
+
+        // 月考核 - 通过查堵月考成绩字典查询
+        if (StrUtil.isNotBlank(data.getMonthlyAssessment())) {
+            SysDictData query = new SysDictData();
+            query.setDictType("blocked_monthly_exam_result");
+            List<SysDictData> sysDictDataList = sysDictDataService.selectDictDataList(query);
+            Map<String, String> sysDictDataMap = sysDictDataList.stream().collect(Collectors.toMap(SysDictData::getDictLabel, SysDictData::getDictValue));
+            data.setMonthlyAssessment(sysDictDataMap.get(data.getMonthlyAssessment()));
+        }
+
+        // 物品位置 - 通过查堵物品位置字典查询
+        if (StrUtil.isNotBlank(data.getItemLocation())) {
+            SysDictData query = new SysDictData();
+            query.setDictType("blocked_item_position");
+            List<SysDictData> sysDictDataList = sysDictDataService.selectDictDataList(query);
+            Map<String, String> sysDictDataMap = sysDictDataList.stream().collect(Collectors.toMap(SysDictData::getDictLabel, SysDictData::getDictValue));
+            data.setItemLocation(sysDictDataMap.get(data.getItemLocation()));
+        }
+
+        // 漏检时间段 - 通过查堵时间段字典查询
+        if (StrUtil.isNotBlank(data.getMissCheckTimePeriod())) {
+            SysDictData query = new SysDictData();
+            query.setDictType("blocked_time_period");
+            List<SysDictData> sysDictDataList = sysDictDataService.selectDictDataList(query);
+            Map<String, String> sysDictDataMap = sysDictDataList.stream().collect(Collectors.toMap(SysDictData::getDictLabel, SysDictData::getDictValue));
+            data.setMissCheckTimePeriod(sysDictDataMap.get(data.getMissCheckTimePeriod()));
+        }
     }
 }