Forráskód Böngészése

pssr 添加附件数量

jiangbiao 3 hónapja
szülő
commit
1864b6c3a8
100 módosított fájl, 851 hozzáadás és 173 törlés
  1. 1 1
      master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireAidkitController.java
  2. 9 6
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAirtightController.java
  3. 9 6
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAnalyzerController.java
  4. 24 0
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrApproveController.java
  5. 8 2
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrBlindController.java
  6. 9 6
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrCircuitController.java
  7. 9 6
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrCleaningController.java
  8. 9 6
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrFrameController.java
  9. 9 6
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrFranklinismController.java
  10. 9 6
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrGasdetectorController.java
  11. 9 6
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrHygieneController.java
  12. 9 6
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrInstrumentCalibrationController.java
  13. 9 6
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrLaboratoryController.java
  14. 9 6
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrLightingController.java
  15. 8 2
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrLockController.java
  16. 8 2
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMaterialController.java
  17. 9 6
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMaterialRawController.java
  18. 8 2
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMeasureController.java
  19. 8 2
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMocController.java
  20. 9 6
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMotorController.java
  21. 9 6
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrNitrogenController.java
  22. 9 6
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulExchangerController.java
  23. 8 2
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulFilterController.java
  24. 8 2
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulPipeController.java
  25. 8 2
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulPumpController.java
  26. 8 2
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulTowerController.java
  27. 8 2
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulValveController.java
  28. 9 6
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPipeController.java
  29. 9 6
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPowerController.java
  30. 9 6
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrProtectionController.java
  31. 9 6
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPublicController.java
  32. 8 2
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpCleaningController.java
  33. 9 6
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpFillController.java
  34. 8 2
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpOverhaulController.java
  35. 9 3
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBleedController.java
  36. 9 3
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBreathController.java
  37. 9 2
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBrustController.java
  38. 9 3
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyFlamearresterController.java
  39. 9 3
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyValveController.java
  40. 8 2
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrTorchvocController.java
  41. 7 2
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrVesselController.java
  42. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrAirtight.java
  43. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrAlarm.java
  44. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrAnalyzer.java
  45. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrApprove.java
  46. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrBlind.java
  47. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrCircuit.java
  48. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrCleaning.java
  49. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrContentModel.java
  50. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrFrame.java
  51. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrFranklinism.java
  52. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrGasdetector.java
  53. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrHygiene.java
  54. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrInstrumentCalibration.java
  55. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrInstrumentTest.java
  56. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrLaboratory.java
  57. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrLighting.java
  58. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrLock.java
  59. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrMaterial.java
  60. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrMaterialRaw.java
  61. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrMeasure.java
  62. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrMoc.java
  63. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrMotor.java
  64. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrNitrogen.java
  65. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrOverhaulExchanger.java
  66. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrOverhaulFilter.java
  67. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrOverhaulPipe.java
  68. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrOverhaulPump.java
  69. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrOverhaulTower.java
  70. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrOverhaulValve.java
  71. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrPatrol.java
  72. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrPipe.java
  73. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrPower.java
  74. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrProgramme.java
  75. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrProtection.java
  76. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrPublic.java
  77. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrPumpCleaning.java
  78. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrPumpFill.java
  79. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrPumpOverhaul.java
  80. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrSafetyBleed.java
  81. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrSafetyBreath.java
  82. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrSafetyBrust.java
  83. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrSafetyFlamearrester.java
  84. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrSafetyValve.java
  85. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrSubcontent.java
  86. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrTorchvoc.java
  87. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrTurndown.java
  88. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrVessel.java
  89. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/dto/TPssrApproveDto.java
  90. BIN
      master/src/main/resources/static/word/pssr/ylrq.xlsx
  91. 1 1
      ui/src/views/pssr/airtight/index.vue
  92. 1 1
      ui/src/views/pssr/analyzer/index.vue
  93. 1 1
      ui/src/views/pssr/blind/index.vue
  94. 1 1
      ui/src/views/pssr/circuit/index.vue
  95. 1 1
      ui/src/views/pssr/cleaning/index.vue
  96. 1 1
      ui/src/views/pssr/frame/index.vue
  97. 1 1
      ui/src/views/pssr/franklinism/index.vue
  98. 1 1
      ui/src/views/pssr/gasdetector/index.vue
  99. 1 1
      ui/src/views/pssr/hygiene/index.vue
  100. 1 1
      ui/src/views/pssr/instrumentCalibration/index.vue

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireAidkitController.java

@@ -115,7 +115,7 @@ public class TFireAidkitController extends BaseController {
             if (StringUtils.isNotEmpty(confirmed))
                 ExcelUtils.insertPicture(wb, sheet, confirmed, 4, 3, 1, 1);
             if (confirmedDate!=null){
-                sheet.getRow(5).getCell(3).setCellValue(DateUtils.dateTime(confirmedDate));
+                sheet.getRow(5).getCell(2).setCellValue(DateUtils.dateTime(confirmedDate));
             }
             filename =  filename = "PSSR_13_消气防设施_急救箱检查记录.xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));

+ 9 - 6
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAirtightController.java

@@ -10,10 +10,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.TPssrAirtight;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrAirtightMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
@@ -186,7 +183,10 @@ public class TPssrAirtightController extends BaseController {
         startPage();
         List<TPssrAirtight> list = tPssrAirtightService.selectTPssrAirtightList(tPssrAirtight);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         });
@@ -215,7 +215,10 @@ public class TPssrAirtightController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrAirtight item = tPssrAirtightService.selectTPssrAirtightById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         return AjaxResult.success(item);

+ 9 - 6
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAnalyzerController.java

@@ -10,10 +10,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.TPssrAnalyzer;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrAnalyzerMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
@@ -178,7 +175,10 @@ public class TPssrAnalyzerController extends BaseController {
         startPage();
         List<TPssrAnalyzer> list = tPssrAnalyzerService.selectTPssrAnalyzerList(tPssrAnalyzer);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         });
@@ -269,7 +269,10 @@ public class TPssrAnalyzerController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrAnalyzer item = tPssrAnalyzerService.selectTPssrAnalyzerById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         return AjaxResult.success(item);

+ 24 - 0
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrApproveController.java

@@ -24,6 +24,8 @@ import com.ruoyi.project.patrol.emergency.domain.TEmergencyEyewash;
 import com.ruoyi.project.patrol.emergency.domain.TEmergencyPaga;
 import com.ruoyi.project.patrol.fire.controller.*;
 import com.ruoyi.project.patrol.fire.domain.*;
+import com.ruoyi.project.patrol.patrol.domain.TPatrolPlan;
+import com.ruoyi.project.patrol.patrol.mapper.TPatrolPlanMapper;
 import com.ruoyi.project.plant.domain.TStaffmgr;
 import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.domain.dto.TPssrApproveDto;
@@ -392,6 +394,8 @@ public class TPssrApproveController extends BaseController {
 
     @Autowired
     private TPssrSubcontentController subcontentController;
+    @Autowired
+    private TPatrolPlanMapper tPatrolPlanMapper;
     //endregion
 
     @PutMapping("/handleConfirm")
@@ -1909,10 +1913,12 @@ public class TPssrApproveController extends BaseController {
                     for (TPssrPatrol tPssrPatrol : tPssrPatrols) {
                         String planType = tPssrPatrol.getPlanType().toString();
                         Long planId = tPssrPatrol.getPlanId();
+                        TPatrolPlan plan = tPatrolPlanMapper.selectTPatrolPlanById(planId);
                         switch (planType) {
                             case "1"://手提式/小推车式灭火器/灭火器材箱检查记录
                                 TFireAnnihilator annihilator = new TFireAnnihilator();
                                 annihilator.setPlanId(planId);
+                                annihilator.setYear(plan.getPlanYear());
                                 result = annihilatorController.export(annihilator);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
@@ -1925,6 +1931,7 @@ public class TPssrApproveController extends BaseController {
                             case "2"://消防水炮检查记录
                                 TFireWaterCannon waterCannon = new TFireWaterCannon();
                                 waterCannon.setPlanId(planId);
+                                waterCannon.setYear(plan.getPlanYear());
                                 result = waterCannonController.export(waterCannon);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
@@ -1937,6 +1944,7 @@ public class TPssrApproveController extends BaseController {
                             case "3"://地上消火栓检查记录
                                 TFirePostFire postFire = new TFirePostFire();
                                 postFire.setPlanId(planId);
+                                postFire.setYear(plan.getPlanYear());
                                 result = postFireController.export(postFire);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
@@ -1949,6 +1957,7 @@ public class TPssrApproveController extends BaseController {
                             case "4"://消防水带箱检查记录
                                 TFireHoseBox hoseBox = new TFireHoseBox();
                                 hoseBox.setPlanId(planId);
+                                hoseBox.setYear(plan.getPlanYear());
                                 result = hoseBoxController.export(hoseBox);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
@@ -1961,6 +1970,7 @@ public class TPssrApproveController extends BaseController {
                             case "5"://消防竖管检查记录
                                 TFireStandpipePatrol standpipe = new TFireStandpipePatrol();
                                 standpipe.setPlanId(planId);
+                                standpipe.setYear(plan.getPlanYear());
                                 result = standpipeController.export(standpipe);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
@@ -1973,6 +1983,7 @@ public class TPssrApproveController extends BaseController {
                             case "6"://自动喷淋灭火系统检查记录
                                 TFireSprinkler sprinkler = new TFireSprinkler();
                                 sprinkler.setPlanId(planId);
+                                sprinkler.setYear(plan.getPlanYear());
                                 result = sprinklerController.export(sprinkler);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
@@ -1985,6 +1996,7 @@ public class TPssrApproveController extends BaseController {
                             case "7"://应急事故柜检查记录
                                 TEmergencyCabinet cabinet = new TEmergencyCabinet();
                                 cabinet.setPlanId(planId);
+                                cabinet.setYear(plan.getPlanYear());
                                 result = cabinetController.export(cabinet);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
@@ -1997,6 +2009,7 @@ public class TPssrApproveController extends BaseController {
                             case "8"://现场可燃气体检测器/火灾报警系统检查记录
                                 TFireAlarm alarm = new TFireAlarm();
                                 alarm.setPlanId(planId);
+                                alarm.setYear(plan.getPlanYear());
                                 result = alarmController.export(alarm);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
@@ -2021,6 +2034,7 @@ public class TPssrApproveController extends BaseController {
                             case "12"://淋浴洗眼器检查记录
                                 TEmergencyEyewash eyewash = new TEmergencyEyewash();
                                 eyewash.setPlanId(planId);
+                                eyewash.setYear(plan.getPlanYear());
                                 result = eyewashController.export(eyewash);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
@@ -2033,6 +2047,7 @@ public class TPssrApproveController extends BaseController {
                             case "13"://应急沙箱检查记录
                                 TFireSandbox sandbox = new TFireSandbox();
                                 sandbox.setPlanId(planId);
+                                sandbox.setYear(plan.getPlanYear());
                                 result = sandboxController.export(sandbox);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
@@ -2045,6 +2060,7 @@ public class TPssrApproveController extends BaseController {
                             case "14"://常闭式防爆门/防火门检查记录
                                 TFireDoor door = new TFireDoor();
                                 door.setPlanId(planId);
+                                door.setYear(plan.getPlanYear());
                                 result = doorController.export(door);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
@@ -2057,6 +2073,7 @@ public class TPssrApproveController extends BaseController {
                             case "15"://风向标/风向袋/新风系统正压计检查记录
                                 TFireWeathervane weathervane = new TFireWeathervane();
                                 weathervane.setPlanId(planId);
+                                weathervane.setYear(plan.getPlanYear());
                                 result = weathervaneController.export(weathervane);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
@@ -2069,6 +2086,7 @@ public class TPssrApproveController extends BaseController {
                             case "16"://蒸汽幕检查记录
                                 TFireSteamCurtain steamCurtain = new TFireSteamCurtain();
                                 steamCurtain.setPlanId(planId);
+                                steamCurtain.setYear(plan.getPlanYear());
                                 result = steamCurtainController.export(steamCurtain);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
@@ -2081,6 +2099,7 @@ public class TPssrApproveController extends BaseController {
                             case "27"://急救箱检查记录
                                 TFireAidkit aidkit = new TFireAidkit();
                                 aidkit.setPlanId(planId);
+                                aidkit.setYear(plan.getPlanYear());
                                 result = aidkitController.export(aidkit);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
@@ -2155,10 +2174,12 @@ public class TPssrApproveController extends BaseController {
                     for (TPssrPatrol tPssrPatrol : tPssrPatrols) {
                         String planType = tPssrPatrol.getPlanType().toString();
                         Long planId = tPssrPatrol.getPlanId();
+                        TPatrolPlan plan = tPatrolPlanMapper.selectTPatrolPlanById(planId);
                         switch (planType) {
                             case "10"://PAGA系统检查记录
                                 TEmergencyPaga paga = new TEmergencyPaga();
                                 paga.setPlanId(planId);
+                                paga.setYear(plan.getPlanYear());
                                 result = pagaController.export(paga);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
@@ -2171,6 +2192,7 @@ public class TPssrApproveController extends BaseController {
                             case "11"://CCTV系统检查记录
                                 TEmergencyCctv cctv = new TEmergencyCctv();
                                 cctv.setPlanId(planId);
+                                cctv.setYear(plan.getPlanYear());
                                 result = cctvController.export(cctv);
                                 if (result != null) {
                                     msg = (String) result.get("msg");
@@ -2188,10 +2210,12 @@ public class TPssrApproveController extends BaseController {
                     for (TPssrPatrol tPssrPatrol : tPssrPatrols) {
                         String planType = tPssrPatrol.getPlanType().toString();
                         Long planId = tPssrPatrol.getPlanId();
+                        TPatrolPlan plan = tPatrolPlanMapper.selectTPatrolPlanById(planId);
                         switch (planType) {
                             case "18"://四合一/苯系物/硫化氢/二氧化碳/射线一氧化碳检测仪检查记录
                                 TCommonuseTester tester = new TCommonuseTester();
                                 tester.setPlanId(planId);
+                                tester.setYear(plan.getPlanYear());
                                 result = testerController.export(tester);
                                 if (result != null) {
                                     msg = (String) result.get("msg");

+ 8 - 2
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrBlindController.java

@@ -203,7 +203,10 @@ public class TPssrBlindController extends BaseController {
             ) {
                 executorService.submit(() -> {
                     try {
-                        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-fm"));
+                        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
                         if (item.getApproveStatus() != 2)
                             item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-fm"));
                     } catch (Exception e) {
@@ -317,7 +320,10 @@ public class TPssrBlindController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrBlind item = tPssrBlindService.selectTPssrBlindById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
         if (item.getApproveStatus() != 2)
             item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         return AjaxResult.success(item);

+ 9 - 6
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrCircuitController.java

@@ -10,10 +10,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrCircuit;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrCircuitMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
@@ -189,7 +186,10 @@ public class TPssrCircuitController extends BaseController {
         startPage();
         List<TPssrCircuit> list = tPssrCircuitService.selectTPssrCircuitList(tPssrCircuit);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "dj"));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "dj"));
         });
@@ -286,7 +286,10 @@ public class TPssrCircuitController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrCircuit item = tPssrCircuitService.selectTPssrCircuitById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "dj"));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
         if (item.getApproveStatus() != 2)
             item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "dj"));
         return AjaxResult.success(item);

+ 9 - 6
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrCleaningController.java

@@ -12,10 +12,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrCleaning;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.domain.vo.TPssrCleaningVo;
 import com.ruoyi.project.pssr.mapper.TPssrCleaningMapper;
 import com.ruoyi.project.pssr.service.*;
@@ -182,7 +179,10 @@ public class TPssrCleaningController extends BaseController {
         startPage();
         List<TPssrCleaning> list = tPssrCleaningService.selectTPssrCleaningList(tPssrCleaning);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "sbqjd"));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             item.setContentList(JSON.parseArray(item.getCheckContent(), TPssrCleaningVo.class));
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "sbqjd"));
@@ -323,7 +323,10 @@ public class TPssrCleaningController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrCleaning item = tPssrCleaningService.selectTPssrCleaningById(id);
         item.setContentList(JSON.parseArray(item.getCheckContent(), TPssrCleaningVo.class));
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "sbqjd"));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
         if (item.getApproveStatus() != 2)
             item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "sbqjd"));
         return AjaxResult.success(item);

+ 9 - 6
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrFrameController.java

@@ -10,10 +10,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrFrame;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrFrameMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
@@ -194,7 +191,10 @@ public class TPssrFrameController extends BaseController {
         startPage();
         List<TPssrFrame> list = tPssrFrameService.selectTPssrFrameList(tPssrFrame);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         });
@@ -289,7 +289,10 @@ public class TPssrFrameController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrFrame item = tPssrFrameService.selectTPssrFrameById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         return AjaxResult.success(item);

+ 9 - 6
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrFranklinismController.java

@@ -10,10 +10,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrFranklinism;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrFranklinismMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
@@ -182,7 +179,10 @@ public class TPssrFranklinismController extends BaseController {
         startPage();
         List<TPssrFranklinism> list = tPssrFranklinismService.selectTPssrFranklinismList(tPssrFranklinism);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jdjdkj"));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jdjdkj"));
         });
@@ -271,7 +271,10 @@ public class TPssrFranklinismController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrFranklinism item = tPssrFranklinismService.selectTPssrFranklinismById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jdjdkj"));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jdjdkj"));
         return AjaxResult.success(item);

+ 9 - 6
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrGasdetectorController.java

@@ -10,10 +10,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrGasdetector;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrGasdetectorMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
@@ -174,7 +171,10 @@ public class TPssrGasdetectorController extends BaseController {
         startPage();
         List<TPssrGasdetector> list = tPssrGasdetectorService.selectTPssrGasdetectorList(tPssrGasdetector);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "qtjcy"));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "qtjcy"));
         });
@@ -265,7 +265,10 @@ public class TPssrGasdetectorController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrGasdetector item = tPssrGasdetectorService.selectTPssrGasdetectorById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "qtjcy"));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "qtjcy"));
         return AjaxResult.success(item);

+ 9 - 6
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrHygieneController.java

@@ -10,10 +10,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrHygiene;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrHygieneMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
@@ -182,7 +179,10 @@ public class TPssrHygieneController extends BaseController {
         startPage();
         List<TPssrHygiene> list = tPssrHygieneService.selectTPssrHygieneList(tPssrHygiene);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         });
@@ -272,7 +272,10 @@ public class TPssrHygieneController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
         TPssrHygiene item = tPssrHygieneService.selectTPssrHygieneById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
         if (item.getApproveStatus() != 2)
             item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         return AjaxResult.success(item);

+ 9 - 6
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrInstrumentCalibrationController.java

@@ -11,10 +11,7 @@ import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.listener.pssr.ConfirmTaskCreateListener;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrInstrumentCalibration;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrInstrumentCalibrationMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
@@ -190,7 +187,10 @@ public class TPssrInstrumentCalibrationController extends BaseController {
         startPage();
         List<TPssrInstrumentCalibration> list = tPssrInstrumentCalibrationService.selectTPssrInstrumentCalibrationList(tPssrInstrumentCalibration);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "ybjy"));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "ybjy"));
         });
@@ -424,7 +424,10 @@ public class TPssrInstrumentCalibrationController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrInstrumentCalibration item = tPssrInstrumentCalibrationService.selectTPssrInstrumentCalibrationById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "ybjy"));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
         if (item.getApproveStatus() != 2)
             item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "ybjy"));
         return AjaxResult.success(item);

+ 9 - 6
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrLaboratoryController.java

@@ -10,10 +10,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrLaboratory;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrLaboratoryMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
@@ -178,7 +175,10 @@ public class TPssrLaboratoryController extends BaseController {
         startPage();
         List<TPssrLaboratory> list = tPssrLaboratoryService.selectTPssrLaboratoryList(tPssrLaboratory);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         });
@@ -271,7 +271,10 @@ public class TPssrLaboratoryController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
         TPssrLaboratory item = tPssrLaboratoryService.selectTPssrLaboratoryById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
         if (item.getApproveStatus() != 2)
             item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         return AjaxResult.success(item);

+ 9 - 6
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrLightingController.java

@@ -9,10 +9,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrLighting;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrLightingMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysUser;
@@ -96,7 +93,10 @@ public class TPssrLightingController extends BaseController {
         startPage();
         List<TPssrLighting> list = tPssrLightingService.selectTPssrLightingList(tPssrLighting);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "zmdbr"));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "zmdbr"));
         });
@@ -193,7 +193,10 @@ public class TPssrLightingController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrLighting item = tPssrLightingService.selectTPssrLightingById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "zmdbr"));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "zmdbr"));
         return AjaxResult.success(item);

+ 8 - 2
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrLockController.java

@@ -187,7 +187,10 @@ public class TPssrLockController extends BaseController {
         startPage();
         List<TPssrLock> list = tPssrLockService.selectTPssrLockList(tPssrLock);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "sksgfmzt"));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "sksgfmzt"));
         });
@@ -288,7 +291,10 @@ public class TPssrLockController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrLock item = tPssrLockService.selectTPssrLockById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "sksgfmzt"));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "sksgfmzt"));
         return AjaxResult.success(item);

+ 8 - 2
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMaterialController.java

@@ -107,7 +107,10 @@ public class TPssrMaterialController extends BaseController {
         startPage();
         List<TPssrMaterial> list = tPssrMaterialService.selectTPssrMaterialList(tPssrMaterial);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "yfl"));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "yfl"));
         });
@@ -302,7 +305,10 @@ public class TPssrMaterialController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrMaterial item = tPssrMaterialService.selectTPssrMaterialById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "yfl"));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
         if (item.getApproveStatus() != 2)
             item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "yfl"));
         return AjaxResult.success(item);

+ 9 - 6
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMaterialRawController.java

@@ -8,10 +8,7 @@ import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.listener.pssr.ConfirmTaskCreateListener;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrMaterialRaw;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrMaterialRawMapper;
 import com.ruoyi.project.pssr.service.*;
 import org.activiti.engine.*;
@@ -88,7 +85,10 @@ public class TPssrMaterialRawController extends BaseController {
         startPage();
         List<TPssrMaterialRaw> list = tPssrMaterialRawService.selectTPssrMaterialRawList(tPssrMaterialRaw);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "yfl-raw"));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "yfl-raw"));
         });
@@ -114,7 +114,10 @@ public class TPssrMaterialRawController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrMaterialRaw item = tPssrMaterialRawService.selectTPssrMaterialRawById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "yfl-raw"));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
         if (item.getApproveStatus() != 2)
             item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "yfl-raw"));
         return AjaxResult.success(item);

+ 8 - 2
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMeasureController.java

@@ -184,7 +184,10 @@ public class TPssrMeasureController extends BaseController {
         startPage();
         List<TPssrMeasure> list = tPssrMeasureService.selectTPssrMeasureList(tPssrMeasure);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "rsfh-m"));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "rsfh-m"));
         });
@@ -276,7 +279,10 @@ public class TPssrMeasureController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrMeasure item = tPssrMeasureService.selectTPssrMeasureById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "rsfh-m"));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "rsfh-m"));
         return AjaxResult.success(item);

+ 8 - 2
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMocController.java

@@ -107,7 +107,10 @@ public class TPssrMocController extends BaseController {
         startPage();
         List<TPssrMoc> list = tPssrMocService.selectTPssrMocList(tPssrMoc);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         });
@@ -200,7 +203,10 @@ public class TPssrMocController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrMoc item = tPssrMocService.selectTPssrMocById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
         if (item.getApproveStatus() != 2)
             item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         return AjaxResult.success(item);

+ 9 - 6
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMotorController.java

@@ -10,10 +10,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrMotor;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrMotorMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
@@ -177,7 +174,10 @@ public class TPssrMotorController extends BaseController {
         startPage();
         List<TPssrMotor> list = tPssrMotorService.selectTPssrMotorList(tPssrMotor);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "djsb"));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "djsb"));
         });
@@ -268,7 +268,10 @@ public class TPssrMotorController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrMotor item = tPssrMotorService.selectTPssrMotorById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "djsb"));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "djsb"));
         return AjaxResult.success(item);

+ 9 - 6
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrNitrogenController.java

@@ -10,10 +10,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrNitrogen;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrNitrogenMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
@@ -183,7 +180,10 @@ public class TPssrNitrogenController extends BaseController {
         startPage();
         List<TPssrNitrogen> list = tPssrNitrogenService.selectTPssrNitrogenList(tPssrNitrogen);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "dqzh"));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "dqzh"));
         });
@@ -277,7 +277,10 @@ public class TPssrNitrogenController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrNitrogen item = tPssrNitrogenService.selectTPssrNitrogenById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "dqzh"));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
         if (item.getApproveStatus() != 2)
             item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "dqzh"));
         return AjaxResult.success(item);

+ 9 - 6
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulExchangerController.java

@@ -11,10 +11,7 @@ import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.listener.pssr.ConfirmTaskCreateListener;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrOverhaulExchanger;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrOverhaulExchangerMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
@@ -114,7 +111,10 @@ public class TPssrOverhaulExchangerController extends BaseController {
         startPage();
         List<TPssrOverhaulExchanger> list = tPssrOverhaulExchangerService.selectTPssrOverhaulExchangerList(tPssrOverhaulExchanger);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-hrq"));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-hrq"));
         });
@@ -222,7 +222,10 @@ public class TPssrOverhaulExchangerController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrOverhaulExchanger item = tPssrOverhaulExchangerService.selectTPssrOverhaulExchangerById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-hrq"));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
         if (item.getApproveStatus() != 2)
             item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-hrq"));
         return AjaxResult.success(item);

+ 8 - 2
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulFilterController.java

@@ -273,7 +273,10 @@ public class TPssrOverhaulFilterController extends BaseController {
         startPage();
         List<TPssrOverhaulFilter> list = tPssrOverhaulFilterService.selectTPssrOverhaulFilterList(tPssrOverhaulFilter);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-glq"));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-glq"));
         });
@@ -362,7 +365,10 @@ public class TPssrOverhaulFilterController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrOverhaulFilter item = tPssrOverhaulFilterService.selectTPssrOverhaulFilterById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-glq"));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
         if (item.getApproveStatus() != 2)
             item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-glq"));
         return AjaxResult.success(item);

+ 8 - 2
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulPipeController.java

@@ -152,7 +152,10 @@ public class TPssrOverhaulPipeController extends BaseController {
         startPage();
         List<TPssrOverhaulPipe> list = tPssrOverhaulPipeService.selectTPssrOverhaulPipeList(tPssrOverhaulPipe);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-gx"));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-gx"));
         });
@@ -178,7 +181,10 @@ public class TPssrOverhaulPipeController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrOverhaulPipe item = tPssrOverhaulPipeService.selectTPssrOverhaulPipeById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-gx"));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
         if (item.getApproveStatus() != 2)
             item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-gx"));
         return AjaxResult.success(item);

+ 8 - 2
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulPumpController.java

@@ -154,7 +154,10 @@ public class TPssrOverhaulPumpController extends BaseController {
         startPage();
         List<TPssrOverhaulPump> list = tPssrOverhaulPumpService.selectTPssrOverhaulPumpList(tPssrOverhaulPump);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-b"));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-b"));
         });
@@ -180,7 +183,10 @@ public class TPssrOverhaulPumpController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrOverhaulPump item = tPssrOverhaulPumpService.selectTPssrOverhaulPumpById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-b"));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
         if (item.getApproveStatus() != 2)
             item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-b"));
         return AjaxResult.success(item);

+ 8 - 2
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulTowerController.java

@@ -268,7 +268,10 @@ public class TPssrOverhaulTowerController extends BaseController {
         startPage();
         List<TPssrOverhaulTower> list = tPssrOverhaulTowerService.selectTPssrOverhaulTowerList(tPssrOverhaulTower);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-tg"));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-tg"));
         });
@@ -355,7 +358,10 @@ public class TPssrOverhaulTowerController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrOverhaulTower item = tPssrOverhaulTowerService.selectTPssrOverhaulTowerById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-tg"));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
         if (item.getApproveStatus() != 2)
             item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-tg"));
         return AjaxResult.success(item);

+ 8 - 2
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulValveController.java

@@ -284,7 +284,10 @@ public class TPssrOverhaulValveController extends BaseController {
             ) {
                 executorService.submit(() -> {
                     try {
-                        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-fm"));
+                        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
                         if (item.getApproveStatus() != 2)
                             item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-fm"));
                     } catch (Exception e) {
@@ -387,7 +390,10 @@ public class TPssrOverhaulValveController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrOverhaulValve item = tPssrOverhaulValveService.selectTPssrOverhaulValveById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-fm"));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
         if (item.getApproveStatus() != 2)
             item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-fm"));
         return AjaxResult.success(item);

+ 9 - 6
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPipeController.java

@@ -11,10 +11,7 @@ import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.listener.pssr.ConfirmTaskCreateListener;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrPipe;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrPipeMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.sems.domain.TSpecdevYlgd;
@@ -110,7 +107,10 @@ public class TPssrPipeController extends BaseController {
         startPage();
         List<TPssrPipe> list = tPssrPipeService.selectTPssrPipeList(tPssrPipe);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "ylgd"));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "ylgd"));
         });
@@ -245,7 +245,10 @@ public class TPssrPipeController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrPipe item = tPssrPipeService.selectTPssrPipeById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "ylgd"));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "ylgd"));
         return AjaxResult.success(item);

+ 9 - 6
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPowerController.java

@@ -9,10 +9,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrPower;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrPowerMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysUser;
@@ -98,7 +95,10 @@ public class TPssrPowerController extends BaseController {
         startPage();
         List<TPssrPower> list = tPssrPowerService.selectTPssrPowerList(tPssrPower);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "lsdy"));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "lsdy"));
         });
@@ -187,7 +187,10 @@ public class TPssrPowerController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrPower item = tPssrPowerService.selectTPssrPowerById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "lsdy"));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "lsdy"));
         return AjaxResult.success(item);

+ 9 - 6
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrProtectionController.java

@@ -11,10 +11,7 @@ import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.listener.pssr.ConfirmTaskCreateListener;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrProtection;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrProtectionMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
@@ -190,7 +187,10 @@ public class TPssrProtectionController extends BaseController {
         startPage();
         List<TPssrProtection> list = tPssrProtectionService.selectTPssrProtectionList(tPssrProtection);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "rsfh"));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "rsfh"));
         });
@@ -278,7 +278,10 @@ public class TPssrProtectionController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrProtection item = tPssrProtectionService.selectTPssrProtectionById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "rsfh"));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "rsfh"));
         return AjaxResult.success(item);

+ 9 - 6
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPublicController.java

@@ -9,10 +9,7 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrPublic;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrPublicMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysUser;
@@ -99,7 +96,10 @@ public class TPssrPublicController extends BaseController {
         startPage();
         List<TPssrPublic> list = tPssrPublicService.selectTPssrPublicList(tPssrPublic);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         });
@@ -190,7 +190,10 @@ public class TPssrPublicController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrPublic item = tPssrPublicService.selectTPssrPublicById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
         if (item.getApproveStatus() != 2)
             item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         return AjaxResult.success(item);

+ 8 - 2
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpCleaningController.java

@@ -187,7 +187,10 @@ public class TPssrPumpCleaningController extends BaseController {
         startPage();
         List<TPssrPumpCleaning> list = tPssrPumpCleaningService.selectTPssrPumpCleaningList(tPssrPumpCleaning);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         });
@@ -278,7 +281,10 @@ public class TPssrPumpCleaningController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrPumpCleaning item = tPssrPumpCleaningService.selectTPssrPumpCleaningById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         return AjaxResult.success(item);

+ 9 - 6
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpFillController.java

@@ -11,10 +11,7 @@ import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.listener.pssr.ConfirmTaskCreateListener;
-import com.ruoyi.project.pssr.domain.TPssrApprove;
-import com.ruoyi.project.pssr.domain.TPssrPumpFill;
-import com.ruoyi.project.pssr.domain.TPssrSubcontent;
-import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.domain.*;
 import com.ruoyi.project.pssr.mapper.TPssrPumpFillMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
@@ -187,7 +184,10 @@ public class TPssrPumpFillController extends BaseController {
         startPage();
         List<TPssrPumpFill> list = tPssrPumpFillService.selectTPssrPumpFillList(tPssrPumpFill);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jb-f"));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jb-f"));
         });
@@ -279,7 +279,10 @@ public class TPssrPumpFillController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrPumpFill item = tPssrPumpFillService.selectTPssrPumpFillById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jb-f"));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jb-f"));
         return AjaxResult.success(item);

+ 8 - 2
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpOverhaulController.java

@@ -185,7 +185,10 @@ public class TPssrPumpOverhaulController extends BaseController {
         startPage();
         List<TPssrPumpOverhaul> list = tPssrPumpOverhaulService.selectTPssrPumpOverhaulList(tPssrPumpOverhaul);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jb-o"));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jb-o"));
         });
@@ -275,7 +278,10 @@ public class TPssrPumpOverhaulController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrPumpOverhaul item = tPssrPumpOverhaulService.selectTPssrPumpOverhaulById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jb-o"));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jb-o"));
         return AjaxResult.success(item);

+ 9 - 3
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBleedController.java

@@ -11,6 +11,7 @@ import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrFile;
 import com.ruoyi.project.pssr.domain.TPssrSafetyBleed;
 import com.ruoyi.project.pssr.mapper.TPssrSafetyBleedMapper;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
@@ -42,7 +43,6 @@ import java.io.OutputStream;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.UUID;
 
 /**
  * 安全设施-紧急泄放阀Controller
@@ -183,7 +183,10 @@ public class TPssrSafetyBleedController extends BaseController {
         startPage();
         List<TPssrSafetyBleed> list = tPssrSafetyBleedService.selectTPssrSafetyBleedList(tPssrSafetyBleed);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         });
@@ -279,7 +282,10 @@ public class TPssrSafetyBleedController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrSafetyBleed item = tPssrSafetyBleedService.selectTPssrSafetyBleedById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         return AjaxResult.success(item);

+ 9 - 3
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBreathController.java

@@ -11,6 +11,7 @@ import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrFile;
 import com.ruoyi.project.pssr.domain.TPssrSafetyBreath;
 import com.ruoyi.project.pssr.mapper.TPssrSafetyBreathMapper;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
@@ -42,7 +43,6 @@ import java.io.OutputStream;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.UUID;
 
 /**
  * 安全设施-呼吸阀Controller
@@ -183,7 +183,10 @@ public class TPssrSafetyBreathController extends BaseController {
         startPage();
         List<TPssrSafetyBreath> list = tPssrSafetyBreathService.selectTPssrSafetyBreathList(tPssrSafetyBreath);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "aqss-bh"));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "aqss-bh"));
         });
@@ -279,7 +282,10 @@ public class TPssrSafetyBreathController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrSafetyBreath item = tPssrSafetyBreathService.selectTPssrSafetyBreathById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "aqss-bh"));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "aqss-bh"));
         return AjaxResult.success(item);

+ 9 - 2
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBrustController.java

@@ -11,6 +11,7 @@ import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrFile;
 import com.ruoyi.project.pssr.domain.TPssrSafetyBrust;
 import com.ruoyi.project.pssr.mapper.TPssrSafetyBrustMapper;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
@@ -181,7 +182,10 @@ public class TPssrSafetyBrustController extends BaseController {
         startPage();
         List<TPssrSafetyBrust> list = tPssrSafetyBrustService.selectTPssrSafetyBrustList(tPssrSafetyBrust);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "aqss-bt"));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "aqss-bt"));
         });
@@ -277,7 +281,10 @@ public class TPssrSafetyBrustController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrSafetyBrust item = tPssrSafetyBrustService.selectTPssrSafetyBrustById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "aqss-bt"));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
         if (item.getApproveStatus() != 2)
             item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "aqss-bt"));
         return AjaxResult.success(item);

+ 9 - 3
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyFlamearresterController.java

@@ -11,6 +11,7 @@ import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrFile;
 import com.ruoyi.project.pssr.domain.TPssrSafetyFlamearrester;
 import com.ruoyi.project.pssr.mapper.TPssrSafetyFlamearresterMapper;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
@@ -42,7 +43,6 @@ import java.io.OutputStream;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.UUID;
 
 /**
  * 安全设施-阻火器Controller
@@ -179,7 +179,10 @@ public class TPssrSafetyFlamearresterController extends BaseController {
         startPage();
         List<TPssrSafetyFlamearrester> list = tPssrSafetyFlamearresterService.selectTPssrSafetyFlamearresterList(tPssrSafetyFlamearrester);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "aqss-f"));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "aqss-f"));
         });
@@ -271,7 +274,10 @@ public class TPssrSafetyFlamearresterController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrSafetyFlamearrester item = tPssrSafetyFlamearresterService.selectTPssrSafetyFlamearresterById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "aqss-f"));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "aqss-f"));
         return AjaxResult.success(item);

+ 9 - 3
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyValveController.java

@@ -10,6 +10,7 @@ import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrFile;
 import com.ruoyi.project.pssr.domain.TPssrSafetyValve;
 import com.ruoyi.project.pssr.mapper.TPssrSafetyValveMapper;
 import com.ruoyi.project.pssr.service.ITPssrApproveService;
@@ -38,7 +39,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.List;
-import java.util.UUID;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -107,7 +107,10 @@ public class TPssrSafetyValveController extends BaseController {
             ) {
                 executorService.submit(() -> {
                     try {
-                        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "aqss-v"));
+                        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
                         if (item.getApproveStatus() != 2)
                             item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "aqss-v"));
                     } catch (Exception e) {
@@ -218,7 +221,10 @@ public class TPssrSafetyValveController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrSafetyValve item = tPssrSafetyValveService.selectTPssrSafetyValveById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "aqss-v"));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
         if (item.getApproveStatus() != 2)
             item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "aqss-v"));
         return AjaxResult.success(item);

+ 8 - 2
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrTorchvocController.java

@@ -98,7 +98,10 @@ public class TPssrTorchvocController extends BaseController {
         startPage();
         List<TPssrTorchvoc> list = tPssrTorchvocService.selectTPssrTorchvocList(tPssrTorchvoc);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "hbss"));
+            
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "hbss"));
         });
@@ -195,7 +198,10 @@ public class TPssrTorchvocController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrTorchvoc item = tPssrTorchvocService.selectTPssrTorchvocById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "hbss"));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "hbss"));
         return AjaxResult.success(item);

+ 7 - 2
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrVesselController.java

@@ -109,7 +109,9 @@ public class TPssrVesselController extends BaseController {
         startPage();
         List<TPssrVessel> list = tPssrVesselService.selectTPssrVesselList(tPssrVessel);
         list.forEach(item -> {
-            item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "ylrq"));
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "ylrq"));
         });
@@ -201,7 +203,10 @@ public class TPssrVesselController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrVessel item = tPssrVesselService.selectTPssrVesselById(id);
-        item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "ylrq"));
+        
+            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+            item.setFileList(tPssrFiles);
+            item.setFileNum((long) tPssrFiles.size());
         if (item.getApproveStatus() != 2)
             item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "ylrq"));
         return AjaxResult.success(item);

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrAirtight.java

@@ -119,6 +119,16 @@ public class TPssrAirtight extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrAlarm.java

@@ -86,6 +86,16 @@ public class TPssrAlarm extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrAnalyzer.java

@@ -107,6 +107,16 @@ public class TPssrAnalyzer extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrApprove.java

@@ -47,6 +47,16 @@ public class TPssrApprove extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrBlind.java

@@ -178,6 +178,16 @@ public class TPssrBlind extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrCircuit.java

@@ -131,6 +131,16 @@ public class TPssrCircuit extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrCleaning.java

@@ -112,6 +112,16 @@ public class TPssrCleaning extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     private List<TPssrCleaningVo> contentList;
 

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrContentModel.java

@@ -86,6 +86,16 @@ public class TPssrContentModel extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrFrame.java

@@ -141,6 +141,16 @@ public class TPssrFrame extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrFranklinism.java

@@ -105,6 +105,16 @@ public class TPssrFranklinism extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrGasdetector.java

@@ -107,6 +107,16 @@ public class TPssrGasdetector extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrHygiene.java

@@ -141,6 +141,16 @@ public class TPssrHygiene extends BaseEntity {
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrInstrumentCalibration.java

@@ -111,6 +111,16 @@ public class TPssrInstrumentCalibration extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
     private String flowCheck;
     private String fileCheck;
     private String devType;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrInstrumentTest.java

@@ -86,6 +86,16 @@ public class TPssrInstrumentTest extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrLaboratory.java

@@ -101,6 +101,16 @@ public class TPssrLaboratory extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrLighting.java

@@ -118,6 +118,16 @@ public class TPssrLighting extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public Long getSerialNumber() {
         return serialNumber;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrLock.java

@@ -142,6 +142,16 @@ public class TPssrLock extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrMaterial.java

@@ -104,6 +104,16 @@ public class TPssrMaterial extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrMaterialRaw.java

@@ -104,6 +104,16 @@ public class TPssrMaterialRaw extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrMeasure.java

@@ -28,6 +28,16 @@ public class TPssrMeasure extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrMoc.java

@@ -105,6 +105,16 @@ public class TPssrMoc extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrMotor.java

@@ -107,6 +107,16 @@ public class TPssrMotor extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrNitrogen.java

@@ -115,6 +115,16 @@ public class TPssrNitrogen extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrOverhaulExchanger.java

@@ -106,6 +106,16 @@ public class TPssrOverhaulExchanger extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
     private String completionStatus;
 
     public String getCompletionStatus() {

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrOverhaulFilter.java

@@ -116,6 +116,16 @@ public class TPssrOverhaulFilter extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
     private String changeClean;
 
     private String completionStatus;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrOverhaulPipe.java

@@ -100,6 +100,16 @@ public class TPssrOverhaulPipe extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrOverhaulPump.java

@@ -104,6 +104,16 @@ public class TPssrOverhaulPump extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrOverhaulTower.java

@@ -104,6 +104,16 @@ public class TPssrOverhaulTower extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     private String completionStatus;
 

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrOverhaulValve.java

@@ -148,6 +148,16 @@ public class TPssrOverhaulValve extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     private String completionStatus;
 

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrPatrol.java

@@ -100,6 +100,16 @@ public class TPssrPatrol extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getPlanName() {
         return planName;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrPipe.java

@@ -116,6 +116,16 @@ public class TPssrPipe extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrPower.java

@@ -93,6 +93,16 @@ public class TPssrPower extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrProgramme.java

@@ -117,6 +117,16 @@ public class TPssrProgramme extends BaseEntity {
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrProtection.java

@@ -110,6 +110,16 @@ public class TPssrProtection extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrPublic.java

@@ -104,6 +104,16 @@ public class TPssrPublic extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
 
     public String getCheckRequire() {

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrPumpCleaning.java

@@ -115,6 +115,16 @@ public class TPssrPumpCleaning extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrPumpFill.java

@@ -115,6 +115,16 @@ public class TPssrPumpFill extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrPumpOverhaul.java

@@ -107,6 +107,16 @@ public class TPssrPumpOverhaul extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrSafetyBleed.java

@@ -157,6 +157,16 @@ public class TPssrSafetyBleed extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrSafetyBreath.java

@@ -157,6 +157,16 @@ public class TPssrSafetyBreath extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrSafetyBrust.java

@@ -127,6 +127,16 @@ public class TPssrSafetyBrust extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrSafetyFlamearrester.java

@@ -111,6 +111,16 @@ public class TPssrSafetyFlamearrester extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrSafetyValve.java

@@ -131,6 +131,16 @@ public class TPssrSafetyValve extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrSubcontent.java

@@ -113,6 +113,16 @@ public class TPssrSubcontent extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrTorchvoc.java

@@ -116,6 +116,16 @@ public class TPssrTorchvoc extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public Long getSerialNumber() {
         return serialNumber;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrTurndown.java

@@ -35,6 +35,16 @@ public class TPssrTurndown extends BaseEntity
     /** 驳回原因 */
     @Excel(name = "驳回原因")
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     /** 删除状态 */
     private Long delFlag;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/TPssrVessel.java

@@ -28,6 +28,16 @@ public class TPssrVessel extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     public String getReason() {
         return reason;

+ 10 - 0
master/src/main/java/com/ruoyi/project/pssr/domain/dto/TPssrApproveDto.java

@@ -14,6 +14,16 @@ public class TPssrApproveDto {
     private Long taskType;
 
     private String reason;
+    
+    private Long fileNum;
+
+    public Long getFileNum() {
+        return fileNum;
+    }
+
+    public void setFileNum(Long fileNum) {
+        this.fileNum = fileNum;
+    }
 
     private String torchvocType;
 

BIN
master/src/main/resources/static/word/pssr/ylrq.xlsx


+ 1 - 1
ui/src/views/pssr/airtight/index.vue

@@ -200,7 +200,7 @@
             type="text"
             icon="el-icon-folder"
             @click="handleDoc(scope.row)"
-          >附件
+          >附件({{scope.row.fileNum}})
           </el-button>
           <el-button
             size="mini"

+ 1 - 1
ui/src/views/pssr/analyzer/index.vue

@@ -176,7 +176,7 @@
             icon="el-icon-folder"
 
             @click="handleDoc(scope.row)"
-          >附件
+          >附件({{scope.row.fileNum}})
           </el-button>
           <el-button
             size="mini"

+ 1 - 1
ui/src/views/pssr/blind/index.vue

@@ -186,7 +186,7 @@
             icon="el-icon-folder"
 
             @click="handleDoc(scope.row)"
-          >附件
+          >附件({{scope.row.fileNum}})
           </el-button>
           <el-button
             size="mini"

+ 1 - 1
ui/src/views/pssr/circuit/index.vue

@@ -189,7 +189,7 @@
             icon="el-icon-folder"
 
             @click="handleDoc(scope.row)"
-          >附件
+          >附件({{scope.row.fileNum}})
           </el-button>
           <el-button
             size="mini"

+ 1 - 1
ui/src/views/pssr/cleaning/index.vue

@@ -195,7 +195,7 @@
             icon="el-icon-folder"
 
             @click="handleDoc(scope.row)"
-          >附件
+          >附件({{scope.row.fileNum}})
           </el-button>
           <el-button
             size="mini"

+ 1 - 1
ui/src/views/pssr/frame/index.vue

@@ -203,7 +203,7 @@
             icon="el-icon-folder"
 
             @click="handleDoc(scope.row)"
-          >附件
+          >附件({{scope.row.fileNum}})
           </el-button>
           <el-button
             size="mini"

+ 1 - 1
ui/src/views/pssr/franklinism/index.vue

@@ -163,7 +163,7 @@
             icon="el-icon-folder"
 
             @click="handleDoc(scope.row)"
-          >附件
+          >附件({{scope.row.fileNum}})
           </el-button>
           <el-button
             size="mini"

+ 1 - 1
ui/src/views/pssr/gasdetector/index.vue

@@ -169,7 +169,7 @@
             icon="el-icon-folder"
 
             @click="handleDoc(scope.row)"
-          >附件
+          >附件({{scope.row.fileNum}})
           </el-button>
           <el-button
             size="mini"

+ 1 - 1
ui/src/views/pssr/hygiene/index.vue

@@ -189,7 +189,7 @@
             icon="el-icon-folder"
 
             @click="handleDoc(scope.row)"
-          >附件
+          >附件({{scope.row.fileNum}})
           </el-button>
           <el-button
             size="mini"

+ 1 - 1
ui/src/views/pssr/instrumentCalibration/index.vue

@@ -179,7 +179,7 @@
             icon="el-icon-folder"
 
             @click="handleDoc(scope.row)"
-          >附件
+          >附件({{scope.row.fileNum}})
           </el-button>
           <el-button
             size="mini"

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott