PSSR主清单导出（单表）

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

@@ -477,7 +477,7 @@ public class TPssrAirtightController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("Airtight");
+            filename =  "PSSR_08_气密_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -228,7 +228,7 @@ public class TPssrAnalyzerController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("Analyzer");
+            filename =  "PSSR_31_在线分析仪_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -217,6 +217,60 @@ public class TPssrApproveController extends BaseController {
     @Autowired
     private TPssrBlindController blindController;
 
+    @Autowired
+    private TPssrAirtightController airtightController;
+
+    @Autowired
+    private TPssrAnalyzerController analyzerController;
+
+    @Autowired
+    private TPssrFrameController frameController;
+
+    @Autowired
+    private TPssrCircuitController circuitController;
+
+    @Autowired
+    private TPssrCleaningController cleaningController;
+
+    @Autowired
+    private TPssrFranklinismController franklinismController;
+
+    @Autowired
+    private TPssrGasdetectorController gasdetectorController;
+
+    @Autowired
+    private TPssrHygieneController hygieneController;
+
+    @Autowired
+    private TPssrInstrumentCalibrationController instrumentCalibrationController;
+
+    @Autowired
+    private TPssrLaboratoryController laboratoryController;
+
+    @Autowired
+    private TPssrLockController lockController;
+
+    @Autowired
+    private TPssrMaterialController materialController;
+
+    @Autowired
+    private TPssrMocController mocController;
+
+    @Autowired
+    private TPssrMotorController motorController;
+
+    @Autowired
+    private TPssrNitrogenController nitrogenController;
+
+    @Autowired
+    private TPssrPowerController powerController;
+
+    @Autowired
+    private TPssrProgrammeController programmeController;
+
+    @Autowired
+    private TPssrPublicController publicController;
+
     /**
      * 子项内容确认
      */
@@ -630,105 +684,198 @@ public class TPssrApproveController extends BaseController {
         TPssrSubcontent queryParams = new TPssrSubcontent();
         queryParams.setAboveallId(id);
         List<TPssrSubcontent> tPssrSubcontents = tPssrSubcontentService.selectTPssrSubcontentList(queryParams);//子表集合
+        AjaxResult result = null;
+        String msg = "";
+        String path = "";
         for (TPssrSubcontent tPssrSubcontent : tPssrSubcontents) {
-            switch (tPssrSubcontent.getSerialNumber()) {
-                case "01":
+            switch (tPssrSubcontent.getForShort()) {
+                case "jxxm"://检修项目
 
                     break;
-                case "02":
-
+                case "kgfa"://开工方案
+                    TPssrProgramme programme = new TPssrProgramme();
+                    programme.setSubId(tPssrSubcontent.getId());//子表id
+                    result = programmeController.export(programme);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
                     break;
-                case "03":
-
+                case "sjbg"://设计变更
+                    TPssrMoc moc = new TPssrMoc();
+                    moc.setSubId(tPssrSubcontent.getId());//子表id
+                    result = mocController.export(moc);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
                     break;
-                case "04"://盲板
+                case "mb"://盲板
                     TPssrBlind blind = new TPssrBlind();
                     blind.setSubId(tPssrSubcontent.getId());//子表id
-                    AjaxResult export = blindController.export(blind);
-                    String msg = (String) export.get("msg");
-                    String absolutePath = getProfile() + "/download/" + msg;
-                    files.add(new File(absolutePath));
+                    result = blindController.export(blind);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
                     break;
-                case "05":
-
+                case "xcws"://现场卫生
+                    TPssrHygiene hygiene = new TPssrHygiene();
+                    hygiene.setSubId(tPssrSubcontent.getId());//子表id
+                    result = hygieneController.export(hygiene);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
                     break;
-                case "06":
+                case "rsfh"://人身防护
 
                     break;
-                case "07":
-
+                case "sbqjd"://设备清洁度
+                    TPssrCleaning cleaning = new TPssrCleaning();
+                    cleaning.setSubId(tPssrSubcontent.getId());//子表id
+                    result = cleaningController.export(cleaning);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
                     break;
-                case "08":
-
+                case "qm"://气密
+                    TPssrAirtight airtight = new TPssrAirtight();
+                    airtight.setSubId(tPssrSubcontent.getId());//子表id
+                    result = airtightController.export(airtight);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
                     break;
-                case "09":
-
+                case "sksgfmzt"://锁开锁关阀门状态
+                    TPssrLock lock = new TPssrLock();
+                    lock.setSubId(tPssrSubcontent.getId());//子表id
+                    result = lockController.export(lock);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
                     break;
-                case "10":
-
+                case "sys"://实验室
+                    TPssrLaboratory laboratory = new TPssrLaboratory();
+                    laboratory.setSubId(tPssrSubcontent.getId());//子表id
+                    result = laboratoryController.export(laboratory);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
                     break;
-                case "11":
-
+                case "dj"://短接
+                    TPssrCircuit circuit = new TPssrCircuit();
+                    circuit.setSubId(tPssrSubcontent.getId());//子表id
+                    result = circuitController.export(circuit);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
                     break;
-                case "12":
-
+                case "dqzh"://氮气置换
+                    TPssrNitrogen nitrogen = new TPssrNitrogen();
+                    nitrogen.setSubId(tPssrSubcontent.getId());//子表id
+                    result = nitrogenController.export(nitrogen);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
                     break;
-                case "13":
+                case "xqf"://消气防设施
 
                     break;
-                case "14":
+                case "aqss"://安全设施
 
                     break;
-                case "15":
+                case "txjk"://通讯监控
 
                     break;
-                case "16":
+                case "bxsjcy"://便携式检测仪
 
                     break;
-                case "17":
-
+                case "gygc"://公用工程
+                    TPssrPublic tPssrPublic = new TPssrPublic();
+                    tPssrPublic.setSubId(tPssrSubcontent.getId());//子表id
+                    result = publicController.export(tPssrPublic);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
                     break;
-                case "18":
+                case "hbss"://环保设施
 
                     break;
-                case "19":
-
+                case "yfl"://原辅料
+                    TPssrMaterial material = new TPssrMaterial();
+                    material.setSubId(tPssrSubcontent.getId());//子表id
+                    result = materialController.export(material);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
                     break;
-                case "20":
+                case "jb"://机泵
 
                     break;
-                case "21":
-
+                case "zdj"://支（吊）架
+                    TPssrFrame frame = new TPssrFrame();
+                    frame.setSubId(tPssrSubcontent.getId());//子表id
+                    result = frameController.export(frame);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
                     break;
-                case "22":
+                case "tzsb"://压力管道/压力容器
 
                     break;
-                case "23":
-
+                case "ybjy"://仪表校验
+                    TPssrInstrumentCalibration calibration = new TPssrInstrumentCalibration();
+                    calibration.setSubId(tPssrSubcontent.getId());//子表id
+                    result = instrumentCalibrationController.export(calibration);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
                     break;
-                case "24":
+                case "yblscs"://仪表联锁测试
 
                     break;
-                case "25":
+                case "bjlszqr"://报警/联锁值确认
 
                     break;
-                case "26":
-
+                case "lsdy"://临时电源
+                    TPssrPower power = new TPssrPower();
+                    power.setSubId(tPssrSubcontent.getId());//子表id
+                    result = powerController.export(power);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
                     break;
-                case "27":
-
+                case "djsb"://电机设备
+                    TPssrMotor motor = new TPssrMotor();
+                    motor.setSubId(tPssrSubcontent.getId());//子表id
+                    result = motorController.export(motor);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
                     break;
-                case "28":
+                case "zmdbr"://照明、电伴热
 
                     break;
-                case "29":
-
+                case "jdjdkj"://静电接地/跨接
+                    TPssrFranklinism franklinism = new TPssrFranklinism();
+                    franklinism.setSubId(tPssrSubcontent.getId());//子表id
+                    result = franklinismController.export(franklinism);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
                     break;
-                case "30":
-
+                case "qtjcy"://气体检测仪
+                    TPssrGasdetector gasdetector = new TPssrGasdetector();
+                    gasdetector.setSubId(tPssrSubcontent.getId());//子表id
+                    result = gasdetectorController.export(gasdetector);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
                     break;
-                case "31":
-
+                case "zxfxy"://在线分析仪
+                    TPssrAnalyzer analyzer = new TPssrAnalyzer();
+                    analyzer.setSubId(tPssrSubcontent.getId());//子表id
+                    result = analyzerController.export(analyzer);
+                    msg = (String) result.get("msg");
+                    path = getProfile() + "/download/" + msg;
+                    files.add(new File(path));
                     break;
             }
         }

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

@@ -252,7 +252,7 @@ public class TPssrBlindController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("Blind");
+            filename =  "PSSR_04_盲板_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -249,7 +249,7 @@ public class TPssrCircuitController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("Circuit");
+            filename =  "PSSR_11_短接_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -232,7 +232,7 @@ public class TPssrCleaningController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("Cleaning");
+            filename =  "PSSR_07_设备清洁_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -238,7 +238,7 @@ public class TPssrFrameController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("Frame");
+            filename =  "PSSR_21_支（吊）架_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -220,7 +220,7 @@ public class TPssrFranklinismController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("Franklinism");
+            filename =  "PSSR_29_静电接地跨接_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -226,7 +226,7 @@ public class TPssrGasdetectorController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("Gasdetector");
+            filename =  "PSSR_30_气体检测仪_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -218,7 +218,7 @@ public class TPssrHygieneController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("Hygiene");
+            filename =  "PSSR_05_现场卫生_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -229,7 +229,7 @@ public class TPssrInstrumentCalibrationController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("InstrumentCalibration");
+            filename =  "PSSR_23_仪表校验_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -227,7 +227,7 @@ public class TPssrLaboratoryController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("Laboratory");
+            filename =  "PSSR_10_实验室_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -162,7 +162,7 @@ public class TPssrLockController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("Lock");
+            filename =  "PSSR_09_锁开锁关阀门状态_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -256,7 +256,7 @@ public class TPssrMaterialController extends BaseController {
             }
             rowIndex++;
 
-            filename = ExcelUtil.encodingFilename("Material");
+            filename =  "PSSR_19_原辅料_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -157,7 +157,7 @@ public class TPssrMocController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("Moc");
+            filename =  "PSSR_03_设计变更_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -227,7 +227,7 @@ public class TPssrMotorController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("Motor");
+            filename =  "PSSR_27_电机设备_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -240,7 +240,7 @@ public class TPssrNitrogenController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("Nitrogen");
+            filename =  "PSSR_12_氮气置换_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -143,7 +143,7 @@ public class TPssrPowerController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("Power");
+            filename =  "PSSR_26_临时电源_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -142,7 +142,7 @@ public class TPssrProgrammeController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("Programme");
+            filename =  "PSSR_02_开工方案_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -142,7 +142,7 @@ public class TPssrPublicController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = ExcelUtil.encodingFilename("Public");
+            filename =  "PSSR_17_公用工程_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();