浏览代码

添加设备导出权限注解

jiangbiao 6 月之前
父节点
当前提交
9a5ee5212d
共有 100 个文件被更改,包括 192 次插入62 次删除
  1. 2 2
      master/src/main/java/com/ruoyi/common/utils/file/ExcelUtils.java
  2. 1 1
      master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseBicycleController.java
  3. 1 1
      master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseDownspoutController.java
  4. 1 1
      master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseEarplugController.java
  5. 1 1
      master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseManholeCoverController.java
  6. 1 1
      master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseMovementController.java
  7. 1 1
      master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseSafetyBeltController.java
  8. 1 1
      master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseTesterController.java
  9. 1 1
      master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseWalkieTalkieController.java
  10. 1 1
      master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseWaterPumpController.java
  11. 1 1
      master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevAidkitController.java
  12. 1 1
      master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevAlarmController.java
  13. 1 1
      master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevAnnihilatorController.java
  14. 1 1
      master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevBicycleController.java
  15. 1 1
      master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevCabinetController.java
  16. 1 1
      master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevCctvController.java
  17. 1 1
      master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevCofferdamController.java
  18. 1 1
      master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevDoorController.java
  19. 1 1
      master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevDownspoutController.java
  20. 1 1
      master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevEarplugController.java
  21. 1 1
      master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevEyewashController.java
  22. 1 1
      master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevGasShieldController.java
  23. 1 1
      master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevHoseBoxController.java
  24. 1 1
      master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevManholeCoverController.java
  25. 1 1
      master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevMovementController.java
  26. 1 1
      master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevPagaController.java
  27. 1 1
      master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevPostFireController.java
  28. 1 1
      master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevSafetyBeltController.java
  29. 1 1
      master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevSandboxController.java
  30. 1 1
      master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevSprinklerController.java
  31. 1 1
      master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevStandpipeController.java
  32. 1 1
      master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevSteamCurtainController.java
  33. 1 1
      master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevTesterController.java
  34. 1 1
      master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevWalkieTalkieController.java
  35. 1 1
      master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevWaterCannonController.java
  36. 1 1
      master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevWaterPumpController.java
  37. 1 1
      master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevWeathervaneController.java
  38. 1 1
      master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyCabinetController.java
  39. 1 1
      master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyCctvController.java
  40. 1 1
      master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyCofferdamController.java
  41. 1 1
      master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyEyewashController.java
  42. 1 1
      master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyPagaController.java
  43. 1 1
      master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireAidkitController.java
  44. 1 1
      master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireAlarmController.java
  45. 1 1
      master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireAnnihilatorController.java
  46. 1 1
      master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireDoorController.java
  47. 1 1
      master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireGasShieldController.java
  48. 1 1
      master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireHoseBoxController.java
  49. 1 1
      master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFirePostFireController.java
  50. 1 1
      master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireSandboxController.java
  51. 1 1
      master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireSprinklerController.java
  52. 1 1
      master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireStandpipeController.java
  53. 1 1
      master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireSteamCurtainController.java
  54. 1 1
      master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireWaterCannonController.java
  55. 1 1
      master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireWeathervaneController.java
  56. 1 1
      master/src/main/java/com/ruoyi/project/patrol/patrol/controller/TFileController.java
  57. 1 1
      master/src/main/java/com/ruoyi/project/patrol/patrol/controller/TPatrolIssuesController.java
  58. 1 1
      master/src/main/java/com/ruoyi/project/patrol/patrol/controller/TPatrolMainController.java
  59. 1 1
      master/src/main/java/com/ruoyi/project/patrol/patrol/controller/TPatrolPlanController.java
  60. 92 2
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrApproveController.java
  61. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrAboveallMapper.java
  62. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrAirtightMapper.java
  63. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrAlarmMapper.java
  64. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrAnalyzerMapper.java
  65. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrBlindMapper.java
  66. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrCircuitMapper.java
  67. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrCleaningMapper.java
  68. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrContentModelMapper.java
  69. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrFrameMapper.java
  70. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrFranklinismMapper.java
  71. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrGasdetectorMapper.java
  72. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrHygieneMapper.java
  73. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrInstrumentCalibrationMapper.java
  74. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrInstrumentTestMapper.java
  75. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrLaboratoryMapper.java
  76. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrLightingMapper.java
  77. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrLockMapper.java
  78. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrMaterialMapper.java
  79. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrMaterialRawMapper.java
  80. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrMeasureMapper.java
  81. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrMocMapper.java
  82. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrMotorMapper.java
  83. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrNitrogenMapper.java
  84. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulExchangerMapper.java
  85. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulFilterMapper.java
  86. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulPipeMapper.java
  87. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulPumpMapper.java
  88. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulTowerMapper.java
  89. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulValveMapper.java
  90. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrPatrolMapper.java
  91. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrPipeMapper.java
  92. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrPowerMapper.java
  93. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrProgrammeMapper.java
  94. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrProtectionMapper.java
  95. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrPublicMapper.java
  96. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrPumpCleaningMapper.java
  97. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrPumpFillMapper.java
  98. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrPumpOverhaulMapper.java
  99. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrRegionMapper.java
  100. 1 0
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrSafetyBleedMapper.java

+ 2 - 2
master/src/main/java/com/ruoyi/common/utils/file/ExcelUtils.java

@@ -338,9 +338,9 @@ public class ExcelUtils {
             pict.resize(scaleX, scaleY);
             is.close();
         } catch (FileNotFoundException e) {
-            e.printStackTrace();
+//            e.printStackTrace();
         } catch (IOException e) {
-            e.printStackTrace();
+//            e.printStackTrace();
         }
     }
 

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseBicycleController.java

@@ -75,7 +75,7 @@ public class TCommonuseBicycleController extends BaseController {
     /**
      * 导出自行车列表
      */
-    @PreAuthorize("@ss.hasPermi('commonuse:bicycle:export')")
+    
     @Log(title = "自行车", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TCommonuseBicycle tCommonuseBicycle) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseDownspoutController.java

@@ -74,7 +74,7 @@ public class TCommonuseDownspoutController extends BaseController {
     /**
      * 导出落水管列表
      */
-    @PreAuthorize("@ss.hasPermi('commonuse:downspout:export')")
+    
     @Log(title = "落水管", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TCommonuseDownspout tCommonuseDownspout) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseEarplugController.java

@@ -74,7 +74,7 @@ public class TCommonuseEarplugController extends BaseController {
     /**
      * 导出耳塞分配器检查记录列表
      */
-    @PreAuthorize("@ss.hasPermi('commonuse:earplug:export')")
+    
     @Log(title = "耳塞分配器检查记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TCommonuseEarplug tCommonuseEarplug) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseManholeCoverController.java

@@ -74,7 +74,7 @@ public class TCommonuseManholeCoverController extends BaseController {
     /**
      * 导出地井盖列表
      */
-    @PreAuthorize("@ss.hasPermi('commonuse:cover:export')")
+    
     @Log(title = "地井盖", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TCommonuseManholeCover tCommonuseManholeCover) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseMovementController.java

@@ -79,7 +79,7 @@ public class TCommonuseMovementController extends BaseController {
     /**
      * 导出移动平台及移动梯列表
      */
-    @PreAuthorize("@ss.hasPermi('commonuse:movement:export')")
+    
     @Log(title = "移动平台及移动梯", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TCommonuseMovement tCommonuseMovement) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseSafetyBeltController.java

@@ -74,7 +74,7 @@ public class TCommonuseSafetyBeltController extends BaseController {
     /**
      * 导出安全带列表
      */
-    @PreAuthorize("@ss.hasPermi('commonuse:safetyBelt:export')")
+    
     @Log(title = "安全带", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TCommonuseSafetyBelt tCommonuseSafetyBelt) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseTesterController.java

@@ -79,7 +79,7 @@ public class TCommonuseTesterController extends BaseController {
     /**
      * 导出检测仪检查记录列表
      */
-    @PreAuthorize("@ss.hasPermi('commonuse:tester:export')")
+    
     @Log(title = "检测仪检查记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TCommonuseTester tCommonuseTester) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseWalkieTalkieController.java

@@ -74,7 +74,7 @@ public class TCommonuseWalkieTalkieController extends BaseController {
     /**
      * 导出对讲机列表
      */
-    @PreAuthorize("@ss.hasPermi('commonuse:walkitTalkie:export')")
+    
     @Log(title = "对讲机", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TCommonuseWalkieTalkie tCommonuseWalkieTalkie) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseWaterPumpController.java

@@ -74,7 +74,7 @@ public class TCommonuseWaterPumpController extends BaseController {
     /**
      * 导出水泵接合器列表
      */
-    @PreAuthorize("@ss.hasPermi('commonuse:pump:export')")
+    
     @Log(title = "水泵接合器", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TCommonuseWaterPump tCommonuseWaterPump) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevAidkitController.java

@@ -48,7 +48,7 @@ public class TDevAidkitController extends BaseController
     /**
      * 导出急救箱列表
      */
-    @PreAuthorize("@ss.hasPermi('dev:aidkit:export')")
+    
     @Log(title = "急救箱", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TDevAidkit tDevAidkit)

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevAlarmController.java

@@ -44,7 +44,7 @@ public class TDevAlarmController extends BaseController {
     /**
      * 导出现场可燃气体检测器/火灾报警系统列表
      */
-    @PreAuthorize("@ss.hasPermi('dev:alarm:export')")
+    
     @Log(title = "现场可燃气体检测器/火灾报警系统", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TDevAlarm tDevAlarm) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevAnnihilatorController.java

@@ -48,7 +48,7 @@ public class TDevAnnihilatorController extends BaseController {
     /**
      * 导出灭火器材列表
      */
-    @PreAuthorize("@ss.hasPermi('dev:annihilator:export')")
+    
     @Log(title = "灭火器材", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TDevAnnihilator tDevAnnihilator) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevBicycleController.java

@@ -44,7 +44,7 @@ public class TDevBicycleController extends BaseController {
     /**
      * 导出自行车列表
      */
-    @PreAuthorize("@ss.hasPermi('dev:bicycle:export')")
+    
     @Log(title = "自行车", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TDevBicycle tDevBicycle) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevCabinetController.java

@@ -44,7 +44,7 @@ public class TDevCabinetController extends BaseController {
     /**
      * 导出应急事故柜列表
      */
-    @PreAuthorize("@ss.hasPermi('dev:cabinet:export')")
+    
     @Log(title = "应急事故柜", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TDevCabinet tDevCabinet) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevCctvController.java

@@ -44,7 +44,7 @@ public class TDevCctvController extends BaseController {
     /**
      * 导出CCTV系统列表
      */
-    @PreAuthorize("@ss.hasPermi('dev:cctv:export')")
+    
     @Log(title = "CCTV系统", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TDevCctv tDevCctv) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevCofferdamController.java

@@ -46,7 +46,7 @@ public class TDevCofferdamController extends BaseController
     /**
      * 导出蒸汽裂解装置各区域围堰列表
      */
-    @PreAuthorize("@ss.hasPermi('dev:cofferdam:export')")
+    
     @Log(title = "蒸汽裂解装置各区域围堰", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TDevCofferdam tDevCofferdam)

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevDoorController.java

@@ -44,7 +44,7 @@ public class TDevDoorController extends BaseController {
     /**
      * 导出常闭式防爆门/防火门列表
      */
-    @PreAuthorize("@ss.hasPermi('dev:door:export')")
+    
     @Log(title = "常闭式防爆门/防火门", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TDevDoor tDevDoor) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevDownspoutController.java

@@ -44,7 +44,7 @@ public class TDevDownspoutController extends BaseController {
     /**
      * 导出落水管列表
      */
-    @PreAuthorize("@ss.hasPermi('dev:downspout:export')")
+    
     @Log(title = "落水管", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TDevDownspout tDevDownspout) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevEarplugController.java

@@ -44,7 +44,7 @@ public class TDevEarplugController extends BaseController {
     /**
      * 导出耳塞分配器列表
      */
-    @PreAuthorize("@ss.hasPermi('dev:earplug:export')")
+    
     @Log(title = "耳塞分配器", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TDevEarplug tDevEarplug) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevEyewashController.java

@@ -46,7 +46,7 @@ public class TDevEyewashController extends BaseController
     /**
      * 导出洗眼器列表
      */
-    @PreAuthorize("@ss.hasPermi('dev:eyewash:export')")
+    
     @Log(title = "洗眼器", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TDevEyewash tDevEyewash)

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevGasShieldController.java

@@ -44,7 +44,7 @@ public class TDevGasShieldController extends BaseController {
     /**
      * 导出CO2气体保护系统列表
      */
-    @PreAuthorize("@ss.hasPermi('dev:shield:export')")
+    
     @Log(title = "CO2气体保护系统", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TDevGasShield tDevGasShield) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevHoseBoxController.java

@@ -46,7 +46,7 @@ public class TDevHoseBoxController extends BaseController
     /**
      * 导出消防水带箱检查记录列表
      */
-    @PreAuthorize("@ss.hasPermi('dev:hoseBox:export')")
+    
     @Log(title = "消防水带箱检查记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TDevHoseBox tDevHoseBox)

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevManholeCoverController.java

@@ -44,7 +44,7 @@ public class TDevManholeCoverController extends BaseController {
     /**
      * 导出地井盖列表
      */
-    @PreAuthorize("@ss.hasPermi('dev:cover:export')")
+    
     @Log(title = "地井盖", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TDevManholeCover tDevManholeCover) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevMovementController.java

@@ -44,7 +44,7 @@ public class TDevMovementController extends BaseController {
     /**
      * 导出移动平台及移动梯列表
      */
-    @PreAuthorize("@ss.hasPermi('dev:movement:export')")
+    
     @Log(title = "移动平台及移动梯", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TDevMovement tDevMovement) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevPagaController.java

@@ -44,7 +44,7 @@ public class TDevPagaController extends BaseController {
     /**
      * 导出PAGA列表
      */
-    @PreAuthorize("@ss.hasPermi('dev:paga:export')")
+    
     @Log(title = "PAGA", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TDevPaga tDevPaga) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevPostFireController.java

@@ -46,7 +46,7 @@ public class TDevPostFireController extends BaseController
     /**
      * 导出地上消火栓检查记录列表
      */
-    @PreAuthorize("@ss.hasPermi('dev:postFire:export')")
+    
     @Log(title = "地上消火栓检查记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TDevPostFire tDevPostFire)

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevSafetyBeltController.java

@@ -44,7 +44,7 @@ public class TDevSafetyBeltController extends BaseController {
     /**
      * 导出安全带列表
      */
-    @PreAuthorize("@ss.hasPermi('dev:safetyBelt:export')")
+    
     @Log(title = "安全带", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TDevSafetyBelt tDevSafetyBelt) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevSandboxController.java

@@ -46,7 +46,7 @@ public class TDevSandboxController extends BaseController
     /**
      * 导出应急沙箱列表
      */
-    @PreAuthorize("@ss.hasPermi('dev:sandbox:export')")
+    
     @Log(title = "应急沙箱", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TDevSandbox tDevSandbox)

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevSprinklerController.java

@@ -46,7 +46,7 @@ public class TDevSprinklerController extends BaseController
     /**
      * 导出自动喷淋灭火系统列表
      */
-    @PreAuthorize("@ss.hasPermi('dev:sprinkler:export')")
+    
     @Log(title = "自动喷淋灭火系统", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TDevSprinkler tDevSprinkler)

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevStandpipeController.java

@@ -44,7 +44,7 @@ public class TDevStandpipeController extends BaseController {
     /**
      * 导出消防竖管列表
      */
-    @PreAuthorize("@ss.hasPermi('dev:standpipe:export')")
+    
     @Log(title = "消防竖管", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TDevStandpipe tDevStandpipe) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevSteamCurtainController.java

@@ -44,7 +44,7 @@ public class TDevSteamCurtainController extends BaseController {
     /**
      * 导出蒸汽幕列表
      */
-    @PreAuthorize("@ss.hasPermi('dev:curtain:export')")
+    
     @Log(title = "蒸汽幕", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TDevSteamCurtain tDevSteamCurtain) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevTesterController.java

@@ -44,7 +44,7 @@ public class TDevTesterController extends BaseController {
     /**
      * 导出检测仪列表
      */
-    @PreAuthorize("@ss.hasPermi('dev:tester:export')")
+    
     @Log(title = "检测仪", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TDevTester tDevTester) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevWalkieTalkieController.java

@@ -44,7 +44,7 @@ public class TDevWalkieTalkieController extends BaseController {
     /**
      * 导出对讲机列表
      */
-    @PreAuthorize("@ss.hasPermi('dev:walkieTalkie:export')")
+    
     @Log(title = "对讲机", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TDevWalkieTalkie tDevWalkieTalkie) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevWaterCannonController.java

@@ -46,7 +46,7 @@ public class TDevWaterCannonController extends BaseController
     /**
      * 导出消防水炮检查记录列表
      */
-    @PreAuthorize("@ss.hasPermi('dev:cannon:export')")
+    
     @Log(title = "消防水炮检查记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TDevWaterCannon tDevWaterCannon)

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevWaterPumpController.java

@@ -44,7 +44,7 @@ public class TDevWaterPumpController extends BaseController {
     /**
      * 导出水泵接合器列表
      */
-    @PreAuthorize("@ss.hasPermi('dev:pump:export')")
+    
     @Log(title = "水泵接合器", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TDevWaterPump tDevWaterPump) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/dev/controller/TDevWeathervaneController.java

@@ -44,7 +44,7 @@ public class TDevWeathervaneController extends BaseController {
     /**
      * 导出风向标/风向袋/新风系统正压计列表
      */
-    @PreAuthorize("@ss.hasPermi('dev:weathervane:export')")
+    
     @Log(title = "风向标/风向袋/新风系统正压计", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TDevWeathervane tDevWeathervane) {

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

@@ -80,7 +80,7 @@ public class TEmergencyCabinetController extends BaseController {
     /**
      * 导出应急事故柜列表
      */
-    @PreAuthorize("@ss.hasPermi('emergency:cabinet:export')")
+    
     @Log(title = "应急事故柜", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TEmergencyCabinet tEmergencyCabinet) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyCctvController.java

@@ -75,7 +75,7 @@ public class TEmergencyCctvController extends BaseController {
     /**
      * 导出CCTV系统列表
      */
-    @PreAuthorize("@ss.hasPermi('emergency:cctv:export')")
+    
     @Log(title = "CCTV系统", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TEmergencyCctv tEmergencyCctv) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyCofferdamController.java

@@ -74,7 +74,7 @@ public class TEmergencyCofferdamController extends BaseController {
     /**
      * 导出蒸汽裂解装置各区域围堰列表
      */
-    @PreAuthorize("@ss.hasPermi('emergency:cofferdam:export')")
+    
     @Log(title = "蒸汽裂解装置各区域围堰", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TEmergencyCofferdam tEmergencyCofferdam) {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyEyewashController.java

@@ -74,7 +74,7 @@ public class TEmergencyEyewashController extends BaseController {
     /**
      * 导出洗眼器检查记录列表
      */
-    @PreAuthorize("@ss.hasPermi('emergency:eyewash:export')")
+    
     @Log(title = "洗眼器检查记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TEmergencyEyewash tEmergencyEyewash) throws Exception {

+ 1 - 1
master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyPagaController.java

@@ -77,7 +77,7 @@ public class TEmergencyPagaController extends BaseController {
     /**
      * 导出PAGA系统列表
      */
-    @PreAuthorize("@ss.hasPermi('emergency:paga:export')")
+    
     @Log(title = "PAGA系统", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TEmergencyPaga tEmergencyPaga) {

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

@@ -66,7 +66,7 @@ public class TFireAidkitController extends BaseController {
     /**
      * 导出急救箱检查记录列表
      */
-    @PreAuthorize("@ss.hasPermi('fire:aidkit:export')")
+    
     @Log(title = "急救箱检查记录", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TFireAidkit tFireAidkit) {

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

@@ -80,7 +80,7 @@ public class TFireAlarmController extends BaseController {
     /**
      * 导出现场可燃气体检测器/火灾报警系统列表
      */
-    @PreAuthorize("@ss.hasPermi('fire:alarm:export')")
+    
     @Log(title = "现场可燃气体检测器/火灾报警系统", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TFireAlarm tFireAlarm) {

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

@@ -80,7 +80,7 @@ public class TFireAnnihilatorController extends BaseController {
     /**
      * 导出手提式/小推车式灭火器/灭火器材箱列表
      */
-    @PreAuthorize("@ss.hasPermi('fire:annihilator:export')")
+    
     @Log(title = "手提式/小推车式灭火器/灭火器材箱", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TFireAnnihilator tFireAnnihilator) throws IOException {

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

@@ -75,7 +75,7 @@ public class TFireDoorController extends BaseController {
     /**
      * 导出常闭式防爆门/防火门列表
      */
-    @PreAuthorize("@ss.hasPermi('fire:door:export')")
+    
     @Log(title = "常闭式防爆门/防火门", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TFireDoor tFireDoor) {

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

@@ -75,7 +75,7 @@ public class TFireGasShieldController extends BaseController {
     /**
      * 导出CO2气体保护系统列表
      */
-    @PreAuthorize("@ss.hasPermi('fire:shield:export')")
+    
     @Log(title = "CO2气体保护系统", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TFireGasShield tFireGasShield) {

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

@@ -76,7 +76,7 @@ public class TFireHoseBoxController extends BaseController {
     /**
      * 导出消防水带箱检查记录列表
      */
-    @PreAuthorize("@ss.hasPermi('fire:hoseBox:export')")
+    
     @Log(title = "消防水带箱检查记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TFireHoseBox tFireHoseBox) {

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

@@ -76,7 +76,7 @@ public class TFirePostFireController extends BaseController {
     /**
      * 导出地上消火栓检查记录检查记录列表
      */
-    @PreAuthorize("@ss.hasPermi('fire:postFire:export')")
+    
     @Log(title = "地上消火栓检查记录检查记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TFirePostFire tFirePostFire) {

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

@@ -75,7 +75,7 @@ public class TFireSandboxController extends BaseController {
     /**
      * 导出应急沙箱列表
      */
-    @PreAuthorize("@ss.hasPermi('fire:sandbox:export')")
+    
     @Log(title = "应急沙箱", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TFireSandbox tFireSandbox) {

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

@@ -75,7 +75,7 @@ public class TFireSprinklerController extends BaseController {
     /**
      * 导出自动喷淋灭火系统检查记录列表
      */
-    @PreAuthorize("@ss.hasPermi('fire:sprinkler:export')")
+    
     @Log(title = "自动喷淋灭火系统检查记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TFireSprinkler tFireSprinkler) {

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

@@ -75,7 +75,7 @@ public class TFireStandpipeController extends BaseController {
     /**
      * 导出消防竖管列表
      */
-    @PreAuthorize("@ss.hasPermi('fire:standpipe:export')")
+    
     @Log(title = "消防竖管", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TFireStandpipePatrol tFireStandpipe) {

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

@@ -75,7 +75,7 @@ public class TFireSteamCurtainController extends BaseController {
     /**
      * 导出蒸汽幕检查记录列表
      */
-    @PreAuthorize("@ss.hasPermi('fire:curtain:export')")
+    
     @Log(title = "蒸汽幕检查记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TFireSteamCurtain tFireSteamCurtain) {

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

@@ -76,7 +76,7 @@ public class TFireWaterCannonController extends BaseController {
     /**
      * 导出消防水炮检查记录列表
      */
-    @PreAuthorize("@ss.hasPermi('fire:cannon:export')")
+    
     @Log(title = "消防水炮检查记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TFireWaterCannon tFireWaterCannon) {

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

@@ -80,7 +80,7 @@ public class TFireWeathervaneController extends BaseController {
     /**
      * 导出风向标/风向袋/新风系统正压计列表
      */
-    @PreAuthorize("@ss.hasPermi('fire:weathervane:export')")
+    
     @Log(title = "风向标/风向袋/新风系统正压计", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TFireWeathervane tFireWeathervane) {

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

@@ -49,7 +49,7 @@ public class TFileController extends BaseController
     /**
      * 导出附件列表
      */
-    @PreAuthorize("@ss.hasPermi('patrol:file:export')")
+    
     @Log(title = "附件", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TFile tFile)

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

@@ -43,7 +43,7 @@ public class TPatrolIssuesController extends BaseController
     /**
      * 导出检查问题记录列表
      */
-    @PreAuthorize("@ss.hasPermi('patrol:issues:export')")
+    
     @Log(title = "检查问题记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TPatrolIssues tPatrolIssues)

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

@@ -61,7 +61,7 @@ public class TPatrolMainController extends BaseController {
     /**
      * 导出消气防设施和器材检查计划总列表
      */
-    @PreAuthorize("@ss.hasPermi('patrol:main:export')")
+    
     @Log(title = "消气防设施和器材检查计划总", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TPatrolMain tPatrolMain) {

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

@@ -173,7 +173,7 @@ public class TPatrolPlanController extends BaseController {
     /**
      * 导出检查计划列表
      */
-    @PreAuthorize("@ss.hasPermi('patrol:plan:export')")
+    
     @Log(title = "检查计划", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public AjaxResult export(TPatrolPlan tPatrolPlan) {

+ 92 - 2
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrApproveController.java

@@ -1167,76 +1167,146 @@ public class TPssrApproveController extends BaseController {
         if (judgmentOrder(tPssrSubcontent)) {
             return AjaxResult.error("请先完成前置审批流程");
         }
-        tPssrSubcontent.setApproveStatus(1L);
-        tPssrSubcontentService.updateTPssrSubcontent(tPssrSubcontent);
         switch (tPssrSubcontent.getForShort()) {
             case "jxxm"://检修项目
+                if (tPssrOverhaulExchangerService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
+                    return AjaxResult.error("请确认所有确认人都已选择!");
+                }
                 doJxxmApprove(tPssrSubcontent);
                 break;
             case "kgfa"://开工方案
+                if (tPssrProgrammeService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
+                    return AjaxResult.error("请确认所有确认人都已选择!");
+                }
                 doKgfaApprove(tPssrSubcontent);
                 break;
             case "sjbg"://设计变更
+                if (tPssrMocService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
+                    return AjaxResult.error("请确认所有确认人都已选择!");
+                }
                 doMocApprove(tPssrSubcontent);
                 break;
             case "mb"://盲板
+                if (tPssrBlindService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
+                    return AjaxResult.error("请确认所有确认人都已选择!");
+                }
                 doMbApprove(tPssrSubcontent);
                 break;
             case "xcws"://现场卫生
+                if (tPssrHygieneService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
+                    return AjaxResult.error("请确认所有确认人都已选择!");
+                }
                 doXcwsApprove(tPssrSubcontent);
                 break;
             case "rsfh"://人身防护
+                if (tPssrProtectionService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0
+                        || tPssrMeasureService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
+                    return AjaxResult.error("请确认所有确认人都已选择!");
+                }
                 doRsfhApprove(tPssrSubcontent);
                 break;
             case "sbqjd"://设备清洁度
+                if (tPssrCleaningService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
+                    return AjaxResult.error("请确认所有确认人都已选择!");
+                }
                 doSbqjdApprove(tPssrSubcontent);
                 break;
             case "qm"://气密
+                if (tPssrAirtightService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
+                    return AjaxResult.error("请确认所有确认人都已选择!");
+                }
                 doQmApprove(tPssrSubcontent);
                 break;
             case "sksgfmzt"://锁开锁关阀门状态
+                if (tPssrLockService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
+                    return AjaxResult.error("请确认所有确认人都已选择!");
+                }
                 doSksgApprove(tPssrSubcontent);
                 break;
             case "sys"://实验室
+                if (tPssrLaboratoryService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
+                    return AjaxResult.error("请确认所有确认人都已选择!");
+                }
                 doSysApprove(tPssrSubcontent);
                 break;
             case "dj"://短接
+                if (tPssrCircuitService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
+                    return AjaxResult.error("请确认所有确认人都已选择!");
+                }
                 doDjApprove(tPssrSubcontent);
                 break;
             case "dqzh"://氮气置换
+                if (tPssrNitrogenService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
+                    return AjaxResult.error("请确认所有确认人都已选择!");
+                }
                 doDqzhApprove(tPssrSubcontent);
                 break;
             case "xqf"://消气防设施
+                if (tPssrPatrolService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
+                    return AjaxResult.error("请确认所有确认人都已选择!");
+                }
                 doPatrolApprove(tPssrSubcontent);
                 break;
             case "aqss"://安全设施
+                if (tPssrSafetyBleedService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
+                    return AjaxResult.error("请确认所有确认人都已选择!");
+                }
                 doAqssApprove(tPssrSubcontent);
                 break;
             case "txjk"://通讯监控
+                if (tPssrPatrolService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
+                    return AjaxResult.error("请确认所有确认人都已选择!");
+                }
                 doPatrolApprove(tPssrSubcontent);
                 break;
             case "bxsjcy"://便携式检测仪
+                if (tPssrPatrolService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
+                    return AjaxResult.error("请确认所有确认人都已选择!");
+                }
                 doPatrolApprove(tPssrSubcontent);
                 break;
             case "gygc"://公用工程
+                if (tPssrPublicService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
+                    return AjaxResult.error("请确认所有确认人都已选择!");
+                }
                 doGygcApprove(tPssrSubcontent);
                 break;
             case "hbss"://环保设施
+                if (tPssrTorchvocService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
+                    return AjaxResult.error("请确认所有确认人都已选择!");
+                }
                 doHbssApprove(tPssrSubcontent);
                 break;
             case "yfl"://原辅料
+                if (tPssrMaterialService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0
+                        || tPssrMaterialRawService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
+                    return AjaxResult.error("请确认所有确认人都已选择!");
+                }
                 doYflApprove(tPssrSubcontent);
                 break;
             case "jb"://机泵
+                if (tPssrPumpCleaningService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
+                    return AjaxResult.error("请确认所有确认人都已选择!");
+                }
                 doJbApprove(tPssrSubcontent);
                 break;
             case "zdj"://支吊架
+                if (tPssrFrameService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
+                    return AjaxResult.error("请确认所有确认人都已选择!");
+                }
                 doZdjApprove(tPssrSubcontent);
                 break;
             case "tzsb"://特种设备
+                if (tPssrPipeService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0
+                        || tPssrVesselService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
+                    return AjaxResult.error("请确认所有确认人都已选择!");
+                }
                 doTzsbApprove(tPssrSubcontent);
                 break;
             case "ybjy"://仪表校验
+                if (tPssrInstrumentCalibrationService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
+                    return AjaxResult.error("请确认所有确认人都已选择!");
+                }
                 doYbjyApprove(tPssrSubcontent);
                 break;
             case "yblscs"://仪表联锁测试
@@ -1246,26 +1316,46 @@ public class TPssrApproveController extends BaseController {
                 doBjlszqrApprove(tPssrSubcontent);
                 break;
             case "lsdy"://临时电源
+                if (tPssrPowerService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
+                    return AjaxResult.error("请确认所有确认人都已选择!");
+                }
                 doLsdyApprove(tPssrSubcontent);
                 break;
             case "djsb"://电机设备
+                if (tPssrMotorService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
+                    return AjaxResult.error("请确认所有确认人都已选择!");
+                }
                 doDjsbApprove(tPssrSubcontent);
                 break;
             case "zmdbr"://照明、电伴热
+                if (tPssrLightingService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
+                    return AjaxResult.error("请确认所有确认人都已选择!");
+                }
                 doZmdbrApprove(tPssrSubcontent);
                 break;
             case "jdjdkj"://静电接地、跨接
+                if (tPssrFranklinismService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
+                    return AjaxResult.error("请确认所有确认人都已选择!");
+                }
                 doJdjdkjApprove(tPssrSubcontent);
                 break;
             case "qtjcy"://气体检测仪
+                if (tPssrGasdetectorService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
+                    return AjaxResult.error("请确认所有确认人都已选择!");
+                }
                 doQtjcyApprove(tPssrSubcontent);
                 break;
             case "zxfxy"://在线分析仪
+                if (tPssrAnalyzerService.selectNoConfirmCount(tPssrSubcontent.getId()) > 0) {
+                    return AjaxResult.error("请确认所有确认人都已选择!");
+                }
                 doZxfxyApprove(tPssrSubcontent);
                 break;
             default:
                 return AjaxResult.error("申请发起失败!");
         }
+        tPssrSubcontent.setApproveStatus(1L);
+        tPssrSubcontentService.updateTPssrSubcontent(tPssrSubcontent);
         return AjaxResult.success();
     }
 

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrAboveallMapper.java

@@ -19,6 +19,7 @@ public interface TPssrAboveallMapper
      * @return PSSR
      */
     public TPssrAboveall selectTPssrAboveallById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询PSSR列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrAirtightMapper.java

@@ -19,6 +19,7 @@ public interface TPssrAirtightMapper
      * @return 气密
      */
     public TPssrAirtight selectTPssrAirtightById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询气密列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrAlarmMapper.java

@@ -19,6 +19,7 @@ public interface TPssrAlarmMapper
      * @return 报警联锁值确认
      */
     public TPssrAlarm selectTPssrAlarmById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询报警联锁值确认列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrAnalyzerMapper.java

@@ -19,6 +19,7 @@ public interface TPssrAnalyzerMapper
      * @return 在线分析仪
      */
     public TPssrAnalyzer selectTPssrAnalyzerById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询在线分析仪列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrBlindMapper.java

@@ -19,6 +19,7 @@ public interface TPssrBlindMapper
      * @return 盲板
      */
     public TPssrBlind selectTPssrBlindById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询盲板列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrCircuitMapper.java

@@ -19,6 +19,7 @@ public interface TPssrCircuitMapper
      * @return 短接
      */
     public TPssrCircuit selectTPssrCircuitById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询短接列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrCleaningMapper.java

@@ -19,6 +19,7 @@ public interface TPssrCleaningMapper
      * @return 设备清洁
      */
     public TPssrCleaning selectTPssrCleaningById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询设备清洁列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrContentModelMapper.java

@@ -19,6 +19,7 @@ public interface TPssrContentModelMapper
      * @return 开车条件确认模板
      */
     public TPssrContentModel selectTPssrContentModelById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询开车条件确认模板列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrFrameMapper.java

@@ -19,6 +19,7 @@ public interface TPssrFrameMapper
      * @return 支(吊)架
      */
     public TPssrFrame selectTPssrFrameById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询支(吊)架列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrFranklinismMapper.java

@@ -19,6 +19,7 @@ public interface TPssrFranklinismMapper
      * @return 静电接地,跨接
      */
     public TPssrFranklinism selectTPssrFranklinismById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询静电接地,跨接列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrGasdetectorMapper.java

@@ -19,6 +19,7 @@ public interface TPssrGasdetectorMapper
      * @return 气体检测器
      */
     public TPssrGasdetector selectTPssrGasdetectorById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询气体检测器列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrHygieneMapper.java

@@ -19,6 +19,7 @@ public interface TPssrHygieneMapper
      * @return 现场卫生
      */
     public TPssrHygiene selectTPssrHygieneById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询现场卫生列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrInstrumentCalibrationMapper.java

@@ -19,6 +19,7 @@ public interface TPssrInstrumentCalibrationMapper
      * @return 仪校验
      */
     public TPssrInstrumentCalibration selectTPssrInstrumentCalibrationById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询仪校验列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrInstrumentTestMapper.java

@@ -20,6 +20,7 @@ public interface TPssrInstrumentTestMapper
      * @return 仪联锁测试
      */
     public TPssrInstrumentTest selectTPssrInstrumentTestById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询仪联锁测试列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrLaboratoryMapper.java

@@ -19,6 +19,7 @@ public interface TPssrLaboratoryMapper
      * @return 实验室
      */
     public TPssrLaboratory selectTPssrLaboratoryById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询实验室列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrLightingMapper.java

@@ -19,6 +19,7 @@ public interface TPssrLightingMapper
      * @return 照明
      */
     public TPssrLighting selectTPssrLightingById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询照明列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrLockMapper.java

@@ -19,6 +19,7 @@ public interface TPssrLockMapper
      * @return 锁开锁关阀门状态
      */
     public TPssrLock selectTPssrLockById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询锁开锁关阀门状态列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrMaterialMapper.java

@@ -19,6 +19,7 @@ public interface TPssrMaterialMapper
      * @return 原料
      */
     public TPssrMaterial selectTPssrMaterialById(Long id);
+    public int selectNoConfirmCount(Long subId);
     public TPssrMaterial selectAllConfirmedPersonBySubId(TPssrMaterial tpssrMaterial);
 
     /**

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrMaterialRawMapper.java

@@ -20,6 +20,7 @@ public interface TPssrMaterialRawMapper
      * @return 原料
      */
     public TPssrMaterialRaw selectTPssrMaterialRawById(Long id);
+    public int selectNoConfirmCount(Long subId);
     public TPssrMaterialRaw selectAllConfirmedPersonBySubId(TPssrMaterialRaw tpssrMaterialRaw);
 
     /**

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrMeasureMapper.java

@@ -19,6 +19,7 @@ public interface TPssrMeasureMapper
      * @return 人身防护
      */
     public TPssrMeasure selectTPssrMeasureById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询人身防护列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrMocMapper.java

@@ -20,6 +20,7 @@ public interface TPssrMocMapper
      * @return MOC完成确认清单
      */
     public TPssrMoc selectTPssrMocById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询MOC完成确认清单列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrMotorMapper.java

@@ -19,6 +19,7 @@ public interface TPssrMotorMapper
      * @return 电机设备
      */
     public TPssrMotor selectTPssrMotorById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询电机设备列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrNitrogenMapper.java

@@ -19,6 +19,7 @@ public interface TPssrNitrogenMapper
      * @return 系统氮气置换
      */
     public TPssrNitrogen selectTPssrNitrogenById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询系统氮气置换列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulExchangerMapper.java

@@ -19,6 +19,7 @@ public interface TPssrOverhaulExchangerMapper
      * @return 检修项目-换热器
      */
     public TPssrOverhaulExchanger selectTPssrOverhaulExchangerById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询检修项目-换热器列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulFilterMapper.java

@@ -19,6 +19,7 @@ public interface TPssrOverhaulFilterMapper
      * @return 检修项目-过滤器
      */
     public TPssrOverhaulFilter selectTPssrOverhaulFilterById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询检修项目-过滤器列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulPipeMapper.java

@@ -19,6 +19,7 @@ public interface TPssrOverhaulPipeMapper
      * @return 检修项目-管线
      */
     public TPssrOverhaulPipe selectTPssrOverhaulPipeById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询检修项目-管线列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulPumpMapper.java

@@ -19,6 +19,7 @@ public interface TPssrOverhaulPumpMapper
      * @return 检修项目-泵
      */
     public TPssrOverhaulPump selectTPssrOverhaulPumpById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询检修项目-泵列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulTowerMapper.java

@@ -19,6 +19,7 @@ public interface TPssrOverhaulTowerMapper
      * @return 检修项目-塔罐
      */
     public TPssrOverhaulTower selectTPssrOverhaulTowerById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询检修项目-塔罐列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulValveMapper.java

@@ -19,6 +19,7 @@ public interface TPssrOverhaulValveMapper
      * @return 检修项目-阀门
      */
     public TPssrOverhaulValve selectTPssrOverhaulValveById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询检修项目-阀门列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrPatrolMapper.java

@@ -19,6 +19,7 @@ public interface TPssrPatrolMapper
      * @return 巡检
      */
     public TPssrPatrol selectTPssrPatrolById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询巡检列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrPipeMapper.java

@@ -19,6 +19,7 @@ public interface TPssrPipeMapper
      * @return 管道
      */
     public TPssrPipe selectTPssrPipeById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询管道列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrPowerMapper.java

@@ -19,6 +19,7 @@ public interface TPssrPowerMapper
      * @return 临时电源
      */
     public TPssrPower selectTPssrPowerById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询临时电源列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrProgrammeMapper.java

@@ -19,6 +19,7 @@ public interface TPssrProgrammeMapper
      * @return 开工方案
      */
     public TPssrProgramme selectTPssrProgrammeById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询开工方案列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrProtectionMapper.java

@@ -19,6 +19,7 @@ public interface TPssrProtectionMapper
      * @return 人身防护
      */
     public TPssrProtection selectTPssrProtectionById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询人身防护列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrPublicMapper.java

@@ -19,6 +19,7 @@ public interface TPssrPublicMapper
      * @return 公用工程
      */
     public TPssrPublic selectTPssrPublicById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询公用工程列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrPumpCleaningMapper.java

@@ -19,6 +19,7 @@ public interface TPssrPumpCleaningMapper
      * @return 机泵过滤器清理工作清单
      */
     public TPssrPumpCleaning selectTPssrPumpCleaningById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询机泵过滤器清理工作清单列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrPumpFillMapper.java

@@ -19,6 +19,7 @@ public interface TPssrPumpFillMapper
      * @return 机泵润滑油加注确认清单
      */
     public TPssrPumpFill selectTPssrPumpFillById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询机泵润滑油加注确认清单列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrPumpOverhaulMapper.java

@@ -19,6 +19,7 @@ public interface TPssrPumpOverhaulMapper
      * @return 机泵检修完成确认清单
      */
     public TPssrPumpOverhaul selectTPssrPumpOverhaulById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询机泵检修完成确认清单列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrRegionMapper.java

@@ -19,6 +19,7 @@ public interface TPssrRegionMapper
      * @return pssr区域管理
      */
     public TPssrRegion selectTPssrRegionById(Long id);
+    public int selectNoConfirmCount(Long subId);
 
     /**
      * 查询pssr区域管理列表

+ 1 - 0
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrSafetyBleedMapper.java

@@ -19,6 +19,7 @@ public interface TPssrSafetyBleedMapper
      * @return 安全设施-紧急泄放阀
      */
     public TPssrSafetyBleed selectTPssrSafetyBleedById(Long id);
+    public int selectNoConfirmCount(Long subId);
     public TPssrSafetyBleed selectAllConfirmedPersonBySubId(TPssrSafetyBleed tPssrSafetyBleed);
 
     /**

部分文件因为文件数量过多而无法显示