每日行李过检查堵统计表

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

@@ -132,17 +132,17 @@ public class BlockedLuggageStatisticsDailyServiceImpl implements IBlockedLuggage
                 // 数据校验
                 if (ObjUtil.isNull(data.getStatDate())) {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、统计日期不能为空");
+                    failureMsg.append("<br/>" + failureNum + "、统计日期【" + data.getStatDate() + "】、班次类型【" + data.getShiftType() + "】、当班大队【" + data.getBrigadeName() + "】统计日期不能为空");
                     continue;
                 }
                 if (ObjUtil.isNull(data.getShiftType())) {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、班次类型不能为空");
+                    failureMsg.append("<br/>" + failureNum + "、统计日期【" + data.getStatDate() + "】、班次类型【" + data.getShiftType() + "】、当班大队【" + data.getBrigadeName() + "】班次类型不能为空");
                     continue;
                 }
-                if (ObjUtil.isNull(data.getBrigadeId())) {
+                if (ObjUtil.isNull(data.getBrigadeId()) || ObjUtil.isNull(data.getBrigadeName())) {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、当班大队ID不能为空");
+                    failureMsg.append("<br/>" + failureNum + "、统计日期【" + data.getStatDate() + "】、班次类型【" + data.getShiftType() + "】、当班大队【" + data.getBrigadeName() + "】当班大队不能为空");
                     continue;
                 }
 
@@ -159,7 +159,7 @@ public class BlockedLuggageStatisticsDailyServiceImpl implements IBlockedLuggage
                     calculateAndSetFields(data);
                     blockedLuggageStatisticsDailyMapper.insertBlockedLuggageStatisticsDaily(data);
                     successNum++;
-                    successMsg.append("<br/>" + successNum + "、统计日期【" + data.getStatDate() + "】、班次【" + data.getShiftType() + "】、大队【" + data.getBrigadeName() + "】导入成功");
+                    successMsg.append("<br/>" + successNum + "、统计日期【" + data.getStatDate() + "】、班次类型【" + data.getShiftType() + "】、当班大队【" + data.getBrigadeName() + "】导入成功");
                 } else if (isUpdateSupport) {
                     // 更新
                     BlockedLuggageStatisticsDaily old = existingList.get(0);
@@ -168,14 +168,14 @@ public class BlockedLuggageStatisticsDailyServiceImpl implements IBlockedLuggage
                     calculateAndSetFields(data);
                     blockedLuggageStatisticsDailyMapper.updateBlockedLuggageStatisticsDaily(data);
                     successNum++;
-                    successMsg.append("<br/>" + successNum + "、统计日期【" + data.getStatDate() + "】、班次【" + data.getShiftType() + "】、大队【" + data.getBrigadeName() + "】更新成功");
+                    successMsg.append("<br/>" + successNum + "、统计日期【" + data.getStatDate() + "】、班次类型【" + data.getShiftType() + "】、当班大队【" + data.getBrigadeName() + "】更新成功");
                 } else {
                     failureNum++;
-                    failureMsg.append("<br/>" + failureNum + "、统计日期【" + data.getStatDate() + "】、班次【" + data.getShiftType() + "】、大队【" + data.getBrigadeName() + "】已存在");
+                    failureMsg.append("<br/>" + failureNum + "、统计日期【" + data.getStatDate() + "】、班次类型【" + data.getShiftType() + "】、当班大队【" + data.getBrigadeName() + "】已存在");
                 }
             } catch (Exception e) {
                 failureNum++;
-                String msg = "<br/>" + failureNum + "、统计日期【" + data.getStatDate() + "】、班次【" + data.getShiftType() + "】导入失败：";
+                String msg = "<br/>" + failureNum + "、统计日期【" + data.getStatDate() + "】、班次类型【" + data.getShiftType() + "】、当班大队【" + data.getBrigadeName() + "】导入失败：";
                 failureMsg.append(msg + e.getMessage());
             }
         }