PSSR主清单 - 打包内容存在空表可能出现的问题处理（补充13消气防设施中的应急事故柜/常闭式防爆门/防火门）

master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyCabinetController.java

@@ -87,9 +87,12 @@ public class TEmergencyCabinetController extends BaseController {
         try {
             tEmergencyCabinet.setIssuesFlag("0");
             XSSFWorkbook workbook = new XSSFWorkbook();
-            generateSheet1(workbook, tEmergencyCabinet);
-            generateSheet(workbook, tEmergencyCabinet, "2");
-            generateSheet(workbook, tEmergencyCabinet, "3");
+            List<TEmergencyCabinet> list1 = generateSheet1(workbook, tEmergencyCabinet);
+            List<TEmergencyCabinet> list2 = generateSheet(workbook, tEmergencyCabinet, "2");
+            List<TEmergencyCabinet> list3 = generateSheet(workbook, tEmergencyCabinet, "3");
+            if (list1.size() == 0 || list2.size() == 0 || list3.size() == 0) {
+                return AjaxResult.error("暂无可导出数据");
+            }
             // 设置单元格样式
             // 文字居中，自动换行，四周边框
             CellStyle style = workbook.createCellStyle();
@@ -170,7 +173,7 @@ public class TEmergencyCabinetController extends BaseController {
         }
     }
 
-    private void generateSheet1(XSSFWorkbook workbook, TEmergencyCabinet tEmergencyCabinet) {
+    private List<TEmergencyCabinet> generateSheet1(XSSFWorkbook workbook, TEmergencyCabinet tEmergencyCabinet) {
         tEmergencyCabinet.setDevType("1");
         List<TEmergencyCabinet> list = tEmergencyCabinetService.selectTEmergencyCabinetList(tEmergencyCabinet);
         XSSFSheet sheet = workbook.createSheet("事故柜1检查记录");// 设置列宽
@@ -287,9 +290,10 @@ public class TEmergencyCabinetController extends BaseController {
         row29.createCell(3).setCellValue(confirmedDate != null ? new SimpleDateFormat("yyyy-MM-dd").format(confirmedDate) : "");
         ExcelUtils.createVoidCell(4, 7, row29);
         sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 3, 7));
+        return list;
     }
 
-    private void generateSheet(XSSFWorkbook workbook, TEmergencyCabinet tEmergencyCabinet, String devType) {
+    private List<TEmergencyCabinet> generateSheet(XSSFWorkbook workbook, TEmergencyCabinet tEmergencyCabinet, String devType) {
         tEmergencyCabinet.setDevType(devType);
         List<TEmergencyCabinet> list = tEmergencyCabinetService.selectTEmergencyCabinetList(tEmergencyCabinet);
         XSSFSheet sheet = workbook.createSheet("事故柜" + devType + "检查记录");// 设置列宽
@@ -405,7 +409,7 @@ public class TEmergencyCabinetController extends BaseController {
         row29.createCell(4).setCellValue(confirmedDate != null ? new SimpleDateFormat("yyyy-MM-dd").format(confirmedDate) : "");
         ExcelUtils.createVoidCell(3, 7, row29);
         sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 3, 7));
-
+        return list;
     }
 
     /**

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireDoorController.java

@@ -83,9 +83,12 @@ public class TFireDoorController extends BaseController {
             tFireDoor.setIssuesFlag("0");
             XSSFWorkbook workbook = new XSSFWorkbook();
             tFireDoor.setDevType("D301");
-            generateSheet(workbook, tFireDoor, "6");
+            List<TFireDoor> tFireDoors1 = generateSheet(workbook, tFireDoor, "6");
             tFireDoor.setDevType("D201");
-            generateSheet(workbook, tFireDoor, "7");
+            List<TFireDoor> tFireDoors2 = generateSheet(workbook, tFireDoor, "7");
+            if (tFireDoors1.size() == 0 || tFireDoors2.size() == 0) {
+                return AjaxResult.error("暂无可导出数据");
+            }
             // 设置单元格样式
             // 文字居中，自动换行，四周边框
             CellStyle style = workbook.createCellStyle();
@@ -160,7 +163,7 @@ public class TFireDoorController extends BaseController {
         }
     }
 
-    private void generateSheet(XSSFWorkbook workbook, TFireDoor tFireDoor, String val) throws IOException {
+    private List<TFireDoor> generateSheet(XSSFWorkbook workbook, TFireDoor tFireDoor, String val) throws IOException {
         List<TFireDoor> list = tFireDoorService.selectTFireDoorList(tFireDoor);
         // 创建工作簿
         XSSFSheet sheet = workbook.createSheet(tFireDoor.getDevType()+"常闭式防爆门及防火门检查记录");
@@ -262,6 +265,7 @@ public class TFireDoorController extends BaseController {
         row29.createCell(2).setCellValue(confirmedDate != null ? new SimpleDateFormat("yyyy-MM-dd").format(confirmedDate) : "");
         ExcelUtils.createVoidCell(3, 8, row29);
         sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 2, 8));
+        return list;
     }
 
     /**