PSSR主清单导出（巡检）

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrApproveController.java

@@ -97,6 +97,9 @@ public class TPssrApproveController extends BaseController {
     @Autowired
     private ITPssrApproveService tPssrApproveService;
 
+    @Autowired
+    private ITPssrPatrolService tPssrPatrolService;
+
     @Autowired
     private ITPssrAboveallService tPssrAboveallService;
 
@@ -825,6 +828,9 @@ public class TPssrApproveController extends BaseController {
         List<TPssrSubcontent> tPssrSubcontents = tPssrSubcontentService.selectTPssrSubcontentList(queryParams);//子表集合
         this.createSubitemDirectory(rootPath);//创建子表目录
         for (TPssrSubcontent tPssrSubcontent : tPssrSubcontents) {
+            TPssrPatrol patrol = new TPssrPatrol();
+            patrol.setSubId(tPssrSubcontent.getId());
+            List<TPssrPatrol> tPssrPatrols = tPssrPatrolService.selectTPssrPatrolList(patrol);//巡检集合
             switch (tPssrSubcontent.getForShort()) {
                 case "jxxm"://检修项目
                     subTitle = "01检修项目/";
@@ -1015,113 +1021,149 @@ public class TPssrApproveController extends BaseController {
                     Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
                     files.add(new File(rootPath + subTitle + msg));
                     break;
-                case "xqf"://todo:消气防设施（巡检）
+                case "xqf"://消气防设施（巡检）
                     subTitle = "13消气防设施/";
-                    //手提式/小推车式灭火器/灭火器材箱检查记录
-                    TFireAnnihilator annihilator = new TFireAnnihilator();
-                    result = annihilatorController.export(annihilator);
-                    msg = (String) result.get("msg");
-                    path = downloadPath + msg;
-                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
-                    files.add(new File(rootPath + subTitle + msg));
-                    //消防水炮检查记录
-                    TFireWaterCannon waterCannon = new TFireWaterCannon();
-                    result = waterCannonController.export(waterCannon);
-                    msg = (String) result.get("msg");
-                    path = downloadPath + msg;
-                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
-                    files.add(new File(rootPath + subTitle + msg));
-                    //地上消火栓检查记录
-                    TFirePostFire postFire = new TFirePostFire();
-                    result = postFireController.export(postFire);
-                    msg = (String) result.get("msg");
-                    path = downloadPath + msg;
-                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
-                    files.add(new File(rootPath + subTitle + msg));
-                    //消防水带箱检查记录
-                    TFireHoseBox hoseBox = new TFireHoseBox();
-                    result = hoseBoxController.export(hoseBox);
-                    msg = (String) result.get("msg");
-                    path = downloadPath + msg;
-                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
-                    files.add(new File(rootPath + subTitle + msg));
-                    //消防竖管检查记录
-                    TFireStandpipePatrol standpipe = new TFireStandpipePatrol();
-                    result = standpipeController.export(standpipe);
-                    msg = (String) result.get("msg");
-                    path = downloadPath + msg;
-                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
-                    files.add(new File(rootPath + subTitle + msg));
-                    //自动喷淋灭火系统检查记录
-                    TFireSprinkler sprinkler = new TFireSprinkler();
-                    result = sprinklerController.export(sprinkler);
-                    msg = (String) result.get("msg");
-                    path = downloadPath + msg;
-                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
-                    files.add(new File(rootPath + subTitle + msg));
-                    //应急事故柜检查记录
-                    TEmergencyCabinet cabinet = new TEmergencyCabinet();
-                    result = cabinetController.export(cabinet);
-                    msg = (String) result.get("msg");
-                    path = downloadPath + msg;
-                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
-                    files.add(new File(rootPath + subTitle + msg));
-                    //现场可燃气体检测器/火灾报警系统检查记录
-                    TFireAlarm alarm = new TFireAlarm();
-                    result = alarmController.export(alarm);
-                    msg = (String) result.get("msg");
-                    path = downloadPath + msg;
-                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
-                    files.add(new File(rootPath + subTitle + msg));
-                    //CO2气体保护系统检查记录
-                    TFireGasShield gasShield = new TFireGasShield();
-                    result = gasShieldController.export(gasShield);
-                    msg = (String) result.get("msg");
-                    path = downloadPath + msg;
-                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
-                    files.add(new File(rootPath + subTitle + msg));
-                    //淋浴洗眼器检查记录
-                    TEmergencyEyewash eyewash = new TEmergencyEyewash();
-                    result = eyewashController.export(eyewash);
-                    msg = (String) result.get("msg");
-                    path = downloadPath + msg;
-                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
-                    files.add(new File(rootPath + subTitle + msg));
-                    //应急沙箱检查记录
-                    TFireSandbox sandbox = new TFireSandbox();
-                    result = sandboxController.export(sandbox);
-                    msg = (String) result.get("msg");
-                    path = downloadPath + msg;
-                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
-                    files.add(new File(rootPath + subTitle + msg));
-                    //常闭式防爆门/防火门检查记录
-                    TFireDoor door = new TFireDoor();
-                    result = doorController.export(door);
-                    msg = (String) result.get("msg");
-                    path = downloadPath + msg;
-                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
-                    files.add(new File(rootPath + subTitle + msg));
-                    //风向标/风向袋/新风系统正压计检查记录
-                    TFireWeathervane weathervane = new TFireWeathervane();
-                    result = weathervaneController.export(weathervane);
-                    msg = (String) result.get("msg");
-                    path = downloadPath + msg;
-                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
-                    files.add(new File(rootPath + subTitle + msg));
-                    //蒸汽幕检查记录
-                    TFireSteamCurtain steamCurtain = new TFireSteamCurtain();
-                    result = steamCurtainController.export(steamCurtain);
-                    msg = (String) result.get("msg");
-                    path = downloadPath + msg;
-                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
-                    files.add(new File(rootPath + subTitle + msg));
-                    //急救箱检查记录
-                    TFireAidkit aidkit = new TFireAidkit();
-                    result = aidkitController.export(aidkit);
-                    msg = (String) result.get("msg");
-                    path = downloadPath + msg;
-                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
-                    files.add(new File(rootPath + subTitle + msg));
+                    for (TPssrPatrol tPssrPatrol : tPssrPatrols) {
+                        String planType = tPssrPatrol.getPlanType().toString();
+                        Long planId = tPssrPatrol.getPlanId();
+                        switch (planType) {
+                            case "1"://手提式/小推车式灭火器/灭火器材箱检查记录
+                                TFireAnnihilator annihilator = new TFireAnnihilator();
+                                annihilator.setPlanId(planId);
+                                result = annihilatorController.export(annihilator);
+                                msg = (String) result.get("msg");
+                                path = downloadPath + msg;
+                                Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                                files.add(new File(rootPath + subTitle + msg));
+                                break;
+                            case "2"://消防水炮检查记录
+                                TFireWaterCannon waterCannon = new TFireWaterCannon();
+                                waterCannon.setPlanId(planId);
+                                result = waterCannonController.export(waterCannon);
+                                msg = (String) result.get("msg");
+                                path = downloadPath + msg;
+                                Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                                files.add(new File(rootPath + subTitle + msg));
+                                break;
+                            case "3"://地上消火栓检查记录
+                                TFirePostFire postFire = new TFirePostFire();
+                                postFire.setPlanId(planId);
+                                result = postFireController.export(postFire);
+                                msg = (String) result.get("msg");
+                                path = downloadPath + msg;
+                                Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                                files.add(new File(rootPath + subTitle + msg));
+                                break;
+                            case "4"://消防水带箱检查记录
+                                TFireHoseBox hoseBox = new TFireHoseBox();
+                                hoseBox.setPlanId(planId);
+                                result = hoseBoxController.export(hoseBox);
+                                msg = (String) result.get("msg");
+                                path = downloadPath + msg;
+                                Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                                files.add(new File(rootPath + subTitle + msg));
+                                break;
+                            case "5"://消防竖管检查记录
+                                TFireStandpipePatrol standpipe = new TFireStandpipePatrol();
+                                standpipe.setPlanId(planId);
+                                result = standpipeController.export(standpipe);
+                                msg = (String) result.get("msg");
+                                path = downloadPath + msg;
+                                Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                                files.add(new File(rootPath + subTitle + msg));
+                                break;
+                            case "6"://自动喷淋灭火系统检查记录
+                                TFireSprinkler sprinkler = new TFireSprinkler();
+                                sprinkler.setPlanId(planId);
+                                result = sprinklerController.export(sprinkler);
+                                msg = (String) result.get("msg");
+                                path = downloadPath + msg;
+                                Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                                files.add(new File(rootPath + subTitle + msg));
+                                break;
+                            case "7"://应急事故柜检查记录
+                                TEmergencyCabinet cabinet = new TEmergencyCabinet();
+                                cabinet.setPlanId(planId);
+                                result = cabinetController.export(cabinet);
+                                msg = (String) result.get("msg");
+                                path = downloadPath + msg;
+                                Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                                files.add(new File(rootPath + subTitle + msg));
+                                break;
+                            case "8"://现场可燃气体检测器/火灾报警系统检查记录
+                                TFireAlarm alarm = new TFireAlarm();
+                                alarm.setPlanId(planId);
+                                result = alarmController.export(alarm);
+                                msg = (String) result.get("msg");
+                                path = downloadPath + msg;
+                                Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                                files.add(new File(rootPath + subTitle + msg));
+                                break;
+                            case "9"://CO2气体保护系统检查记录
+                                TFireGasShield gasShield = new TFireGasShield();
+                                gasShield.setPlanId(planId);
+                                result = gasShieldController.export(gasShield);
+                                msg = (String) result.get("msg");
+                                path = downloadPath + msg;
+                                Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                                files.add(new File(rootPath + subTitle + msg));
+                                break;
+                            case "12"://淋浴洗眼器检查记录
+                                TEmergencyEyewash eyewash = new TEmergencyEyewash();
+                                eyewash.setPlanId(planId);
+                                result = eyewashController.export(eyewash);
+                                msg = (String) result.get("msg");
+                                path = downloadPath + msg;
+                                Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                                files.add(new File(rootPath + subTitle + msg));
+                                break;
+                            case "13"://应急沙箱检查记录
+                                TFireSandbox sandbox = new TFireSandbox();
+                                sandbox.setPlanId(planId);
+                                result = sandboxController.export(sandbox);
+                                msg = (String) result.get("msg");
+                                path = downloadPath + msg;
+                                Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                                files.add(new File(rootPath + subTitle + msg));
+                                break;
+                            case "14"://常闭式防爆门/防火门检查记录
+                                TFireDoor door = new TFireDoor();
+                                door.setPlanId(planId);
+                                result = doorController.export(door);
+                                msg = (String) result.get("msg");
+                                path = downloadPath + msg;
+                                Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                                files.add(new File(rootPath + subTitle + msg));
+                                break;
+                            case "15"://风向标/风向袋/新风系统正压计检查记录
+                                TFireWeathervane weathervane = new TFireWeathervane();
+                                weathervane.setPlanId(planId);
+                                result = weathervaneController.export(weathervane);
+                                msg = (String) result.get("msg");
+                                path = downloadPath + msg;
+                                Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                                files.add(new File(rootPath + subTitle + msg));
+                                break;
+                            case "16"://蒸汽幕检查记录
+                                TFireSteamCurtain steamCurtain = new TFireSteamCurtain();
+                                steamCurtain.setPlanId(planId);
+                                result = steamCurtainController.export(steamCurtain);
+                                msg = (String) result.get("msg");
+                                path = downloadPath + msg;
+                                Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                                files.add(new File(rootPath + subTitle + msg));
+                                break;
+                            case "27"://急救箱检查记录
+                                TFireAidkit aidkit = new TFireAidkit();
+                                aidkit.setPlanId(planId);
+                                result = aidkitController.export(aidkit);
+                                msg = (String) result.get("msg");
+                                path = downloadPath + msg;
+                                Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                                files.add(new File(rootPath + subTitle + msg));
+                                break;
+                        }
+                    }
                     break;
                 case "aqss"://安全设施
                     subTitle = "14安全设施/";
@@ -1165,32 +1207,50 @@ public class TPssrApproveController extends BaseController {
                     Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
                     files.add(new File(rootPath + subTitle + msg));
                     break;
-                case "txjk"://todo:通讯监控（巡检）
+                case "txjk"://通讯监控（巡检）
                     subTitle = "15通讯监控/";
-                    //PAGA系统检查记录
-                    TEmergencyPaga paga = new TEmergencyPaga();
-                    result = pagaController.export(paga);
-                    msg = (String) result.get("msg");
-                    path = downloadPath + msg;
-                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
-                    files.add(new File(rootPath + subTitle + msg));
-                    //CCTV系统检查记录
-                    TEmergencyCctv cctv = new TEmergencyCctv();
-                    result = cctvController.export(cctv);
-                    msg = (String) result.get("msg");
-                    path = downloadPath + msg;
-                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
-                    files.add(new File(rootPath + subTitle + msg));
+                    for (TPssrPatrol tPssrPatrol : tPssrPatrols) {
+                        String planType = tPssrPatrol.getPlanType().toString();
+                        Long planId = tPssrPatrol.getPlanId();
+                        switch (planType) {
+                            case "10"://PAGA系统检查记录
+                                TEmergencyPaga paga = new TEmergencyPaga();
+                                paga.setPlanId(planId);
+                                result = pagaController.export(paga);
+                                msg = (String) result.get("msg");
+                                path = downloadPath + msg;
+                                Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                                files.add(new File(rootPath + subTitle + msg));
+                                break;
+                            case "11"://CCTV系统检查记录
+                                TEmergencyCctv cctv = new TEmergencyCctv();
+                                cctv.setPlanId(planId);
+                                result = cctvController.export(cctv);
+                                msg = (String) result.get("msg");
+                                path = downloadPath + msg;
+                                Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                                files.add(new File(rootPath + subTitle + msg));
+                                break;
+                        }
+                    }
                     break;
-                case "bxsjcy"://todo:便携式检测仪（巡检）
+                case "bxsjcy"://便携式检测仪（巡检）
                     subTitle = "16便携式检测仪/";
-                    //四合一/苯系物/硫化氢/二氧化碳/射线一氧化碳检测仪检查记录
-                    TCommonuseTester tester = new TCommonuseTester();
-                    result = testerController.export(tester);
-                    msg = (String) result.get("msg");
-                    path = downloadPath + msg;
-                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
-                    files.add(new File(rootPath + subTitle + msg));
+                    for (TPssrPatrol tPssrPatrol : tPssrPatrols) {
+                        String planType = tPssrPatrol.getPlanType().toString();
+                        Long planId = tPssrPatrol.getPlanId();
+                        switch (planType) {
+                            case "18"://四合一/苯系物/硫化氢/二氧化碳/射线一氧化碳检测仪检查记录
+                                TCommonuseTester tester = new TCommonuseTester();
+                                tester.setPlanId(planId);
+                                result = testerController.export(tester);
+                                msg = (String) result.get("msg");
+                                path = downloadPath + msg;
+                                Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
+                                files.add(new File(rootPath + subTitle + msg));
+                                break;
+                        }
+                    }
                     break;
                 case "gygc"://公用工程
                     subTitle = "17公用工程/";

ui/src/views/pssr/aboveall/index.vue

@@ -129,18 +129,26 @@
             @click="gotoSubIndex(scope.row)"
           >检查内容
           </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-download"
-            @click="handleZip(scope.row)"
-          >打包
-          </el-button>
+          <!--<el-button-->
+            <!--size="mini"-->
+            <!--type="text"-->
+            <!--icon="el-icon-download"-->
+            <!--@click="handleZip(scope.row)"-->
+          <!--&gt;打包-->
+          <!--</el-button>-->
+          <!--<el-button-->
+            <!--size="mini"-->
+            <!--type="text"-->
+            <!--icon="el-icon-download"-->
+            <!--@click="handleDownload(scope.row)"-->
+          <!--&gt;导出-->
+          <!--</el-button>-->
           <el-button
             size="mini"
             type="text"
             icon="el-icon-download"
             @click="handleDownload(scope.row)"
+            v-if="scope.row.approveStatus == '2'"
           >导出
           </el-button>
         </template>