漏检统计表

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

@@ -144,112 +144,112 @@ public class BlockedMissCheckStatisticsServiceImpl implements IBlockedMissCheckS
             try {
                 if (ObjUtil.isNull(data.getReviewDate())) {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、回查日期不能为空");
+                    failureMsg.append("<br/>" + failureNum + "、被回查人【" + data.getReviewedUserName() + "】、回查日期【" + data.getReviewDate() + "】、漏检时间【" + data.getMissCheckTime() + "】回查日期不能为空");
                     continue;
                 }
                 if (ObjUtil.isNull(data.getMissCheckTime())) {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、漏检时间不能为空");
+                    failureMsg.append("<br/>" + failureNum + "、被回查人【" + data.getReviewedUserName() + "】、回查日期【" + data.getReviewDate() + "】、漏检时间【" + data.getMissCheckTime() + "】漏检时间不能为空");
+                    continue;
+                }
+                if (ObjUtil.isNull(data.getReviewedUserId()) || ObjUtil.isNull(data.getReviewedUserName())) {
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、被回查人【" + data.getReviewedUserName() + "】、回查日期【" + data.getReviewDate() + "】、漏检时间【" + data.getMissCheckTime() + "】被回查人不能为空");
                     continue;
                 }
                 if (ObjUtil.isNull(data.getBrigadeId()) || ObjUtil.isNull(data.getBrigadeName())) {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、大队不能为空");
+                    failureMsg.append("<br/>" + failureNum + "、被回查人【" + data.getReviewedUserName() + "】、回查日期【" + data.getReviewDate() + "】、漏检时间【" + data.getMissCheckTime() + "】大队不能为空");
                     continue;
                 }
                 if (ObjUtil.isNull(data.getTerminalId()) || ObjUtil.isNull(data.getTerminalName())) {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、航站楼不能为空");
+                    failureMsg.append("<br/>" + failureNum + "、被回查人【" + data.getReviewedUserName() + "】、回查日期【" + data.getReviewDate() + "】、漏检时间【" + data.getMissCheckTime() + "】航站楼不能为空");
                     continue;
                 }
                 if (ObjUtil.isNull(data.getAreaId()) || ObjUtil.isNull(data.getAreaName())) {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、区域不能为空");
+                    failureMsg.append("<br/>" + failureNum + "、被回查人【" + data.getReviewedUserName() + "】、回查日期【" + data.getReviewDate() + "】、漏检时间【" + data.getMissCheckTime() + "】区域不能为空");
                     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 + "、被回查人不能为空");
+                    failureMsg.append("<br/>" + failureNum + "、被回查人【" + data.getReviewedUserName() + "】、回查日期【" + data.getReviewDate() + "】、漏检时间【" + data.getMissCheckTime() + "】上岗位置不能为空");
                     continue;
                 }
                 if (ObjUtil.isNull(data.getReviewUserId()) || ObjUtil.isNull(data.getReviewUserName())) {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、回查人不能为空");
+                    failureMsg.append("<br/>" + failureNum + "、被回查人【" + data.getReviewedUserName() + "】、回查日期【" + data.getReviewDate() + "】、漏检时间【" + data.getMissCheckTime() + "】回查人不能为空");
                     continue;
                 }
                 if (ObjUtil.isNull(data.getSupervisorId()) || ObjUtil.isNull(data.getSupervisorName())) {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、分管主管不能为空");
+                    failureMsg.append("<br/>" + failureNum + "、被回查人【" + data.getReviewedUserName() + "】、回查日期【" + data.getReviewDate() + "】、漏检时间【" + data.getMissCheckTime() + "】分管主管不能为空");
                     continue;
                 }
                 if (ObjUtil.isNull(data.getTeamLeaderId()) || ObjUtil.isNull(data.getTeamLeaderName())) {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、分管班组长不能为空");
+                    failureMsg.append("<br/>" + failureNum + "、被回查人【" + data.getReviewedUserName() + "】、回查日期【" + data.getReviewDate() + "】、漏检时间【" + data.getMissCheckTime() + "】分管班组长不能为空");
                     continue;
                 }
                 if (ObjUtil.isNull(data.getMissCheckTimePeriod())) {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、漏检时间段不能为空");
+                    failureMsg.append("<br/>" + failureNum + "、被回查人【" + data.getReviewedUserName() + "】、回查日期【" + data.getReviewDate() + "】、漏检时间【" + data.getMissCheckTime() + "】漏检时间段不能为空");
                     continue;
                 }
                 if (ObjUtil.isNull(data.getMissCheckItem())) {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、漏检物品不能为空");
+                    failureMsg.append("<br/>" + failureNum + "、被回查人【" + data.getReviewedUserName() + "】、回查日期【" + data.getReviewDate() + "】、漏检时间【" + data.getMissCheckTime() + "】漏检物品不能为空");
                     continue;
                 }
                 if (ObjUtil.isNull(data.getItemLocation())) {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、物品位置不能为空");
+                    failureMsg.append("<br/>" + failureNum + "、被回查人【" + data.getReviewedUserName() + "】、回查日期【" + data.getReviewDate() + "】、漏检时间【" + data.getMissCheckTime() + "】物品位置不能为空");
                     continue;
                 }
                 if (ObjUtil.isNull(data.getDifficultyLevel())) {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、难度级别不能为空");
+                    failureMsg.append("<br/>" + failureNum + "、被回查人【" + data.getReviewedUserName() + "】、回查日期【" + data.getReviewDate() + "】、漏检时间【" + data.getMissCheckTime() + "】难度级别不能为空");
                     continue;
                 }
                 if (ObjUtil.isNull(data.getDiscriminationType())) {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、判别类型不能为空");
+                    failureMsg.append("<br/>" + failureNum + "、被回查人【" + data.getReviewedUserName() + "】、回查日期【" + data.getReviewDate() + "】、漏检时间【" + data.getMissCheckTime() + "】判别类型不能为空");
                     continue;
                 }
                 if (ObjUtil.isNull(data.getIsRecovered())) {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、是否追回不能为空");
+                    failureMsg.append("<br/>" + failureNum + "、被回查人【" + data.getReviewedUserName() + "】、回查日期【" + data.getReviewDate() + "】、漏检时间【" + data.getMissCheckTime() + "】是否追回不能为空");
                     continue;
                 }
                 if (ObjUtil.isNull(data.getMachineOperatingYears())) {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、开机年限不能为空");
+                    failureMsg.append("<br/>" + failureNum + "、被回查人【" + data.getReviewedUserName() + "】、回查日期【" + data.getReviewDate() + "】、漏检时间【" + data.getMissCheckTime() + "】开机年限不能为空");
                     continue;
                 }
                 if (ObjUtil.isNull(data.getCertificateLevel())) {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、证书级别不能为空");
+                    failureMsg.append("<br/>" + failureNum + "、被回查人【" + data.getReviewedUserName() + "】、回查日期【" + data.getReviewDate() + "】、漏检时间【" + data.getMissCheckTime() + "】证书级别不能为空");
                     continue;
                 }
                 if (ObjUtil.isNull(data.getGender())) {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、人员性别不能为空");
+                    failureMsg.append("<br/>" + failureNum + "、被回查人【" + data.getReviewedUserName() + "】、回查日期【" + data.getReviewDate() + "】、漏检时间【" + data.getMissCheckTime() + "】人员性别不能为空");
                     continue;
                 }
                 if (ObjUtil.isNull(data.getMissCheckReasonCategory())) {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、漏检原因分类不能为空");
+                    failureMsg.append("<br/>" + failureNum + "、被回查人【" + data.getReviewedUserName() + "】、回查日期【" + data.getReviewDate() + "】、漏检时间【" + data.getMissCheckTime() + "】漏检原因分类不能为空");
                     continue;
                 }
                 if (ObjUtil.isNull(data.getMonthlyAssessment())) {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、月考核不能为空");
+                    failureMsg.append("<br/>" + failureNum + "、被回查人【" + data.getReviewedUserName() + "】、回查日期【" + data.getReviewDate() + "】、漏检时间【" + data.getMissCheckTime() + "】月考核不能为空");
                     continue;
                 }
                 if (ObjUtil.isNull(data.getSelfTestHasMissCheck())) {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、本月自测有无漏检不能为空");
+                    failureMsg.append("<br/>" + failureNum + "、被回查人【" + data.getReviewedUserName() + "】、回查日期【" + data.getReviewDate() + "】、漏检时间【" + data.getMissCheckTime() + "】本月自测有无漏检不能为空");
                     continue;
                 }
 
@@ -278,7 +278,7 @@ public class BlockedMissCheckStatisticsServiceImpl implements IBlockedMissCheckS
                 }
             } catch (Exception e) {
                 failureNum++;
-                String msg = "<br/>" + failureNum + "、被回查人【" + data.getReviewedUserName() + "】导入失败：";
+                String msg = "<br/>" + failureNum + "、被回查人【" + data.getReviewedUserName() + "】、回查日期【" + data.getReviewDate() + "】、漏检时间【" + data.getMissCheckTime() + "】导入失败：";
                 failureMsg.append(msg + e.getMessage());
             }
         }