Prechádzať zdrojové kódy

ly PSSR 批量mapper

ly 6 mesiacov pred
rodič
commit
0c75fdd7c3
79 zmenil súbory, kde vykonal 1292 pridanie a 521 odobranie
  1. 11 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrAirtightMapper.java
  2. 9 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrAnalyzerMapper.java
  3. 10 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrBlindMapper.java
  4. 10 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrCircuitMapper.java
  5. 10 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrCleaningMapper.java
  6. 10 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrFrameMapper.java
  7. 10 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrFranklinismMapper.java
  8. 10 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrGasdetectorMapper.java
  9. 10 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrHygieneMapper.java
  10. 10 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrInstrumentCalibrationMapper.java
  11. 10 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrLaboratoryMapper.java
  12. 10 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrLightingMapper.java
  13. 11 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrLockMapper.java
  14. 9 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrMotorMapper.java
  15. 10 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrNitrogenMapper.java
  16. 11 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulExchangerMapper.java
  17. 11 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulFilterMapper.java
  18. 11 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulPipeMapper.java
  19. 10 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulPumpMapper.java
  20. 10 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulTowerMapper.java
  21. 11 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulValveMapper.java
  22. 10 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrPatrolMapper.java
  23. 11 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrPowerMapper.java
  24. 9 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrProgrammeMapper.java
  25. 11 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrProtectionMapper.java
  26. 9 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrPublicMapper.java
  27. 11 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrPumpCleaningMapper.java
  28. 11 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrPumpFillMapper.java
  29. 11 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrPumpOverhaulMapper.java
  30. 11 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrSafetyBleedMapper.java
  31. 11 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrSafetyBreathMapper.java
  32. 11 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrSafetyBrustMapper.java
  33. 11 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrSafetyFlamearresterMapper.java
  34. 10 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrSafetyValveMapper.java
  35. 10 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrSubcontentMapper.java
  36. 10 8
      master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrTorchvocMapper.java
  37. 9 0
      master/src/main/java/com/ruoyi/project/sems/domain/TMeasureThickness.java
  38. 24 6
      master/src/main/resources/mybatis/pssr/TPssrAirtightMapper.xml
  39. 24 6
      master/src/main/resources/mybatis/pssr/TPssrAnalyzerMapper.xml
  40. 24 6
      master/src/main/resources/mybatis/pssr/TPssrBlindMapper.xml
  41. 24 6
      master/src/main/resources/mybatis/pssr/TPssrCircuitMapper.xml
  42. 24 6
      master/src/main/resources/mybatis/pssr/TPssrCleaningMapper.xml
  43. 24 6
      master/src/main/resources/mybatis/pssr/TPssrFrameMapper.xml
  44. 24 6
      master/src/main/resources/mybatis/pssr/TPssrFranklinismMapper.xml
  45. 24 6
      master/src/main/resources/mybatis/pssr/TPssrGasdetectorMapper.xml
  46. 24 6
      master/src/main/resources/mybatis/pssr/TPssrHygieneMapper.xml
  47. 24 6
      master/src/main/resources/mybatis/pssr/TPssrInstrumentCalibrationMapper.xml
  48. 24 6
      master/src/main/resources/mybatis/pssr/TPssrLaboratoryMapper.xml
  49. 24 6
      master/src/main/resources/mybatis/pssr/TPssrLightingMapper.xml
  50. 23 6
      master/src/main/resources/mybatis/pssr/TPssrLockMapper.xml
  51. 0 3
      master/src/main/resources/mybatis/pssr/TPssrMaterialRawMapper.xml
  52. 24 6
      master/src/main/resources/mybatis/pssr/TPssrMocMapper.xml
  53. 24 6
      master/src/main/resources/mybatis/pssr/TPssrMotorMapper.xml
  54. 24 6
      master/src/main/resources/mybatis/pssr/TPssrNitrogenMapper.xml
  55. 22 5
      master/src/main/resources/mybatis/pssr/TPssrOverhaulExchangerMapper.xml
  56. 23 6
      master/src/main/resources/mybatis/pssr/TPssrOverhaulFilterMapper.xml
  57. 23 6
      master/src/main/resources/mybatis/pssr/TPssrOverhaulPipeMapper.xml
  58. 23 6
      master/src/main/resources/mybatis/pssr/TPssrOverhaulPumpMapper.xml
  59. 23 6
      master/src/main/resources/mybatis/pssr/TPssrOverhaulTowerMapper.xml
  60. 23 6
      master/src/main/resources/mybatis/pssr/TPssrOverhaulValveMapper.xml
  61. 23 6
      master/src/main/resources/mybatis/pssr/TPssrPatrolMapper.xml
  62. 24 6
      master/src/main/resources/mybatis/pssr/TPssrPowerMapper.xml
  63. 23 6
      master/src/main/resources/mybatis/pssr/TPssrProgrammeMapper.xml
  64. 23 5
      master/src/main/resources/mybatis/pssr/TPssrProtectionMapper.xml
  65. 24 6
      master/src/main/resources/mybatis/pssr/TPssrPublicMapper.xml
  66. 24 6
      master/src/main/resources/mybatis/pssr/TPssrPumpCleaningMapper.xml
  67. 24 6
      master/src/main/resources/mybatis/pssr/TPssrPumpFillMapper.xml
  68. 25 6
      master/src/main/resources/mybatis/pssr/TPssrPumpOverhaulMapper.xml
  69. 25 6
      master/src/main/resources/mybatis/pssr/TPssrSafetyBleedMapper.xml
  70. 25 6
      master/src/main/resources/mybatis/pssr/TPssrSafetyBreathMapper.xml
  71. 24 6
      master/src/main/resources/mybatis/pssr/TPssrSafetyBrustMapper.xml
  72. 26 6
      master/src/main/resources/mybatis/pssr/TPssrSafetyFlamearresterMapper.xml
  73. 24 6
      master/src/main/resources/mybatis/pssr/TPssrSafetyValveMapper.xml
  74. 23 6
      master/src/main/resources/mybatis/pssr/TPssrSubcontentMapper.xml
  75. 23 6
      master/src/main/resources/mybatis/pssr/TPssrTorchvocMapper.xml
  76. 6 6
      master/src/main/resources/mybatis/pssr/TPssrVesselMapper.xml
  77. 2 1
      master/src/main/resources/mybatis/sems/TMeasureThicknessMapper.xml
  78. 3 3
      master/src/main/resources/mybatis/system/SysUserMapper.xml
  79. 21 0
      ui/src/views/sems/thickness/index.vue

+ 11 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrAirtightMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrAirtight;
 
 /**
  * 气密Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrAirtightMapper 
+public interface TPssrAirtightMapper
 {
     /**
      * 查询气密
-     * 
+     *
      * @param id 气密ID
      * @return 气密
      */
@@ -22,7 +22,7 @@ public interface TPssrAirtightMapper
 
     /**
      * 查询气密列表
-     * 
+     *
      * @param tPssrAirtight 气密
      * @return 气密集合
      */
@@ -31,7 +31,7 @@ public interface TPssrAirtightMapper
 
     /**
      * 新增气密
-     * 
+     *
      * @param tPssrAirtight 气密
      * @return 结果
      */
@@ -39,15 +39,18 @@ public interface TPssrAirtightMapper
 
     /**
      * 修改气密
-     * 
+     *
      * @param tPssrAirtight 气密
      * @return 结果
      */
     public int updateTPssrAirtight(TPssrAirtight tPssrAirtight);
 
+    public int updateTPssrAirtightByIds(TPssrAirtight tPssrAirtight);
+
+
     /**
      * 删除气密
-     * 
+     *
      * @param id 气密ID
      * @return 结果
      */
@@ -55,7 +58,7 @@ public interface TPssrAirtightMapper
 
     /**
      * 批量删除气密
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 9 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrAnalyzerMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrAnalyzer;
 
 /**
  * 在线分析仪Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrAnalyzerMapper 
+public interface TPssrAnalyzerMapper
 {
     /**
      * 查询在线分析仪
-     * 
+     *
      * @param id 在线分析仪ID
      * @return 在线分析仪
      */
@@ -22,7 +22,7 @@ public interface TPssrAnalyzerMapper
 
     /**
      * 查询在线分析仪列表
-     * 
+     *
      * @param tPssrAnalyzer 在线分析仪
      * @return 在线分析仪集合
      */
@@ -31,7 +31,7 @@ public interface TPssrAnalyzerMapper
 
     /**
      * 新增在线分析仪
-     * 
+     *
      * @param tPssrAnalyzer 在线分析仪
      * @return 结果
      */
@@ -39,15 +39,16 @@ public interface TPssrAnalyzerMapper
 
     /**
      * 修改在线分析仪
-     * 
+     *
      * @param tPssrAnalyzer 在线分析仪
      * @return 结果
      */
     public int updateTPssrAnalyzer(TPssrAnalyzer tPssrAnalyzer);
+    public int updateTPssrAnalyzerByIds(TPssrAnalyzer tPssrAnalyzer);
 
     /**
      * 删除在线分析仪
-     * 
+     *
      * @param id 在线分析仪ID
      * @return 结果
      */
@@ -55,7 +56,7 @@ public interface TPssrAnalyzerMapper
 
     /**
      * 批量删除在线分析仪
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 10 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrBlindMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrBlind;
 
 /**
  * 盲板Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrBlindMapper 
+public interface TPssrBlindMapper
 {
     /**
      * 查询盲板
-     * 
+     *
      * @param id 盲板ID
      * @return 盲板
      */
@@ -22,7 +22,7 @@ public interface TPssrBlindMapper
 
     /**
      * 查询盲板列表
-     * 
+     *
      * @param tPssrBlind 盲板
      * @return 盲板集合
      */
@@ -31,7 +31,7 @@ public interface TPssrBlindMapper
 
     /**
      * 新增盲板
-     * 
+     *
      * @param tPssrBlind 盲板
      * @return 结果
      */
@@ -39,15 +39,17 @@ public interface TPssrBlindMapper
 
     /**
      * 修改盲板
-     * 
+     *
      * @param tPssrBlind 盲板
      * @return 结果
      */
     public int updateTPssrBlind(TPssrBlind tPssrBlind);
+    public int updateTPssrBlindByIds(TPssrBlind tPssrBlind);
+
 
     /**
      * 删除盲板
-     * 
+     *
      * @param id 盲板ID
      * @return 结果
      */
@@ -55,7 +57,7 @@ public interface TPssrBlindMapper
 
     /**
      * 批量删除盲板
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 10 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrCircuitMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrCircuit;
 
 /**
  * 短接Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrCircuitMapper 
+public interface TPssrCircuitMapper
 {
     /**
      * 查询短接
-     * 
+     *
      * @param id 短接ID
      * @return 短接
      */
@@ -22,7 +22,7 @@ public interface TPssrCircuitMapper
 
     /**
      * 查询短接列表
-     * 
+     *
      * @param tPssrCircuit 短接
      * @return 短接集合
      */
@@ -31,7 +31,7 @@ public interface TPssrCircuitMapper
 
     /**
      * 新增短接
-     * 
+     *
      * @param tPssrCircuit 短接
      * @return 结果
      */
@@ -39,15 +39,17 @@ public interface TPssrCircuitMapper
 
     /**
      * 修改短接
-     * 
+     *
      * @param tPssrCircuit 短接
      * @return 结果
      */
     public int updateTPssrCircuit(TPssrCircuit tPssrCircuit);
+    public int updateTPssrCircuitByIds(TPssrCircuit tPssrCircuit);
+
 
     /**
      * 删除短接
-     * 
+     *
      * @param id 短接ID
      * @return 结果
      */
@@ -55,7 +57,7 @@ public interface TPssrCircuitMapper
 
     /**
      * 批量删除短接
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 10 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrCleaningMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrCleaning;
 
 /**
  * 设备清洁Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrCleaningMapper 
+public interface TPssrCleaningMapper
 {
     /**
      * 查询设备清洁
-     * 
+     *
      * @param id 设备清洁ID
      * @return 设备清洁
      */
@@ -22,7 +22,7 @@ public interface TPssrCleaningMapper
 
     /**
      * 查询设备清洁列表
-     * 
+     *
      * @param tPssrCleaning 设备清洁
      * @return 设备清洁集合
      */
@@ -31,7 +31,7 @@ public interface TPssrCleaningMapper
 
     /**
      * 新增设备清洁
-     * 
+     *
      * @param tPssrCleaning 设备清洁
      * @return 结果
      */
@@ -39,15 +39,17 @@ public interface TPssrCleaningMapper
 
     /**
      * 修改设备清洁
-     * 
+     *
      * @param tPssrCleaning 设备清洁
      * @return 结果
      */
     public int updateTPssrCleaning(TPssrCleaning tPssrCleaning);
+    public int updateTPssrCleaningByIds(TPssrCleaning tPssrCleaning);
+
 
     /**
      * 删除设备清洁
-     * 
+     *
      * @param id 设备清洁ID
      * @return 结果
      */
@@ -55,7 +57,7 @@ public interface TPssrCleaningMapper
 
     /**
      * 批量删除设备清洁
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 10 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrFrameMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrFrame;
 
 /**
  * 支(吊)架Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrFrameMapper 
+public interface TPssrFrameMapper
 {
     /**
      * 查询支(吊)架
-     * 
+     *
      * @param id 支(吊)架ID
      * @return 支(吊)架
      */
@@ -22,7 +22,7 @@ public interface TPssrFrameMapper
 
     /**
      * 查询支(吊)架列表
-     * 
+     *
      * @param tPssrFrame 支(吊)架
      * @return 支(吊)架集合
      */
@@ -31,7 +31,7 @@ public interface TPssrFrameMapper
 
     /**
      * 新增支(吊)架
-     * 
+     *
      * @param tPssrFrame 支(吊)架
      * @return 结果
      */
@@ -39,15 +39,17 @@ public interface TPssrFrameMapper
 
     /**
      * 修改支(吊)架
-     * 
+     *
      * @param tPssrFrame 支(吊)架
      * @return 结果
      */
     public int updateTPssrFrame(TPssrFrame tPssrFrame);
+    public int updateTPssrFrameByIds(TPssrFrame tPssrFrame);
+
 
     /**
      * 删除支(吊)架
-     * 
+     *
      * @param id 支(吊)架ID
      * @return 结果
      */
@@ -55,7 +57,7 @@ public interface TPssrFrameMapper
 
     /**
      * 批量删除支(吊)架
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 10 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrFranklinismMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrFranklinism;
 
 /**
  * 静电接地,跨接Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrFranklinismMapper 
+public interface TPssrFranklinismMapper
 {
     /**
      * 查询静电接地,跨接
-     * 
+     *
      * @param id 静电接地,跨接ID
      * @return 静电接地,跨接
      */
@@ -22,7 +22,7 @@ public interface TPssrFranklinismMapper
 
     /**
      * 查询静电接地,跨接列表
-     * 
+     *
      * @param tPssrFranklinism 静电接地,跨接
      * @return 静电接地,跨接集合
      */
@@ -31,7 +31,7 @@ public interface TPssrFranklinismMapper
 
     /**
      * 新增静电接地,跨接
-     * 
+     *
      * @param tPssrFranklinism 静电接地,跨接
      * @return 结果
      */
@@ -39,15 +39,17 @@ public interface TPssrFranklinismMapper
 
     /**
      * 修改静电接地,跨接
-     * 
+     *
      * @param tPssrFranklinism 静电接地,跨接
      * @return 结果
      */
     public int updateTPssrFranklinism(TPssrFranklinism tPssrFranklinism);
+    public int updateTPssrFranklinismByIds(TPssrFranklinism tPssrFranklinism);
+
 
     /**
      * 删除静电接地,跨接
-     * 
+     *
      * @param id 静电接地,跨接ID
      * @return 结果
      */
@@ -55,7 +57,7 @@ public interface TPssrFranklinismMapper
 
     /**
      * 批量删除静电接地,跨接
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 10 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrGasdetectorMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrGasdetector;
 
 /**
  * 气体检测器Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrGasdetectorMapper 
+public interface TPssrGasdetectorMapper
 {
     /**
      * 查询气体检测器
-     * 
+     *
      * @param id 气体检测器ID
      * @return 气体检测器
      */
@@ -22,7 +22,7 @@ public interface TPssrGasdetectorMapper
 
     /**
      * 查询气体检测器列表
-     * 
+     *
      * @param tPssrGasdetector 气体检测器
      * @return 气体检测器集合
      */
@@ -31,7 +31,7 @@ public interface TPssrGasdetectorMapper
 
     /**
      * 新增气体检测器
-     * 
+     *
      * @param tPssrGasdetector 气体检测器
      * @return 结果
      */
@@ -39,15 +39,17 @@ public interface TPssrGasdetectorMapper
 
     /**
      * 修改气体检测器
-     * 
+     *
      * @param tPssrGasdetector 气体检测器
      * @return 结果
      */
     public int updateTPssrGasdetector(TPssrGasdetector tPssrGasdetector);
 
+    public int updateTPssrGasdetectorByIds(TPssrGasdetector tPssrGasdetector);
+
     /**
      * 删除气体检测器
-     * 
+     *
      * @param id 气体检测器ID
      * @return 结果
      */
@@ -55,7 +57,7 @@ public interface TPssrGasdetectorMapper
 
     /**
      * 批量删除气体检测器
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 10 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrHygieneMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrHygiene;
 
 /**
  * 现场卫生Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrHygieneMapper 
+public interface TPssrHygieneMapper
 {
     /**
      * 查询现场卫生
-     * 
+     *
      * @param id 现场卫生ID
      * @return 现场卫生
      */
@@ -22,7 +22,7 @@ public interface TPssrHygieneMapper
 
     /**
      * 查询现场卫生列表
-     * 
+     *
      * @param tPssrHygiene 现场卫生
      * @return 现场卫生集合
      */
@@ -31,7 +31,7 @@ public interface TPssrHygieneMapper
 
     /**
      * 新增现场卫生
-     * 
+     *
      * @param tPssrHygiene 现场卫生
      * @return 结果
      */
@@ -39,15 +39,17 @@ public interface TPssrHygieneMapper
 
     /**
      * 修改现场卫生
-     * 
+     *
      * @param tPssrHygiene 现场卫生
      * @return 结果
      */
     public int updateTPssrHygiene(TPssrHygiene tPssrHygiene);
+    public int updateTPssrHygieneByIds(TPssrHygiene tPssrHygiene);
+
 
     /**
      * 删除现场卫生
-     * 
+     *
      * @param id 现场卫生ID
      * @return 结果
      */
@@ -55,7 +57,7 @@ public interface TPssrHygieneMapper
 
     /**
      * 批量删除现场卫生
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 10 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrInstrumentCalibrationMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrInstrumentCalibration;
 
 /**
  * 仪校验Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrInstrumentCalibrationMapper 
+public interface TPssrInstrumentCalibrationMapper
 {
     /**
      * 查询仪校验
-     * 
+     *
      * @param id 仪校验ID
      * @return 仪校验
      */
@@ -22,7 +22,7 @@ public interface TPssrInstrumentCalibrationMapper
 
     /**
      * 查询仪校验列表
-     * 
+     *
      * @param tPssrInstrumentCalibration 仪校验
      * @return 仪校验集合
      */
@@ -31,7 +31,7 @@ public interface TPssrInstrumentCalibrationMapper
 
     /**
      * 新增仪校验
-     * 
+     *
      * @param tPssrInstrumentCalibration 仪校验
      * @return 结果
      */
@@ -39,15 +39,17 @@ public interface TPssrInstrumentCalibrationMapper
 
     /**
      * 修改仪校验
-     * 
+     *
      * @param tPssrInstrumentCalibration 仪校验
      * @return 结果
      */
     public int updateTPssrInstrumentCalibration(TPssrInstrumentCalibration tPssrInstrumentCalibration);
+    public int updateTPssrInstrumentCalibrationByIds(TPssrInstrumentCalibration tPssrInstrumentCalibration);
+
 
     /**
      * 删除仪校验
-     * 
+     *
      * @param id 仪校验ID
      * @return 结果
      */
@@ -55,7 +57,7 @@ public interface TPssrInstrumentCalibrationMapper
 
     /**
      * 批量删除仪校验
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 10 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrLaboratoryMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrLaboratory;
 
 /**
  * 实验室Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-10-30
  */
-public interface TPssrLaboratoryMapper 
+public interface TPssrLaboratoryMapper
 {
     /**
      * 查询实验室
-     * 
+     *
      * @param id 实验室ID
      * @return 实验室
      */
@@ -22,7 +22,7 @@ public interface TPssrLaboratoryMapper
 
     /**
      * 查询实验室列表
-     * 
+     *
      * @param tPssrLaboratory 实验室
      * @return 实验室集合
      */
@@ -31,7 +31,7 @@ public interface TPssrLaboratoryMapper
 
     /**
      * 新增实验室
-     * 
+     *
      * @param tPssrLaboratory 实验室
      * @return 结果
      */
@@ -39,15 +39,17 @@ public interface TPssrLaboratoryMapper
 
     /**
      * 修改实验室
-     * 
+     *
      * @param tPssrLaboratory 实验室
      * @return 结果
      */
     public int updateTPssrLaboratory(TPssrLaboratory tPssrLaboratory);
+    public int updateTPssrLaboratoryByIds(TPssrLaboratory tPssrLaboratory);
+
 
     /**
      * 删除实验室
-     * 
+     *
      * @param id 实验室ID
      * @return 结果
      */
@@ -55,7 +57,7 @@ public interface TPssrLaboratoryMapper
 
     /**
      * 批量删除实验室
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 10 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrLightingMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrLighting;
 
 /**
  * 照明Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrLightingMapper 
+public interface TPssrLightingMapper
 {
     /**
      * 查询照明
-     * 
+     *
      * @param id 照明ID
      * @return 照明
      */
@@ -22,7 +22,7 @@ public interface TPssrLightingMapper
 
     /**
      * 查询照明列表
-     * 
+     *
      * @param tPssrLighting 照明
      * @return 照明集合
      */
@@ -31,7 +31,7 @@ public interface TPssrLightingMapper
 
     /**
      * 新增照明
-     * 
+     *
      * @param tPssrLighting 照明
      * @return 结果
      */
@@ -39,15 +39,17 @@ public interface TPssrLightingMapper
 
     /**
      * 修改照明
-     * 
+     *
      * @param tPssrLighting 照明
      * @return 结果
      */
     public int updateTPssrLighting(TPssrLighting tPssrLighting);
+    public int updateTPssrLightingByIds(TPssrLighting tPssrLighting);
+
 
     /**
      * 删除照明
-     * 
+     *
      * @param id 照明ID
      * @return 结果
      */
@@ -55,7 +57,7 @@ public interface TPssrLightingMapper
 
     /**
      * 批量删除照明
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 11 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrLockMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrLock;
 
 /**
  * 锁开锁关阀门状态Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrLockMapper 
+public interface TPssrLockMapper
 {
     /**
      * 查询锁开锁关阀门状态
-     * 
+     *
      * @param id 锁开锁关阀门状态ID
      * @return 锁开锁关阀门状态
      */
@@ -22,7 +22,7 @@ public interface TPssrLockMapper
 
     /**
      * 查询锁开锁关阀门状态列表
-     * 
+     *
      * @param tPssrLock 锁开锁关阀门状态
      * @return 锁开锁关阀门状态集合
      */
@@ -31,7 +31,7 @@ public interface TPssrLockMapper
 
     /**
      * 新增锁开锁关阀门状态
-     * 
+     *
      * @param tPssrLock 锁开锁关阀门状态
      * @return 结果
      */
@@ -39,15 +39,18 @@ public interface TPssrLockMapper
 
     /**
      * 修改锁开锁关阀门状态
-     * 
+     *
      * @param tPssrLock 锁开锁关阀门状态
      * @return 结果
      */
     public int updateTPssrLock(TPssrLock tPssrLock);
+    public int updateTPssrLockByIds(TPssrLock tPssrLock);
+
+
 
     /**
      * 删除锁开锁关阀门状态
-     * 
+     *
      * @param id 锁开锁关阀门状态ID
      * @return 结果
      */
@@ -55,7 +58,7 @@ public interface TPssrLockMapper
 
     /**
      * 批量删除锁开锁关阀门状态
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 9 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrMotorMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrMotor;
 
 /**
  * 电机设备Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrMotorMapper 
+public interface TPssrMotorMapper
 {
     /**
      * 查询电机设备
-     * 
+     *
      * @param id 电机设备ID
      * @return 电机设备
      */
@@ -22,7 +22,7 @@ public interface TPssrMotorMapper
 
     /**
      * 查询电机设备列表
-     * 
+     *
      * @param tPssrMotor 电机设备
      * @return 电机设备集合
      */
@@ -31,7 +31,7 @@ public interface TPssrMotorMapper
 
     /**
      * 新增电机设备
-     * 
+     *
      * @param tPssrMotor 电机设备
      * @return 结果
      */
@@ -39,15 +39,16 @@ public interface TPssrMotorMapper
 
     /**
      * 修改电机设备
-     * 
+     *
      * @param tPssrMotor 电机设备
      * @return 结果
      */
     public int updateTPssrMotor(TPssrMotor tPssrMotor);
+    public int updateTPssrMotorByIds(TPssrMotor tPssrMotor);
 
     /**
      * 删除电机设备
-     * 
+     *
      * @param id 电机设备ID
      * @return 结果
      */
@@ -55,7 +56,7 @@ public interface TPssrMotorMapper
 
     /**
      * 批量删除电机设备
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 10 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrNitrogenMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrNitrogen;
 
 /**
  * 系统氮气置换Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrNitrogenMapper 
+public interface TPssrNitrogenMapper
 {
     /**
      * 查询系统氮气置换
-     * 
+     *
      * @param id 系统氮气置换ID
      * @return 系统氮气置换
      */
@@ -22,7 +22,7 @@ public interface TPssrNitrogenMapper
 
     /**
      * 查询系统氮气置换列表
-     * 
+     *
      * @param tPssrNitrogen 系统氮气置换
      * @return 系统氮气置换集合
      */
@@ -31,7 +31,7 @@ public interface TPssrNitrogenMapper
 
     /**
      * 新增系统氮气置换
-     * 
+     *
      * @param tPssrNitrogen 系统氮气置换
      * @return 结果
      */
@@ -39,15 +39,17 @@ public interface TPssrNitrogenMapper
 
     /**
      * 修改系统氮气置换
-     * 
+     *
      * @param tPssrNitrogen 系统氮气置换
      * @return 结果
      */
     public int updateTPssrNitrogen(TPssrNitrogen tPssrNitrogen);
+    public int updateTPssrNitrogenByIds(TPssrNitrogen tPssrNitrogen);
+
 
     /**
      * 删除系统氮气置换
-     * 
+     *
      * @param id 系统氮气置换ID
      * @return 结果
      */
@@ -55,7 +57,7 @@ public interface TPssrNitrogenMapper
 
     /**
      * 批量删除系统氮气置换
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 11 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulExchangerMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrOverhaulExchanger;
 
 /**
  * 检修项目-换热器Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrOverhaulExchangerMapper 
+public interface TPssrOverhaulExchangerMapper
 {
     /**
      * 查询检修项目-换热器
-     * 
+     *
      * @param id 检修项目-换热器ID
      * @return 检修项目-换热器
      */
@@ -22,7 +22,7 @@ public interface TPssrOverhaulExchangerMapper
 
     /**
      * 查询检修项目-换热器列表
-     * 
+     *
      * @param tPssrOverhaulExchanger 检修项目-换热器
      * @return 检修项目-换热器集合
      */
@@ -33,7 +33,7 @@ public interface TPssrOverhaulExchangerMapper
 
     /**
      * 新增检修项目-换热器
-     * 
+     *
      * @param tPssrOverhaulExchanger 检修项目-换热器
      * @return 结果
      */
@@ -41,16 +41,19 @@ public interface TPssrOverhaulExchangerMapper
 
     /**
      * 修改检修项目-换热器
-     * 
+     *
      * @param tPssrOverhaulExchanger 检修项目-换热器
      * @return 结果
      */
     public int updateTPssrOverhaulExchanger(TPssrOverhaulExchanger tPssrOverhaulExchanger);
+    public int updateTPssrOverhaulExchangerByIds(TPssrOverhaulExchanger tPssrOverhaulExchanger);
+
+
     public int updateAllBySubId(TPssrOverhaulExchanger tPssrOverhaulExchanger);
 
     /**
      * 删除检修项目-换热器
-     * 
+     *
      * @param id 检修项目-换热器ID
      * @return 结果
      */
@@ -58,7 +61,7 @@ public interface TPssrOverhaulExchangerMapper
 
     /**
      * 批量删除检修项目-换热器
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 11 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulFilterMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrOverhaulFilter;
 
 /**
  * 检修项目-过滤器Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrOverhaulFilterMapper 
+public interface TPssrOverhaulFilterMapper
 {
     /**
      * 查询检修项目-过滤器
-     * 
+     *
      * @param id 检修项目-过滤器ID
      * @return 检修项目-过滤器
      */
@@ -22,7 +22,7 @@ public interface TPssrOverhaulFilterMapper
 
     /**
      * 查询检修项目-过滤器列表
-     * 
+     *
      * @param tPssrOverhaulFilter 检修项目-过滤器
      * @return 检修项目-过滤器集合
      */
@@ -31,7 +31,7 @@ public interface TPssrOverhaulFilterMapper
 
     /**
      * 新增检修项目-过滤器
-     * 
+     *
      * @param tPssrOverhaulFilter 检修项目-过滤器
      * @return 结果
      */
@@ -39,16 +39,19 @@ public interface TPssrOverhaulFilterMapper
 
     /**
      * 修改检修项目-过滤器
-     * 
+     *
      * @param tPssrOverhaulFilter 检修项目-过滤器
      * @return 结果
      */
     public int updateTPssrOverhaulFilter(TPssrOverhaulFilter tPssrOverhaulFilter);
+    public int updateTPssrOverhaulFilterByIds(TPssrOverhaulFilter tPssrOverhaulFilter);
+
+
     public int updateAllBySubId(TPssrOverhaulFilter tPssrOverhaulFilter);
 
     /**
      * 删除检修项目-过滤器
-     * 
+     *
      * @param id 检修项目-过滤器ID
      * @return 结果
      */
@@ -56,7 +59,7 @@ public interface TPssrOverhaulFilterMapper
 
     /**
      * 批量删除检修项目-过滤器
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 11 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulPipeMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrOverhaulPipe;
 
 /**
  * 检修项目-管线Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrOverhaulPipeMapper 
+public interface TPssrOverhaulPipeMapper
 {
     /**
      * 查询检修项目-管线
-     * 
+     *
      * @param id 检修项目-管线ID
      * @return 检修项目-管线
      */
@@ -22,7 +22,7 @@ public interface TPssrOverhaulPipeMapper
 
     /**
      * 查询检修项目-管线列表
-     * 
+     *
      * @param tPssrOverhaulPipe 检修项目-管线
      * @return 检修项目-管线集合
      */
@@ -31,7 +31,7 @@ public interface TPssrOverhaulPipeMapper
 
     /**
      * 新增检修项目-管线
-     * 
+     *
      * @param tPssrOverhaulPipe 检修项目-管线
      * @return 结果
      */
@@ -39,16 +39,19 @@ public interface TPssrOverhaulPipeMapper
 
     /**
      * 修改检修项目-管线
-     * 
+     *
      * @param tPssrOverhaulPipe 检修项目-管线
      * @return 结果
      */
     public int updateTPssrOverhaulPipe(TPssrOverhaulPipe tPssrOverhaulPipe);
+    public int updateTPssrOverhaulPipeByIds(TPssrOverhaulPipe tPssrOverhaulPipe);
+
+
     public int updateAllBySubId(TPssrOverhaulPipe tPssrOverhaulPipe);
 
     /**
      * 删除检修项目-管线
-     * 
+     *
      * @param id 检修项目-管线ID
      * @return 结果
      */
@@ -56,7 +59,7 @@ public interface TPssrOverhaulPipeMapper
 
     /**
      * 批量删除检修项目-管线
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 10 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulPumpMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrOverhaulPump;
 
 /**
  * 检修项目-泵Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrOverhaulPumpMapper 
+public interface TPssrOverhaulPumpMapper
 {
     /**
      * 查询检修项目-泵
-     * 
+     *
      * @param id 检修项目-泵ID
      * @return 检修项目-泵
      */
@@ -22,7 +22,7 @@ public interface TPssrOverhaulPumpMapper
 
     /**
      * 查询检修项目-泵列表
-     * 
+     *
      * @param tPssrOverhaulPump 检修项目-泵
      * @return 检修项目-泵集合
      */
@@ -31,7 +31,7 @@ public interface TPssrOverhaulPumpMapper
 
     /**
      * 新增检修项目-泵
-     * 
+     *
      * @param tPssrOverhaulPump 检修项目-泵
      * @return 结果
      */
@@ -39,16 +39,18 @@ public interface TPssrOverhaulPumpMapper
 
     /**
      * 修改检修项目-泵
-     * 
+     *
      * @param tPssrOverhaulPump 检修项目-泵
      * @return 结果
      */
     public int updateTPssrOverhaulPump(TPssrOverhaulPump tPssrOverhaulPump);
+    public int updateTPssrOverhaulPumpByIds(TPssrOverhaulPump tPssrOverhaulPump);
+
     public int updateAllBySubId(TPssrOverhaulPump tPssrOverhaulPump);
 
     /**
      * 删除检修项目-泵
-     * 
+     *
      * @param id 检修项目-泵ID
      * @return 结果
      */
@@ -56,7 +58,7 @@ public interface TPssrOverhaulPumpMapper
 
     /**
      * 批量删除检修项目-泵
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 10 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulTowerMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrOverhaulTower;
 
 /**
  * 检修项目-塔罐Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrOverhaulTowerMapper 
+public interface TPssrOverhaulTowerMapper
 {
     /**
      * 查询检修项目-塔罐
-     * 
+     *
      * @param id 检修项目-塔罐ID
      * @return 检修项目-塔罐
      */
@@ -22,7 +22,7 @@ public interface TPssrOverhaulTowerMapper
 
     /**
      * 查询检修项目-塔罐列表
-     * 
+     *
      * @param tPssrOverhaulTower 检修项目-塔罐
      * @return 检修项目-塔罐集合
      */
@@ -31,7 +31,7 @@ public interface TPssrOverhaulTowerMapper
 
     /**
      * 新增检修项目-塔罐
-     * 
+     *
      * @param tPssrOverhaulTower 检修项目-塔罐
      * @return 结果
      */
@@ -39,16 +39,18 @@ public interface TPssrOverhaulTowerMapper
 
     /**
      * 修改检修项目-塔罐
-     * 
+     *
      * @param tPssrOverhaulTower 检修项目-塔罐
      * @return 结果
      */
     public int updateTPssrOverhaulTower(TPssrOverhaulTower tPssrOverhaulTower);
+    public int updateTPssrOverhaulTowerByIds(TPssrOverhaulTower tPssrOverhaulTower);
+
     public int updateAllBySubId(TPssrOverhaulTower tPssrOverhaulTower);
 
     /**
      * 删除检修项目-塔罐
-     * 
+     *
      * @param id 检修项目-塔罐ID
      * @return 结果
      */
@@ -56,7 +58,7 @@ public interface TPssrOverhaulTowerMapper
 
     /**
      * 批量删除检修项目-塔罐
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 11 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrOverhaulValveMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrOverhaulValve;
 
 /**
  * 检修项目-阀门Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrOverhaulValveMapper 
+public interface TPssrOverhaulValveMapper
 {
     /**
      * 查询检修项目-阀门
-     * 
+     *
      * @param id 检修项目-阀门ID
      * @return 检修项目-阀门
      */
@@ -22,7 +22,7 @@ public interface TPssrOverhaulValveMapper
 
     /**
      * 查询检修项目-阀门列表
-     * 
+     *
      * @param tPssrOverhaulValve 检修项目-阀门
      * @return 检修项目-阀门集合
      */
@@ -31,7 +31,7 @@ public interface TPssrOverhaulValveMapper
 
     /**
      * 新增检修项目-阀门
-     * 
+     *
      * @param tPssrOverhaulValve 检修项目-阀门
      * @return 结果
      */
@@ -39,16 +39,19 @@ public interface TPssrOverhaulValveMapper
 
     /**
      * 修改检修项目-阀门
-     * 
+     *
      * @param tPssrOverhaulValve 检修项目-阀门
      * @return 结果
      */
     public int updateTPssrOverhaulValve(TPssrOverhaulValve tPssrOverhaulValve);
+    public int updateTPssrOverhaulValveByIds(TPssrOverhaulValve tPssrOverhaulValve);
+
+
     public int updateAllBySubId(TPssrOverhaulValve tPssrOverhaulValve);
 
     /**
      * 删除检修项目-阀门
-     * 
+     *
      * @param id 检修项目-阀门ID
      * @return 结果
      */
@@ -56,7 +59,7 @@ public interface TPssrOverhaulValveMapper
 
     /**
      * 批量删除检修项目-阀门
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 10 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrPatrolMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrPatrol;
 
 /**
  * 巡检Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrPatrolMapper 
+public interface TPssrPatrolMapper
 {
     /**
      * 查询巡检
-     * 
+     *
      * @param id 巡检ID
      * @return 巡检
      */
@@ -22,7 +22,7 @@ public interface TPssrPatrolMapper
 
     /**
      * 查询巡检列表
-     * 
+     *
      * @param tPssrPatrol 巡检
      * @return 巡检集合
      */
@@ -31,7 +31,7 @@ public interface TPssrPatrolMapper
 
     /**
      * 新增巡检
-     * 
+     *
      * @param tPssrPatrol 巡检
      * @return 结果
      */
@@ -39,15 +39,17 @@ public interface TPssrPatrolMapper
 
     /**
      * 修改巡检
-     * 
+     *
      * @param tPssrPatrol 巡检
      * @return 结果
      */
     public int updateTPssrPatrol(TPssrPatrol tPssrPatrol);
+    public int updateTPssrPatrolByIds(TPssrPatrol tPssrPatrol);
+
 
     /**
      * 删除巡检
-     * 
+     *
      * @param id 巡检ID
      * @return 结果
      */
@@ -55,7 +57,7 @@ public interface TPssrPatrolMapper
 
     /**
      * 批量删除巡检
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 11 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrPowerMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrPower;
 
 /**
  * 临时电源Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-11-01
  */
-public interface TPssrPowerMapper 
+public interface TPssrPowerMapper
 {
     /**
      * 查询临时电源
-     * 
+     *
      * @param id 临时电源ID
      * @return 临时电源
      */
@@ -22,7 +22,7 @@ public interface TPssrPowerMapper
 
     /**
      * 查询临时电源列表
-     * 
+     *
      * @param tPssrPower 临时电源
      * @return 临时电源集合
      */
@@ -31,7 +31,7 @@ public interface TPssrPowerMapper
 
     /**
      * 新增临时电源
-     * 
+     *
      * @param tPssrPower 临时电源
      * @return 结果
      */
@@ -39,15 +39,18 @@ public interface TPssrPowerMapper
 
     /**
      * 修改临时电源
-     * 
+     *
      * @param tPssrPower 临时电源
      * @return 结果
      */
     public int updateTPssrPower(TPssrPower tPssrPower);
+    public int updateTPssrPowerByIds(TPssrPower tPssrPower);
+
+
 
     /**
      * 删除临时电源
-     * 
+     *
      * @param id 临时电源ID
      * @return 结果
      */
@@ -55,7 +58,7 @@ public interface TPssrPowerMapper
 
     /**
      * 批量删除临时电源
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 9 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrProgrammeMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrProgramme;
 
 /**
  * 开工方案Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrProgrammeMapper 
+public interface TPssrProgrammeMapper
 {
     /**
      * 查询开工方案
-     * 
+     *
      * @param id 开工方案ID
      * @return 开工方案
      */
@@ -22,7 +22,7 @@ public interface TPssrProgrammeMapper
 
     /**
      * 查询开工方案列表
-     * 
+     *
      * @param tPssrProgramme 开工方案
      * @return 开工方案集合
      */
@@ -31,7 +31,7 @@ public interface TPssrProgrammeMapper
 
     /**
      * 新增开工方案
-     * 
+     *
      * @param tPssrProgramme 开工方案
      * @return 结果
      */
@@ -39,15 +39,16 @@ public interface TPssrProgrammeMapper
 
     /**
      * 修改开工方案
-     * 
+     *
      * @param tPssrProgramme 开工方案
      * @return 结果
      */
     public int updateTPssrProgramme(TPssrProgramme tPssrProgramme);
+    public int updateTPssrProgrammeByIds(TPssrProgramme tPssrProgramme);
 
     /**
      * 删除开工方案
-     * 
+     *
      * @param id 开工方案ID
      * @return 结果
      */
@@ -55,7 +56,7 @@ public interface TPssrProgrammeMapper
 
     /**
      * 批量删除开工方案
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 11 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrProtectionMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrProtection;
 
 /**
  * 人身防护Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrProtectionMapper 
+public interface TPssrProtectionMapper
 {
     /**
      * 查询人身防护
-     * 
+     *
      * @param id 人身防护ID
      * @return 人身防护
      */
@@ -22,7 +22,7 @@ public interface TPssrProtectionMapper
 
     /**
      * 查询人身防护列表
-     * 
+     *
      * @param tPssrProtection 人身防护
      * @return 人身防护集合
      */
@@ -31,7 +31,7 @@ public interface TPssrProtectionMapper
 
     /**
      * 新增人身防护
-     * 
+     *
      * @param tPssrProtection 人身防护
      * @return 结果
      */
@@ -39,16 +39,19 @@ public interface TPssrProtectionMapper
 
     /**
      * 修改人身防护
-     * 
+     *
      * @param tPssrProtection 人身防护
      * @return 结果
      */
     public int updateTPssrProtection(TPssrProtection tPssrProtection);
+    public int updateTPssrProtectionByIds(TPssrProtection tPssrProtection);
+
+
     public int updateAllBySubId(TPssrProtection tPssrProtection);
 
     /**
      * 删除人身防护
-     * 
+     *
      * @param id 人身防护ID
      * @return 结果
      */
@@ -56,7 +59,7 @@ public interface TPssrProtectionMapper
 
     /**
      * 批量删除人身防护
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 9 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrPublicMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrPublic;
 
 /**
  * 公用工程Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrPublicMapper 
+public interface TPssrPublicMapper
 {
     /**
      * 查询公用工程
-     * 
+     *
      * @param id 公用工程ID
      * @return 公用工程
      */
@@ -22,7 +22,7 @@ public interface TPssrPublicMapper
 
     /**
      * 查询公用工程列表
-     * 
+     *
      * @param tPssrPublic 公用工程
      * @return 公用工程集合
      */
@@ -31,7 +31,7 @@ public interface TPssrPublicMapper
 
     /**
      * 新增公用工程
-     * 
+     *
      * @param tPssrPublic 公用工程
      * @return 结果
      */
@@ -39,15 +39,16 @@ public interface TPssrPublicMapper
 
     /**
      * 修改公用工程
-     * 
+     *
      * @param tPssrPublic 公用工程
      * @return 结果
      */
     public int updateTPssrPublic(TPssrPublic tPssrPublic);
+    public int updateTPssrPublicByIds(TPssrPublic tPssrPublic);
 
     /**
      * 删除公用工程
-     * 
+     *
      * @param id 公用工程ID
      * @return 结果
      */
@@ -55,7 +56,7 @@ public interface TPssrPublicMapper
 
     /**
      * 批量删除公用工程
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 11 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrPumpCleaningMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrPumpCleaning;
 
 /**
  * 机泵过滤器清理工作清单Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrPumpCleaningMapper 
+public interface TPssrPumpCleaningMapper
 {
     /**
      * 查询机泵过滤器清理工作清单
-     * 
+     *
      * @param id 机泵过滤器清理工作清单ID
      * @return 机泵过滤器清理工作清单
      */
@@ -22,7 +22,7 @@ public interface TPssrPumpCleaningMapper
 
     /**
      * 查询机泵过滤器清理工作清单列表
-     * 
+     *
      * @param tPssrPumpCleaning 机泵过滤器清理工作清单
      * @return 机泵过滤器清理工作清单集合
      */
@@ -31,7 +31,7 @@ public interface TPssrPumpCleaningMapper
 
     /**
      * 新增机泵过滤器清理工作清单
-     * 
+     *
      * @param tPssrPumpCleaning 机泵过滤器清理工作清单
      * @return 结果
      */
@@ -39,16 +39,19 @@ public interface TPssrPumpCleaningMapper
 
     /**
      * 修改机泵过滤器清理工作清单
-     * 
+     *
      * @param tPssrPumpCleaning 机泵过滤器清理工作清单
      * @return 结果
      */
     public int updateTPssrPumpCleaning(TPssrPumpCleaning tPssrPumpCleaning);
+    public int updateTPssrPumpCleaningByIds(TPssrPumpCleaning tPssrPumpCleaning);
+
+
     public int updateAllBySubId(TPssrPumpCleaning tPssrPumpCleaning);
 
     /**
      * 删除机泵过滤器清理工作清单
-     * 
+     *
      * @param id 机泵过滤器清理工作清单ID
      * @return 结果
      */
@@ -56,7 +59,7 @@ public interface TPssrPumpCleaningMapper
 
     /**
      * 批量删除机泵过滤器清理工作清单
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 11 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrPumpFillMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrPumpFill;
 
 /**
  * 机泵润滑油加注确认清单Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrPumpFillMapper 
+public interface TPssrPumpFillMapper
 {
     /**
      * 查询机泵润滑油加注确认清单
-     * 
+     *
      * @param id 机泵润滑油加注确认清单ID
      * @return 机泵润滑油加注确认清单
      */
@@ -22,7 +22,7 @@ public interface TPssrPumpFillMapper
 
     /**
      * 查询机泵润滑油加注确认清单列表
-     * 
+     *
      * @param tPssrPumpFill 机泵润滑油加注确认清单
      * @return 机泵润滑油加注确认清单集合
      */
@@ -31,7 +31,7 @@ public interface TPssrPumpFillMapper
 
     /**
      * 新增机泵润滑油加注确认清单
-     * 
+     *
      * @param tPssrPumpFill 机泵润滑油加注确认清单
      * @return 结果
      */
@@ -39,16 +39,19 @@ public interface TPssrPumpFillMapper
 
     /**
      * 修改机泵润滑油加注确认清单
-     * 
+     *
      * @param tPssrPumpFill 机泵润滑油加注确认清单
      * @return 结果
      */
     public int updateTPssrPumpFill(TPssrPumpFill tPssrPumpFill);
+    public int updateTPssrPumpFillByIds(TPssrPumpFill tPssrPumpFill);
+
+
     public int updateAllBySubId(TPssrPumpFill tPssrPumpFill);
 
     /**
      * 删除机泵润滑油加注确认清单
-     * 
+     *
      * @param id 机泵润滑油加注确认清单ID
      * @return 结果
      */
@@ -56,7 +59,7 @@ public interface TPssrPumpFillMapper
 
     /**
      * 批量删除机泵润滑油加注确认清单
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 11 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrPumpOverhaulMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrPumpOverhaul;
 
 /**
  * 机泵检修完成确认清单Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrPumpOverhaulMapper 
+public interface TPssrPumpOverhaulMapper
 {
     /**
      * 查询机泵检修完成确认清单
-     * 
+     *
      * @param id 机泵检修完成确认清单ID
      * @return 机泵检修完成确认清单
      */
@@ -22,7 +22,7 @@ public interface TPssrPumpOverhaulMapper
 
     /**
      * 查询机泵检修完成确认清单列表
-     * 
+     *
      * @param tPssrPumpOverhaul 机泵检修完成确认清单
      * @return 机泵检修完成确认清单集合
      */
@@ -31,7 +31,7 @@ public interface TPssrPumpOverhaulMapper
 
     /**
      * 新增机泵检修完成确认清单
-     * 
+     *
      * @param tPssrPumpOverhaul 机泵检修完成确认清单
      * @return 结果
      */
@@ -39,16 +39,19 @@ public interface TPssrPumpOverhaulMapper
 
     /**
      * 修改机泵检修完成确认清单
-     * 
+     *
      * @param tPssrPumpOverhaul 机泵检修完成确认清单
      * @return 结果
      */
     public int updateTPssrPumpOverhaul(TPssrPumpOverhaul tPssrPumpOverhaul);
+    public int updateTPssrPumpOverhaulByIds(TPssrPumpOverhaul tPssrPumpOverhaul);
+
+
     public int updateAllBySubId(TPssrPumpOverhaul tPssrPumpOverhaul);
 
     /**
      * 删除机泵检修完成确认清单
-     * 
+     *
      * @param id 机泵检修完成确认清单ID
      * @return 结果
      */
@@ -56,7 +59,7 @@ public interface TPssrPumpOverhaulMapper
 
     /**
      * 批量删除机泵检修完成确认清单
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 11 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrSafetyBleedMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrSafetyBleed;
 
 /**
  * 安全设施-紧急泄放阀Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrSafetyBleedMapper 
+public interface TPssrSafetyBleedMapper
 {
     /**
      * 查询安全设施-紧急泄放阀
-     * 
+     *
      * @param id 安全设施-紧急泄放阀ID
      * @return 安全设施-紧急泄放阀
      */
@@ -23,7 +23,7 @@ public interface TPssrSafetyBleedMapper
 
     /**
      * 查询安全设施-紧急泄放阀列表
-     * 
+     *
      * @param tPssrSafetyBleed 安全设施-紧急泄放阀
      * @return 安全设施-紧急泄放阀集合
      */
@@ -32,7 +32,7 @@ public interface TPssrSafetyBleedMapper
 
     /**
      * 新增安全设施-紧急泄放阀
-     * 
+     *
      * @param tPssrSafetyBleed 安全设施-紧急泄放阀
      * @return 结果
      */
@@ -40,16 +40,19 @@ public interface TPssrSafetyBleedMapper
 
     /**
      * 修改安全设施-紧急泄放阀
-     * 
+     *
      * @param tPssrSafetyBleed 安全设施-紧急泄放阀
      * @return 结果
      */
     public int updateTPssrSafetyBleed(TPssrSafetyBleed tPssrSafetyBleed);
+    public int updateTPssrSafetyBleedByIds(TPssrSafetyBleed tPssrSafetyBleed);
+
+
     public int updateAllBySubId(TPssrSafetyBleed tPssrSafetyBleed);
 
     /**
      * 删除安全设施-紧急泄放阀
-     * 
+     *
      * @param id 安全设施-紧急泄放阀ID
      * @return 结果
      */
@@ -57,7 +60,7 @@ public interface TPssrSafetyBleedMapper
 
     /**
      * 批量删除安全设施-紧急泄放阀
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 11 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrSafetyBreathMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrSafetyBreath;
 
 /**
  * 安全设施-呼吸阀Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrSafetyBreathMapper 
+public interface TPssrSafetyBreathMapper
 {
     /**
      * 查询安全设施-呼吸阀
-     * 
+     *
      * @param id 安全设施-呼吸阀ID
      * @return 安全设施-呼吸阀
      */
@@ -22,7 +22,7 @@ public interface TPssrSafetyBreathMapper
 
     /**
      * 查询安全设施-呼吸阀列表
-     * 
+     *
      * @param tPssrSafetyBreath 安全设施-呼吸阀
      * @return 安全设施-呼吸阀集合
      */
@@ -31,7 +31,7 @@ public interface TPssrSafetyBreathMapper
 
     /**
      * 新增安全设施-呼吸阀
-     * 
+     *
      * @param tPssrSafetyBreath 安全设施-呼吸阀
      * @return 结果
      */
@@ -39,16 +39,19 @@ public interface TPssrSafetyBreathMapper
 
     /**
      * 修改安全设施-呼吸阀
-     * 
+     *
      * @param tPssrSafetyBreath 安全设施-呼吸阀
      * @return 结果
      */
     public int updateTPssrSafetyBreath(TPssrSafetyBreath tPssrSafetyBreath);
+    public int updateTPssrSafetyBreathByIds(TPssrSafetyBreath tPssrSafetyBreath);
+
+
     public int updateAllBySubId(TPssrSafetyBreath tPssrSafetyBreath);
 
     /**
      * 删除安全设施-呼吸阀
-     * 
+     *
      * @param id 安全设施-呼吸阀ID
      * @return 结果
      */
@@ -56,7 +59,7 @@ public interface TPssrSafetyBreathMapper
 
     /**
      * 批量删除安全设施-呼吸阀
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 11 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrSafetyBrustMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrSafetyBrust;
 
 /**
  * 安全设施-爆破片Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrSafetyBrustMapper 
+public interface TPssrSafetyBrustMapper
 {
     /**
      * 查询安全设施-爆破片
-     * 
+     *
      * @param id 安全设施-爆破片ID
      * @return 安全设施-爆破片
      */
@@ -22,7 +22,7 @@ public interface TPssrSafetyBrustMapper
 
     /**
      * 查询安全设施-爆破片列表
-     * 
+     *
      * @param tPssrSafetyBrust 安全设施-爆破片
      * @return 安全设施-爆破片集合
      */
@@ -31,7 +31,7 @@ public interface TPssrSafetyBrustMapper
 
     /**
      * 新增安全设施-爆破片
-     * 
+     *
      * @param tPssrSafetyBrust 安全设施-爆破片
      * @return 结果
      */
@@ -39,16 +39,19 @@ public interface TPssrSafetyBrustMapper
 
     /**
      * 修改安全设施-爆破片
-     * 
+     *
      * @param tPssrSafetyBrust 安全设施-爆破片
      * @return 结果
      */
     public int updateTPssrSafetyBrust(TPssrSafetyBrust tPssrSafetyBrust);
+    public int updateTPssrSafetyBrustByIds(TPssrSafetyBrust tPssrSafetyBrust);
+
+
     public int updateAllBySubId(TPssrSafetyBrust tPssrSafetyBrust);
 
     /**
      * 删除安全设施-爆破片
-     * 
+     *
      * @param id 安全设施-爆破片ID
      * @return 结果
      */
@@ -56,7 +59,7 @@ public interface TPssrSafetyBrustMapper
 
     /**
      * 批量删除安全设施-爆破片
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 11 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrSafetyFlamearresterMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrSafetyFlamearrester;
 
 /**
  * 安全设施-阻火器Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrSafetyFlamearresterMapper 
+public interface TPssrSafetyFlamearresterMapper
 {
     /**
      * 查询安全设施-阻火器
-     * 
+     *
      * @param id 安全设施-阻火器ID
      * @return 安全设施-阻火器
      */
@@ -22,7 +22,7 @@ public interface TPssrSafetyFlamearresterMapper
 
     /**
      * 查询安全设施-阻火器列表
-     * 
+     *
      * @param tPssrSafetyFlamearrester 安全设施-阻火器
      * @return 安全设施-阻火器集合
      */
@@ -31,7 +31,7 @@ public interface TPssrSafetyFlamearresterMapper
 
     /**
      * 新增安全设施-阻火器
-     * 
+     *
      * @param tPssrSafetyFlamearrester 安全设施-阻火器
      * @return 结果
      */
@@ -39,16 +39,19 @@ public interface TPssrSafetyFlamearresterMapper
 
     /**
      * 修改安全设施-阻火器
-     * 
+     *
      * @param tPssrSafetyFlamearrester 安全设施-阻火器
      * @return 结果
      */
     public int updateTPssrSafetyFlamearrester(TPssrSafetyFlamearrester tPssrSafetyFlamearrester);
+    public int updateTPssrSafetyFlamearresterByIds(TPssrSafetyFlamearrester tPssrSafetyFlamearrester);
+
+
     public int updateAllBySubId(TPssrSafetyFlamearrester tPssrSafetyFlamearrester);
 
     /**
      * 删除安全设施-阻火器
-     * 
+     *
      * @param id 安全设施-阻火器ID
      * @return 结果
      */
@@ -56,7 +59,7 @@ public interface TPssrSafetyFlamearresterMapper
 
     /**
      * 批量删除安全设施-阻火器
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 10 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrSafetyValveMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrSafetyValve;
 
 /**
  * 安全设施-安全阀Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrSafetyValveMapper 
+public interface TPssrSafetyValveMapper
 {
     /**
      * 查询安全设施-安全阀
-     * 
+     *
      * @param id 安全设施-安全阀ID
      * @return 安全设施-安全阀
      */
@@ -22,7 +22,7 @@ public interface TPssrSafetyValveMapper
 
     /**
      * 查询安全设施-安全阀列表
-     * 
+     *
      * @param tPssrSafetyValve 安全设施-安全阀
      * @return 安全设施-安全阀集合
      */
@@ -31,7 +31,7 @@ public interface TPssrSafetyValveMapper
 
     /**
      * 新增安全设施-安全阀
-     * 
+     *
      * @param tPssrSafetyValve 安全设施-安全阀
      * @return 结果
      */
@@ -39,16 +39,18 @@ public interface TPssrSafetyValveMapper
 
     /**
      * 修改安全设施-安全阀
-     * 
+     *
      * @param tPssrSafetyValve 安全设施-安全阀
      * @return 结果
      */
     public int updateTPssrSafetyValve(TPssrSafetyValve tPssrSafetyValve);
+    public int updateTPssrSafetyValveByIds(TPssrSafetyValve tPssrSafetyValve);
+
     public int updateAllBySubId(TPssrSafetyValve tPssrSafetyValve);
 
     /**
      * 删除安全设施-安全阀
-     * 
+     *
      * @param id 安全设施-安全阀ID
      * @return 结果
      */
@@ -56,7 +58,7 @@ public interface TPssrSafetyValveMapper
 
     /**
      * 批量删除安全设施-安全阀
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 10 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrSubcontentMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 
 /**
  * 开车条件确认Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrSubcontentMapper 
+public interface TPssrSubcontentMapper
 {
     /**
      * 查询开车条件确认
-     * 
+     *
      * @param id 开车条件确认ID
      * @return 开车条件确认
      */
@@ -22,7 +22,7 @@ public interface TPssrSubcontentMapper
 
     /**
      * 查询开车条件确认列表
-     * 
+     *
      * @param tPssrSubcontent 开车条件确认
      * @return 开车条件确认集合
      */
@@ -32,7 +32,7 @@ public interface TPssrSubcontentMapper
 
     /**
      * 新增开车条件确认
-     * 
+     *
      * @param tPssrSubcontent 开车条件确认
      * @return 结果
      */
@@ -40,15 +40,17 @@ public interface TPssrSubcontentMapper
 
     /**
      * 修改开车条件确认
-     * 
+     *
      * @param tPssrSubcontent 开车条件确认
      * @return 结果
      */
     public int updateTPssrSubcontent(TPssrSubcontent tPssrSubcontent);
+    public int updateTPssrSubcontentByIds(TPssrSubcontent tPssrSubcontent);
+
 
     /**
      * 删除开车条件确认
-     * 
+     *
      * @param id 开车条件确认ID
      * @return 结果
      */
@@ -56,7 +58,7 @@ public interface TPssrSubcontentMapper
 
     /**
      * 批量删除开车条件确认
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 10 - 8
master/src/main/java/com/ruoyi/project/pssr/mapper/TPssrTorchvocMapper.java

@@ -6,15 +6,15 @@ import com.ruoyi.project.pssr.domain.TPssrTorchvoc;
 
 /**
  * 火炬,VOC系统Mapper接口
- * 
+ *
  * @author ssy
  * @date 2024-09-18
  */
-public interface TPssrTorchvocMapper 
+public interface TPssrTorchvocMapper
 {
     /**
      * 查询火炬,VOC系统
-     * 
+     *
      * @param id 火炬,VOC系统ID
      * @return 火炬,VOC系统
      */
@@ -22,7 +22,7 @@ public interface TPssrTorchvocMapper
 
     /**
      * 查询火炬,VOC系统列表
-     * 
+     *
      * @param tPssrTorchvoc 火炬,VOC系统
      * @return 火炬,VOC系统集合
      */
@@ -31,7 +31,7 @@ public interface TPssrTorchvocMapper
 
     /**
      * 新增火炬,VOC系统
-     * 
+     *
      * @param tPssrTorchvoc 火炬,VOC系统
      * @return 结果
      */
@@ -39,15 +39,17 @@ public interface TPssrTorchvocMapper
 
     /**
      * 修改火炬,VOC系统
-     * 
+     *
      * @param tPssrTorchvoc 火炬,VOC系统
      * @return 结果
      */
     public int updateTPssrTorchvoc(TPssrTorchvoc tPssrTorchvoc);
+    public int updateTPssrTorchvocByIds(TPssrTorchvoc tPssrTorchvoc);
+
 
     /**
      * 删除火炬,VOC系统
-     * 
+     *
      * @param id 火炬,VOC系统ID
      * @return 结果
      */
@@ -55,7 +57,7 @@ public interface TPssrTorchvocMapper
 
     /**
      * 批量删除火炬,VOC系统
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */

+ 9 - 0
master/src/main/java/com/ruoyi/project/sems/domain/TMeasureThickness.java

@@ -61,6 +61,7 @@ public class TMeasureThickness extends BaseEntity
     @Excel(name = "检测编号")
     private String measureNo;
 
+    private String loopNo;
     /** 设备/管线名称 */
     @Excel(name = "设备/管线名称")
     private String equipmentName;
@@ -714,6 +715,14 @@ public class TMeasureThickness extends BaseEntity
         this.isSend = isSend;
     }
 
+    public String getLoopNo() {
+        return loopNo;
+    }
+
+    public void setLoopNo(String loopNo) {
+        this.loopNo = loopNo;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

+ 24 - 6
master/src/main/resources/mybatis/pssr/TPssrAirtightMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrAirtightMapper">
-    
+
     <resultMap type="TPssrAirtight" id="TPssrAirtightResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrAirtightList" parameterType="TPssrAirtight" resultMap="TPssrAirtightResult">
         <include refid="selectTPssrAirtightVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
@@ -71,12 +71,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrAirtightById" parameterType="Long" resultMap="TPssrAirtightResult">
         <include refid="selectTPssrAirtightVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrAirtight" parameterType="TPssrAirtight">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_airtight.NEXTVAL as id FROM DUAL
@@ -166,6 +166,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrAirtightByIds" parameterType="TPssrAirtight">
+        update t_pssr_airtight
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirm1 != null">confirm1 = #{confirm1},</if>
+            <if test="confirm2 != null">confirm2 = #{confirm2},</if>
+            <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrAirtightById" parameterType="Long">
         update t_pssr_airtight set del_flag = 2 where id = #{id}
     </update>
@@ -176,5 +194,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 24 - 6
master/src/main/resources/mybatis/pssr/TPssrAnalyzerMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrAnalyzerMapper">
-    
+
     <resultMap type="TPssrAnalyzer" id="TPssrAnalyzerResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrAnalyzerList" parameterType="TPssrAnalyzer" resultMap="TPssrAnalyzerResult">
         <include refid="selectTPssrAnalyzerVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
@@ -63,12 +63,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrAnalyzerById" parameterType="Long" resultMap="TPssrAnalyzerResult">
         <include refid="selectTPssrAnalyzerVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrAnalyzer" parameterType="TPssrAnalyzer">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_analyzer.NEXTVAL as id FROM DUAL
@@ -146,6 +146,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrAnalyzerByIds" parameterType="TPssrAnalyzer">
+        update t_pssr_analyzer
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirm1 != null">confirm1 = #{confirm1},</if>
+            <if test="confirm2 != null">confirm2 = #{confirm2},</if>
+            <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrAnalyzerById" parameterType="Long">
         update t_pssr_analyzer set del_flag = 2 where id = #{id}
     </update>
@@ -156,5 +174,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 24 - 6
master/src/main/resources/mybatis/pssr/TPssrBlindMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrBlindMapper">
-    
+
     <resultMap type="TPssrBlind" id="TPssrBlindResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrBlindList" parameterType="TPssrBlind" resultMap="TPssrBlindResult">
         <include refid="selectTPssrBlindVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="unitNo != null  and unitNo != ''"> and unit_no = #{unitNo}</if>
@@ -114,12 +114,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrBlindById" parameterType="Long" resultMap="TPssrBlindResult">
         <include refid="selectTPssrBlindVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrBlind" parameterType="TPssrBlind">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_blind.NEXTVAL as id FROM DUAL
@@ -260,6 +260,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrBlindByIds" parameterType="TPssrBlind">
+        update t_pssr_blind
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="inConfirm1 != null">in_confirm1 = #{inConfirm1},</if>
+            <if test="inConfirm2 != null">in_confirm2 = #{inConfirm2},</if>
+            <if test="installDate != null">install_date = #{installDate},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrBlindById" parameterType="Long">
         update t_pssr_blind set del_flag = 2 where id = #{id}
     </update>
@@ -270,5 +288,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 24 - 6
master/src/main/resources/mybatis/pssr/TPssrCircuitMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrCircuitMapper">
-    
+
     <resultMap type="TPssrCircuit" id="TPssrCircuitResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrCircuitList" parameterType="TPssrCircuit" resultMap="TPssrCircuitResult">
         <include refid="selectTPssrCircuitVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
@@ -71,12 +71,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrCircuitById" parameterType="Long" resultMap="TPssrCircuitResult">
         <include refid="selectTPssrCircuitVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrCircuit" parameterType="TPssrCircuit">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_circuit.NEXTVAL as id FROM DUAL
@@ -166,6 +166,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrCircuitByIds" parameterType="TPssrCircuit">
+        update t_pssr_circuit
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirm1 != null">confirm1 = #{confirm1},</if>
+            <if test="confirm2 != null">confirm2 = #{confirm2},</if>
+            <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrCircuitById" parameterType="Long">
         update t_pssr_circuit set del_flag = 2 where id = #{id}
     </update>
@@ -176,5 +194,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 24 - 6
master/src/main/resources/mybatis/pssr/TPssrCleaningMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrCleaningMapper">
-    
+
     <resultMap type="TPssrCleaning" id="TPssrCleaningResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrCleaningList" parameterType="TPssrCleaning" resultMap="TPssrCleaningResult">
         <include refid="selectTPssrCleaningVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
@@ -61,12 +61,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrCleaningById" parameterType="Long" resultMap="TPssrCleaningResult">
         <include refid="selectTPssrCleaningVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrCleaning" parameterType="TPssrCleaning">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_cleaning.NEXTVAL as id FROM DUAL
@@ -141,6 +141,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrCleaningByIds" parameterType="TPssrCleaning">
+        update t_pssr_cleaning
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirm1 != null">confirm1 = #{confirm1},</if>
+            <if test="confirm2 != null">confirm2 = #{confirm2},</if>
+            <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrCleaningById" parameterType="Long">
         update t_pssr_cleaning set del_flag = 2 where id = #{id}
     </update>
@@ -151,5 +169,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 24 - 6
master/src/main/resources/mybatis/pssr/TPssrFrameMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrFrameMapper">
-    
+
     <resultMap type="TPssrFrame" id="TPssrFrameResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrFrameList" parameterType="TPssrFrame" resultMap="TPssrFrameResult">
         <include refid="selectTPssrFrameVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="region != null  and region != ''"> and region = #{region}</if>
@@ -107,12 +107,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrFrameById" parameterType="Long" resultMap="TPssrFrameResult">
         <include refid="selectTPssrFrameVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrFrame" parameterType="TPssrFrame">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_frame.NEXTVAL as id FROM DUAL
@@ -250,6 +250,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrFrameByIds" parameterType="TPssrFrame">
+        update t_pssr_frame
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirm1 != null">confirm1 = #{confirm1},</if>
+            <if test="confirm2 != null">confirm2 = #{confirm2},</if>
+            <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrFrameById" parameterType="Long">
         update t_pssr_frame set del_flag = 2 where id = #{id}
     </update>
@@ -260,5 +278,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 24 - 6
master/src/main/resources/mybatis/pssr/TPssrFranklinismMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrFranklinismMapper">
-    
+
     <resultMap type="TPssrFranklinism" id="TPssrFranklinismResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrFranklinismList" parameterType="TPssrFranklinism" resultMap="TPssrFranklinismResult">
         <include refid="selectTPssrFranklinismVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="checkContent != null  and checkContent != ''"> and check_content = #{checkContent}</if>
@@ -61,12 +61,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrFranklinismById" parameterType="Long" resultMap="TPssrFranklinismResult">
         <include refid="selectTPssrFranklinismVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrFranklinism" parameterType="TPssrFranklinism">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_franklinism.NEXTVAL as id FROM DUAL
@@ -141,6 +141,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrFranklinismByIds" parameterType="TPssrFranklinism">
+        update t_pssr_franklinism
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirm1 != null">confirm1 = #{confirm1},</if>
+            <if test="confirm2 != null">confirm2 = #{confirm2},</if>
+            <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrFranklinismById" parameterType="Long">
         update t_pssr_franklinism set del_flag = 2 where id = #{id}
     </update>
@@ -151,5 +169,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 24 - 6
master/src/main/resources/mybatis/pssr/TPssrGasdetectorMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrGasdetectorMapper">
-    
+
     <resultMap type="TPssrGasdetector" id="TPssrGasdetectorResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrGasdetectorList" parameterType="TPssrGasdetector" resultMap="TPssrGasdetectorResult">
         <include refid="selectTPssrGasdetectorVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="devNo != null  and devNo != ''"> and dev_no = #{devNo}</if>
@@ -63,12 +63,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrGasdetectorById" parameterType="Long" resultMap="TPssrGasdetectorResult">
         <include refid="selectTPssrGasdetectorVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrGasdetector" parameterType="TPssrGasdetector">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_gasdetector.NEXTVAL as id FROM DUAL
@@ -146,6 +146,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrGasdetectorByIds" parameterType="TPssrGasdetector">
+        update t_pssr_gasdetector
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirm1 != null">confirm1 = #{confirm1},</if>
+            <if test="confirm2 != null">confirm2 = #{confirm2},</if>
+            <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrGasdetectorById" parameterType="Long">
         update t_pssr_gasdetector set del_flag = 2 where id = #{id}
     </update>
@@ -156,5 +174,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 24 - 6
master/src/main/resources/mybatis/pssr/TPssrHygieneMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrHygieneMapper">
-    
+
     <resultMap type="TPssrHygiene" id="TPssrHygieneResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrHygieneList" parameterType="TPssrHygiene" resultMap="TPssrHygieneResult">
         <include refid="selectTPssrHygieneVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="checkContent != null  and checkContent != ''"> and check_content = #{checkContent}</if>
@@ -55,12 +55,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrHygieneById" parameterType="Long" resultMap="TPssrHygieneResult">
         <include refid="selectTPssrHygieneVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrHygiene" parameterType="TPssrHygiene">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_hygiene.NEXTVAL as id FROM DUAL
@@ -126,6 +126,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrHygieneByIds" parameterType="TPssrHygiene">
+        update t_pssr_hygiene
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirm1 != null">confirm1 = #{confirm1},</if>
+            <if test="confirm2 != null">confirm2 = #{confirm2},</if>
+            <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrHygieneById" parameterType="Long">
         update t_pssr_hygiene set del_flag = 2 where id = #{id}
     </update>
@@ -136,5 +154,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 24 - 6
master/src/main/resources/mybatis/pssr/TPssrInstrumentCalibrationMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrInstrumentCalibrationMapper">
-    
+
     <resultMap type="TPssrInstrumentCalibration" id="TPssrInstrumentCalibrationResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrInstrumentCalibrationList" parameterType="TPssrInstrumentCalibration" resultMap="TPssrInstrumentCalibrationResult">
         <include refid="selectTPssrInstrumentCalibrationVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
@@ -65,12 +65,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrInstrumentCalibrationById" parameterType="Long" resultMap="TPssrInstrumentCalibrationResult">
         <include refid="selectTPssrInstrumentCalibrationVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrInstrumentCalibration" parameterType="TPssrInstrumentCalibration">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_instrument_calibra.NEXTVAL as id FROM DUAL
@@ -151,6 +151,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrInstrumentCalibrationByIds" parameterType="TPssrInstrumentCalibration">
+        update t_pssr_instrument_calibration
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirm1 != null">confirm1 = #{confirm1},</if>
+            <if test="confirm2 != null">confirm2 = #{confirm2},</if>
+            <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrInstrumentCalibrationById" parameterType="Long">
         update t_pssr_instrument_calibration set del_flag = 2 where id = #{id}
     </update>
@@ -161,5 +179,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 24 - 6
master/src/main/resources/mybatis/pssr/TPssrLaboratoryMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrLaboratoryMapper">
-    
+
     <resultMap type="TPssrLaboratory" id="TPssrLaboratoryResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrLaboratoryList" parameterType="TPssrLaboratory" resultMap="TPssrLaboratoryResult">
         <include refid="selectTPssrLaboratoryVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="instrumentNumber != null  and instrumentNumber != ''"> and instrument_number = #{instrumentNumber}</if>
@@ -61,12 +61,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrLaboratoryById" parameterType="Long" resultMap="TPssrLaboratoryResult">
         <include refid="selectTPssrLaboratoryVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrLaboratory" parameterType="TPssrLaboratory">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_laboratory.NEXTVAL as id FROM DUAL
@@ -141,6 +141,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrLaboratoryByIds" parameterType="TPssrLaboratory">
+        update t_pssr_laboratory
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirm1 != null">confirm1 = #{confirm1},</if>
+            <if test="confirm2 != null">confirm2 = #{confirm2},</if>
+            <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrLaboratoryById" parameterType="Long">
         update t_pssr_laboratory set del_flag = 2 where id = #{id}
     </update>
@@ -151,5 +169,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 24 - 6
master/src/main/resources/mybatis/pssr/TPssrLightingMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrLightingMapper">
-    
+
     <resultMap type="TPssrLighting" id="TPssrLightingResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrLightingList" parameterType="TPssrLighting" resultMap="TPssrLightingResult">
         <include refid="selectTPssrLightingVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="checkContent != null  and checkContent != ''"> and check_content = #{checkContent}</if>
@@ -63,12 +63,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrLightingById" parameterType="Long" resultMap="TPssrLightingResult">
         <include refid="selectTPssrLightingVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrLighting" parameterType="TPssrLighting">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_lighting.NEXTVAL as id FROM DUAL
@@ -146,6 +146,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrLightingByIds" parameterType="TPssrLighting">
+        update t_pssr_lighting
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirm1 != null">confirm1 = #{confirm1},</if>
+            <if test="confirm2 != null">confirm2 = #{confirm2},</if>
+            <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrLightingById" parameterType="Long">
         update t_pssr_lighting set del_flag = 2 where id = #{id}
     </update>
@@ -156,5 +174,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 23 - 6
master/src/main/resources/mybatis/pssr/TPssrLockMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrLockMapper">
-    
+
     <resultMap type="TPssrLock" id="TPssrLockResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrLockList" parameterType="TPssrLock" resultMap="TPssrLockResult">
         <include refid="selectTPssrLockVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
@@ -85,12 +85,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrLockById" parameterType="Long" resultMap="TPssrLockResult">
         <include refid="selectTPssrLockVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrLock" parameterType="TPssrLock">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_lock.NEXTVAL as id FROM DUAL
@@ -201,6 +201,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrLockByIds" parameterType="TPssrLock">
+        update t_pssr_lock
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirm != null">confirm = #{confirm},</if>
+            <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrLockById" parameterType="Long">
         update t_pssr_lock set del_flag = 2 where id = #{id}
     </update>
@@ -211,5 +228,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 0 - 3
master/src/main/resources/mybatis/pssr/TPssrMaterialRawMapper.xml

@@ -166,14 +166,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="confirm1 != null">confirm1 = #{confirm1},</if>
             <if test="confirm2 != null">confirm2 = #{confirm2},</if>
             <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createrCode != null">creater_code = #{createrCode},</if>
             <if test="createdate != null">createdate = #{createdate},</if>
             <if test="updaterCode != null">updater_code = #{updaterCode},</if>
             <if test="updatedate != null">updatedate = #{updatedate},</if>
-            <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
-            <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">

+ 24 - 6
master/src/main/resources/mybatis/pssr/TPssrMocMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrMocMapper">
-    
+
     <resultMap type="TPssrMoc" id="TPssrMocResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrMocList" parameterType="TPssrMoc" resultMap="TPssrMocResult">
         <include refid="selectTPssrMocVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="region != null  and region != ''"> and region = #{region}</if>
@@ -63,12 +63,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrMocById" parameterType="Long" resultMap="TPssrMocResult">
         <include refid="selectTPssrMocVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrMoc" parameterType="TPssrMoc">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_moc.NEXTVAL as id FROM DUAL
@@ -146,6 +146,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrMocByIds" parameterType="TPssrMoc">
+        update t_pssr_moc
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirm1 != null">confirm1 = #{confirm1},</if>
+            <if test="confirm2 != null">confirm2 = #{confirm2},</if>
+            <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrMocById" parameterType="Long">
         update t_pssr_moc set del_flag = 2 where id = #{id}
     </update>
@@ -156,5 +174,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 24 - 6
master/src/main/resources/mybatis/pssr/TPssrMotorMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrMotorMapper">
-    
+
     <resultMap type="TPssrMotor" id="TPssrMotorResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrMotorList" parameterType="TPssrMotor" resultMap="TPssrMotorResult">
         <include refid="selectTPssrMotorVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
@@ -63,12 +63,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrMotorById" parameterType="Long" resultMap="TPssrMotorResult">
         <include refid="selectTPssrMotorVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrMotor" parameterType="TPssrMotor">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_motor.NEXTVAL as id FROM DUAL
@@ -146,6 +146,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrMotorByIds" parameterType="TPssrMotor">
+        update t_pssr_motor
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirm1 != null">confirm1 = #{confirm1},</if>
+            <if test="confirm2 != null">confirm2 = #{confirm2},</if>
+            <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrMotorById" parameterType="Long">
         update t_pssr_motor set del_flag = 2 where id = #{id}
     </update>
@@ -156,5 +174,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 24 - 6
master/src/main/resources/mybatis/pssr/TPssrNitrogenMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrNitrogenMapper">
-    
+
     <resultMap type="TPssrNitrogen" id="TPssrNitrogenResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrNitrogenList" parameterType="TPssrNitrogen" resultMap="TPssrNitrogenResult">
         <include refid="selectTPssrNitrogenVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="systemName != null  and systemName != ''"> and system_name like concat(concat('%', #{systemName}), '%')</if>
@@ -65,12 +65,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrNitrogenById" parameterType="Long" resultMap="TPssrNitrogenResult">
         <include refid="selectTPssrNitrogenVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrNitrogen" parameterType="TPssrNitrogen">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_nitrogen.NEXTVAL as id FROM DUAL
@@ -151,6 +151,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrNitrogenByIds" parameterType="TPssrNitrogen">
+        update t_pssr_nitrogen
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirm1 != null">confirm1 = #{confirm1},</if>
+            <if test="confirm2 != null">confirm2 = #{confirm2},</if>
+            <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrNitrogenById" parameterType="Long">
         update t_pssr_nitrogen set del_flag = 2 where id = #{id}
     </update>
@@ -161,5 +179,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 22 - 5
master/src/main/resources/mybatis/pssr/TPssrOverhaulExchangerMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrOverhaulExchangerMapper">
-    
+
     <resultMap type="TPssrOverhaulExchanger" id="TPssrOverhaulExchangerResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrOverhaulExchangerList" parameterType="TPssrOverhaulExchanger" resultMap="TPssrOverhaulExchangerResult">
         <include refid="selectTPssrOverhaulExchangerVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="devType != null "> and dev_type = #{devType}</if>
@@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrOverhaulExchangerById" parameterType="Long" resultMap="TPssrOverhaulExchangerResult">
         <include refid="selectTPssrOverhaulExchangerVo"/>
         where id = #{id}
@@ -161,6 +161,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrOverhaulExchangerByIds" parameterType="TPssrOverhaulExchanger">
+        update t_pssr_overhaul_exchanger
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="completionDate != null">completion_date = #{completionDate},</if>
+            <if test="confirmedPerson != null">confirmed_person = #{confirmedPerson},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrOverhaulExchangerById" parameterType="Long">
         update t_pssr_overhaul_exchanger set del_flag = 2 where id = #{id}
     </update>
@@ -171,5 +188,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 23 - 6
master/src/main/resources/mybatis/pssr/TPssrOverhaulFilterMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrOverhaulFilterMapper">
-    
+
     <resultMap type="TPssrOverhaulFilter" id="TPssrOverhaulFilterResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrOverhaulFilterList" parameterType="TPssrOverhaulFilter" resultMap="TPssrOverhaulFilterResult">
         <include refid="selectTPssrOverhaulFilterVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="plant != null  and plant != ''"> and plant = #{plant}</if>
@@ -61,12 +61,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrOverhaulFilterById" parameterType="Long" resultMap="TPssrOverhaulFilterResult">
         <include refid="selectTPssrOverhaulFilterVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrOverhaulFilter" parameterType="TPssrOverhaulFilter">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_overhaul_filter.NEXTVAL as id FROM DUAL
@@ -154,6 +154,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrOverhaulFilterByIds" parameterType="TPssrOverhaulFilter">
+        update t_pssr_overhaul_filter
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="completionDate != null">completion_date = #{completionDate},</if>
+            <if test="respPerson != null">resp_person = #{respPerson},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrOverhaulFilterById" parameterType="Long">
         update t_pssr_overhaul_filter set del_flag = 2 where id = #{id}
     </update>
@@ -164,5 +181,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 23 - 6
master/src/main/resources/mybatis/pssr/TPssrOverhaulPipeMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrOverhaulPipeMapper">
-    
+
     <resultMap type="TPssrOverhaulPipe" id="TPssrOverhaulPipeResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrOverhaulPipeList" parameterType="TPssrOverhaulPipe" resultMap="TPssrOverhaulPipeResult">
         <include refid="selectTPssrOverhaulPipeVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="pipelineNo != null  and pipelineNo != ''"> and pipeline_no = #{pipelineNo}</if>
@@ -53,12 +53,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrOverhaulPipeById" parameterType="Long" resultMap="TPssrOverhaulPipeResult">
         <include refid="selectTPssrOverhaulPipeVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrOverhaulPipe" parameterType="TPssrOverhaulPipe">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_overhaul_pipe.NEXTVAL as id FROM DUAL
@@ -134,6 +134,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrOverhaulPipeByIds" parameterType="TPssrOverhaulPipe">
+        update t_pssr_overhaul_pipe
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirmer != null">confirmer = #{confirmer},</if>
+            <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrOverhaulPipeById" parameterType="Long">
         update t_pssr_overhaul_pipe set del_flag = 2 where id = #{id}
     </update>
@@ -144,5 +161,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 23 - 6
master/src/main/resources/mybatis/pssr/TPssrOverhaulPumpMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrOverhaulPumpMapper">
-    
+
     <resultMap type="TPssrOverhaulPump" id="TPssrOverhaulPumpResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrOverhaulPumpList" parameterType="TPssrOverhaulPump" resultMap="TPssrOverhaulPumpResult">
         <include refid="selectTPssrOverhaulPumpVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="tagNo != null  and tagNo != ''"> and tag_no = #{tagNo}</if>
@@ -55,12 +55,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrOverhaulPumpById" parameterType="Long" resultMap="TPssrOverhaulPumpResult">
         <include refid="selectTPssrOverhaulPumpVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrOverhaulPump" parameterType="TPssrOverhaulPump">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_overhaul_pump.NEXTVAL as id FROM DUAL
@@ -139,6 +139,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrOverhaulPumpByIds" parameterType="TPssrOverhaulPump">
+        update t_pssr_overhaul_pump
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="completionDate != null">completion_date = #{completionDate},</if>
+            <if test="confirmedPerson != null">confirmed_person = #{confirmedPerson},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrOverhaulPumpById" parameterType="Long">
         update t_pssr_overhaul_pump set del_flag = 2 where id = #{id}
     </update>
@@ -149,5 +166,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 23 - 6
master/src/main/resources/mybatis/pssr/TPssrOverhaulTowerMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrOverhaulTowerMapper">
-    
+
     <resultMap type="TPssrOverhaulTower" id="TPssrOverhaulTowerResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrOverhaulTowerList" parameterType="TPssrOverhaulTower" resultMap="TPssrOverhaulTowerResult">
         <include refid="selectTPssrOverhaulTowerVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="tagNo != null  and tagNo != ''"> and tag_no = #{tagNo}</if>
@@ -55,12 +55,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrOverhaulTowerById" parameterType="Long" resultMap="TPssrOverhaulTowerResult">
         <include refid="selectTPssrOverhaulTowerVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrOverhaulTower" parameterType="TPssrOverhaulTower">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_overhaul_tower.NEXTVAL as id FROM DUAL
@@ -139,6 +139,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrOverhaulTowerByIds" parameterType="TPssrOverhaulTower">
+        update t_pssr_overhaul_tower
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="completionDate != null">completion_date = #{completionDate},</if>
+            <if test="confirmedPerson != null">confirmed_person = #{confirmedPerson},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrOverhaulTowerById" parameterType="Long">
         update t_pssr_overhaul_tower set del_flag = 2 where id = #{id}
     </update>
@@ -149,5 +166,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 23 - 6
master/src/main/resources/mybatis/pssr/TPssrOverhaulValveMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrOverhaulValveMapper">
-    
+
     <resultMap type="TPssrOverhaulValve" id="TPssrOverhaulValveResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrOverhaulValveList" parameterType="TPssrOverhaulValve" resultMap="TPssrOverhaulValveResult">
         <include refid="selectTPssrOverhaulValveVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="changeType != null  and changeType != ''"> and change_type = #{changeType}</if>
@@ -77,12 +77,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrOverhaulValveById" parameterType="Long" resultMap="TPssrOverhaulValveResult">
         <include refid="selectTPssrOverhaulValveVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrOverhaulValve" parameterType="TPssrOverhaulValve">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_overhaul_valve.NEXTVAL as id FROM DUAL
@@ -194,6 +194,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrOverhaulValveByIds" parameterType="TPssrOverhaulValve">
+        update t_pssr_overhaul_valve
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="doneDate != null">done_date = #{doneDate},</if>
+            <if test="identifyingPerson != null">identifying_person = #{identifyingPerson},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrOverhaulValveById" parameterType="Long">
         update t_pssr_overhaul_valve set del_flag = 2 where id = #{id}
     </update>
@@ -204,5 +221,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 23 - 6
master/src/main/resources/mybatis/pssr/TPssrPatrolMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrPatrolMapper">
-    
+
     <resultMap type="TPssrPatrol" id="TPssrPatrolResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrPatrolList" parameterType="TPssrPatrol" resultMap="TPssrPatrolResult">
         <include refid="selectTPssrPatrolVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="planId != null "> and plan_id = #{planId}</if>
@@ -53,12 +53,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrPatrolById" parameterType="Long" resultMap="TPssrPatrolResult">
         <include refid="selectTPssrPatrolVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrPatrol" parameterType="TPssrPatrol">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_patrol.NEXTVAL as id FROM DUAL
@@ -124,6 +124,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrPatrolByIds" parameterType="TPssrPatrol">
+        update t_pssr_patrol
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirmer != null">confirmer = #{confirmer},</if>
+            <if test="confirmDate != null">confirm_date = #{confirmDate},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrPatrolById" parameterType="Long">
         update t_pssr_patrol set del_flag = 2 where id = #{id}
     </update>
@@ -134,5 +151,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 24 - 6
master/src/main/resources/mybatis/pssr/TPssrPowerMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrPowerMapper">
-    
+
     <resultMap type="TPssrPower" id="TPssrPowerResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrPowerList" parameterType="TPssrPower" resultMap="TPssrPowerResult">
         <include refid="selectTPssrPowerVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="checkContent != null  and checkContent != ''"> and check_content = #{checkContent}</if>
@@ -55,12 +55,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrPowerById" parameterType="Long" resultMap="TPssrPowerResult">
         <include refid="selectTPssrPowerVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrPower" parameterType="TPssrPower">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_power.NEXTVAL as id FROM DUAL
@@ -126,6 +126,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrPowerByIds" parameterType="TPssrPower">
+        update t_pssr_power
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirm1 != null">confirm1 = #{confirm1},</if>
+            <if test="confirm2 != null">confirm2 = #{confirm2},</if>
+            <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrPowerById" parameterType="Long">
         update t_pssr_power set del_flag = 2 where id = #{id}
     </update>
@@ -136,5 +154,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 23 - 6
master/src/main/resources/mybatis/pssr/TPssrProgrammeMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrProgrammeMapper">
-    
+
     <resultMap type="TPssrProgramme" id="TPssrProgrammeResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrProgrammeList" parameterType="TPssrProgramme" resultMap="TPssrProgrammeResult">
         <include refid="selectTPssrProgrammeVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="trainingId != null "> and training_id = #{trainingId}</if>
@@ -63,12 +63,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrProgrammeById" parameterType="Long" resultMap="TPssrProgrammeResult">
         <include refid="selectTPssrProgrammeVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrProgramme" parameterType="TPssrProgramme">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_programme.NEXTVAL as id FROM DUAL
@@ -146,6 +146,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrProgrammeByIds" parameterType="TPssrProgramme">
+        update t_pssr_programme
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirm1 != null">confirm1 = #{confirm1},</if>
+            <if test="confirm2 != null">confirm2 = #{confirm2},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrProgrammeById" parameterType="Long">
         update t_pssr_programme set del_flag = 2 where id = #{id}
     </update>
@@ -156,5 +173,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 23 - 5
master/src/main/resources/mybatis/pssr/TPssrProtectionMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrProtectionMapper">
-    
+
     <resultMap type="TPssrProtection" id="TPssrProtectionResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrProtectionList" parameterType="TPssrProtection" resultMap="TPssrProtectionResult">
         <include refid="selectTPssrProtectionVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="checkContent != null  and checkContent != ''"> and check_content = #{checkContent}</if>
@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrProtectionById" parameterType="Long" resultMap="TPssrProtectionResult">
         <include refid="selectTPssrProtectionVo"/>
         where id = #{id}
@@ -141,6 +141,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrProtectionByIds" parameterType="TPssrProtection">
+        update t_pssr_protection
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirm1 != null">confirm1 = #{confirm1},</if>
+            <if test="confirm2 != null">confirm2 = #{confirm2},</if>
+            <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="updateAllBySubId" parameterType="TPssrProtection">
         update T_PSSR_PROTECTION
         <trim prefix="SET" suffixOverrides=",">
@@ -161,5 +179,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 24 - 6
master/src/main/resources/mybatis/pssr/TPssrPublicMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrPublicMapper">
-    
+
     <resultMap type="TPssrPublic" id="TPssrPublicResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrPublicList" parameterType="TPssrPublic" resultMap="TPssrPublicResult">
         <include refid="selectTPssrPublicVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="checkContent != null  and checkContent != ''"> and check_content = #{checkContent}</if>
@@ -57,12 +57,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrPublicById" parameterType="Long" resultMap="TPssrPublicResult">
         <include refid="selectTPssrPublicVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrPublic" parameterType="TPssrPublic">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_public.NEXTVAL as id FROM DUAL
@@ -131,6 +131,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrPublicByIds" parameterType="TPssrPublic">
+        update t_pssr_public
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirm1 != null">confirm1 = #{confirm1},</if>
+            <if test="confirm2 != null">confirm2 = #{confirm2},</if>
+            <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrPublicById" parameterType="Long">
         update t_pssr_public set del_flag = 2 where id = #{id}
     </update>
@@ -141,5 +159,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 24 - 6
master/src/main/resources/mybatis/pssr/TPssrPumpCleaningMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrPumpCleaningMapper">
-    
+
     <resultMap type="TPssrPumpCleaning" id="TPssrPumpCleaningResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrPumpCleaningList" parameterType="TPssrPumpCleaning" resultMap="TPssrPumpCleaningResult">
         <include refid="selectTPssrPumpCleaningVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
@@ -63,12 +63,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrPumpCleaningById" parameterType="Long" resultMap="TPssrPumpCleaningResult">
         <include refid="selectTPssrPumpCleaningVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrPumpCleaning" parameterType="TPssrPumpCleaning">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_pump_cleaning.NEXTVAL as id FROM DUAL
@@ -156,6 +156,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrPumpCleaningByIds" parameterType="TPssrPumpCleaning">
+        update t_pssr_pump_cleaning
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirmer1 != null">confirmer1 = #{confirmer1},</if>
+            <if test="confirmer2 != null">confirmer2 = #{confirmer2},</if>
+            <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrPumpCleaningById" parameterType="Long">
         update t_pssr_pump_cleaning set del_flag = 2 where id = #{id}
     </update>
@@ -166,5 +184,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 24 - 6
master/src/main/resources/mybatis/pssr/TPssrPumpFillMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrPumpFillMapper">
-    
+
     <resultMap type="TPssrPumpFill" id="TPssrPumpFillResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrPumpFillList" parameterType="TPssrPumpFill" resultMap="TPssrPumpFillResult">
         <include refid="selectTPssrPumpFillVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
@@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrPumpFillById" parameterType="Long" resultMap="TPssrPumpFillResult">
         <include refid="selectTPssrPumpFillVo"/>
         where id = #{id}
@@ -88,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-        
+
     <insert id="insertTPssrPumpFill" parameterType="TPssrPumpFill">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_pump_fill.NEXTVAL as id FROM DUAL
@@ -177,6 +177,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrPumpFillByIds" parameterType="TPssrPumpFill">
+        update t_pssr_pump_fill
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirmer1 != null">confirmer1 = #{confirmer1},</if>
+            <if test="confirmer2 != null">confirmer2 = #{confirmer2},</if>
+            <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrPumpFillById" parameterType="Long">
         update t_pssr_pump_fill set del_flag = 2 where id = #{id}
     </update>
@@ -187,5 +205,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 25 - 6
master/src/main/resources/mybatis/pssr/TPssrPumpOverhaulMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrPumpOverhaulMapper">
-    
+
     <resultMap type="TPssrPumpOverhaul" id="TPssrPumpOverhaulResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrPumpOverhaulList" parameterType="TPssrPumpOverhaul" resultMap="TPssrPumpOverhaulResult">
         <include refid="selectTPssrPumpOverhaulVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
@@ -59,12 +59,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrPumpOverhaulById" parameterType="Long" resultMap="TPssrPumpOverhaulResult">
         <include refid="selectTPssrPumpOverhaulVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrPumpOverhaul" parameterType="TPssrPumpOverhaul">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_pump_overhaul.NEXTVAL as id FROM DUAL
@@ -146,6 +146,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+
+    <update id="updateTPssrPumpOverhaulByIds" parameterType="TPssrPumpOverhaul">
+        update t_pssr_pump_overhaul
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirmer1 != null">confirmer1 = #{confirmer1},</if>
+            <if test="confirmer2 != null">confirmer2 = #{confirmer2},</if>
+            <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrPumpOverhaulById" parameterType="Long">
         update t_pssr_pump_overhaul set del_flag = 2 where id = #{id}
     </update>
@@ -156,5 +175,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 25 - 6
master/src/main/resources/mybatis/pssr/TPssrSafetyBleedMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrSafetyBleedMapper">
-    
+
     <resultMap type="TPssrSafetyBleed" id="TPssrSafetyBleedResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrSafetyBleedList" parameterType="TPssrSafetyBleed" resultMap="TPssrSafetyBleedResult">
         <include refid="selectTPssrSafetyBleedVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
@@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrSafetyBleedById" parameterType="Long" resultMap="TPssrSafetyBleedResult">
         <include refid="selectTPssrSafetyBleedVo"/>
         where id = #{id}
@@ -114,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where sub_id= #{subId} and APPROVE_STATUS=0
     </update>
-        
+
     <insert id="insertTPssrSafetyBleed" parameterType="TPssrSafetyBleed">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_safety_bleed.NEXTVAL as id FROM DUAL
@@ -204,6 +204,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+
+    <update id="updateTPssrSafetyBleedByIds" parameterType="TPssrSafetyBleed">
+        update t_pssr_safety_bleed
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirmer1 != null">confirmer1 = #{confirmer1},</if>
+            <if test="confirmer2 != null">confirmer2 = #{confirmer2},</if>
+            <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrSafetyBleedById" parameterType="Long">
         update t_pssr_safety_bleed set del_flag = 2 where id = #{id}
     </update>
@@ -214,5 +233,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 25 - 6
master/src/main/resources/mybatis/pssr/TPssrSafetyBreathMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrSafetyBreathMapper">
-    
+
     <resultMap type="TPssrSafetyBreath" id="TPssrSafetyBreathResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrSafetyBreathList" parameterType="TPssrSafetyBreath" resultMap="TPssrSafetyBreathResult">
         <include refid="selectTPssrSafetyBreathVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
@@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrSafetyBreathById" parameterType="Long" resultMap="TPssrSafetyBreathResult">
         <include refid="selectTPssrSafetyBreathVo"/>
         where id = #{id}
@@ -87,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where sub_id= #{subId} and APPROVE_STATUS=0
     </update>
-        
+
     <insert id="insertTPssrSafetyBreath" parameterType="TPssrSafetyBreath">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_safety_breath.NEXTVAL as id FROM DUAL
@@ -177,6 +177,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrSafetyBreathByIds" parameterType="TPssrSafetyBreath">
+        update t_pssr_safety_breath
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirmer1 != null">confirmer1 = #{confirmer1},</if>
+            <if test="confirmer2 != null">confirmer2 = #{confirmer2},</if>
+            <if test="confirmationTime != null">confirmation_time = #{confirmationTime},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+
     <update id="deleteTPssrSafetyBreathById" parameterType="Long">
         update t_pssr_safety_breath set del_flag = 2 where id = #{id}
     </update>
@@ -187,5 +206,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 24 - 6
master/src/main/resources/mybatis/pssr/TPssrSafetyBrustMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrSafetyBrustMapper">
-    
+
     <resultMap type="TPssrSafetyBrust" id="TPssrSafetyBrustResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrSafetyBrustList" parameterType="TPssrSafetyBrust" resultMap="TPssrSafetyBrustResult">
         <include refid="selectTPssrSafetyBrustVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
@@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrSafetyBrustById" parameterType="Long" resultMap="TPssrSafetyBrustResult">
         <include refid="selectTPssrSafetyBrustVo"/>
         where id = #{id}
@@ -87,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where sub_id= #{subId} and APPROVE_STATUS=0
     </update>
-        
+
     <insert id="insertTPssrSafetyBrust" parameterType="TPssrSafetyBrust">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_safety_brust.NEXTVAL as id FROM DUAL
@@ -177,6 +177,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrSafetyBrustByIds" parameterType="TPssrSafetyBrust">
+        update t_pssr_safety_brust
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirmer1 != null">confirmer1 = #{confirmer1},</if>
+            <if test="confirmer2 != null">confirmer2 = #{confirmer2},</if>
+            <if test="confirmationTime != null">confirmation_time = #{confirmationTime},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrSafetyBrustById" parameterType="Long">
         update t_pssr_safety_brust set del_flag = 2 where id = #{id}
     </update>
@@ -187,5 +205,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 26 - 6
master/src/main/resources/mybatis/pssr/TPssrSafetyFlamearresterMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrSafetyFlamearresterMapper">
-    
+
     <resultMap type="TPssrSafetyFlamearrester" id="TPssrSafetyFlamearresterResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrSafetyFlamearresterList" parameterType="TPssrSafetyFlamearrester" resultMap="TPssrSafetyFlamearresterResult">
         <include refid="selectTPssrSafetyFlamearresterVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
@@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrSafetyFlamearresterById" parameterType="Long" resultMap="TPssrSafetyFlamearresterResult">
         <include refid="selectTPssrSafetyFlamearresterVo"/>
         where id = #{id}
@@ -79,7 +79,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where sub_id= #{subId} and APPROVE_STATUS=0
     </update>
-        
+
+
+
     <insert id="insertTPssrSafetyFlamearrester" parameterType="TPssrSafetyFlamearrester">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_safety_flame.NEXTVAL as id FROM DUAL
@@ -157,6 +159,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrSafetyFlamearresterByIds" parameterType="TPssrSafetyFlamearrester">
+        update t_pssr_safety_flamearrester
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirmer1 != null">confirmer1 = #{confirmer1},</if>
+            <if test="confirmer2 != null">confirmer2 = #{confirmer2},</if>
+            <if test="confirmationTime != null">confirmation_time = #{confirmationTime},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrSafetyFlamearresterById" parameterType="Long">
         update t_pssr_safety_flamearrester set del_flag = 2 where id = #{id}
     </update>
@@ -167,5 +187,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 24 - 6
master/src/main/resources/mybatis/pssr/TPssrSafetyValveMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrSafetyValveMapper">
-    
+
     <resultMap type="TPssrSafetyValve" id="TPssrSafetyValveResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrSafetyValveList" parameterType="TPssrSafetyValve" resultMap="TPssrSafetyValveResult">
         <include refid="selectTPssrSafetyValveVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrSafetyValveById" parameterType="Long" resultMap="TPssrSafetyValveResult">
         <include refid="selectTPssrSafetyValveVo"/>
         where id = #{id}
@@ -89,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where sub_id= #{subId} and APPROVE_STATUS=0
     </update>
-        
+
     <insert id="insertTPssrSafetyValve" parameterType="TPssrSafetyValve">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_safety_valve.NEXTVAL as id FROM DUAL
@@ -182,6 +182,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrSafetyValveByIds" parameterType="TPssrSafetyValve">
+        update t_pssr_safety_valve
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirmer1 != null">confirmer1 = #{confirmer1},</if>
+            <if test="confirmer2 != null">confirmer2 = #{confirmer2},</if>
+            <if test="confirmationTime != null">confirmation_time = #{confirmationTime},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrSafetyValveById" parameterType="Long">
         update t_pssr_safety_valve set del_flag = 2 where id = #{id}
     </update>
@@ -192,5 +210,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 23 - 6
master/src/main/resources/mybatis/pssr/TPssrSubcontentMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrSubcontentMapper">
-    
+
     <resultMap type="TPssrSubcontent" id="TPssrSubcontentResult">
         <result property="id"    column="id"    />
         <result property="approveId"    column="approve_id"    />
@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrSubcontentList" parameterType="TPssrSubcontent" resultMap="TPssrSubcontentResult">
         <include refid="selectTPssrSubcontentVo"/>
-        <where>  
+        <where>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="aboveallId != null "> and aboveall_id = #{aboveallId}</if>
             <if test="serialNumber != null  and serialNumber != ''"> and serial_number = #{serialNumber}</if>
@@ -76,12 +76,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and d.del_flag = 0
         </where>
     </select>
-    
+
     <select id="selectTPssrSubcontentById" parameterType="Long" resultMap="TPssrSubcontentResult">
         <include refid="selectTPssrSubcontentVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrSubcontent" parameterType="TPssrSubcontent">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_subcontent.NEXTVAL as id FROM DUAL
@@ -162,6 +162,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrSubcontentByIds" parameterType="TPssrSubcontent">
+        update t_pssr_safety_valve
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirm != null">confirm = #{confirm},</if>
+            <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrSubcontentById" parameterType="Long">
         update t_pssr_subcontent set del_flag = 2 where id = #{id}
     </update>
@@ -172,5 +189,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 23 - 6
master/src/main/resources/mybatis/pssr/TPssrTorchvocMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrTorchvocMapper">
-    
+
     <resultMap type="TPssrTorchvoc" id="TPssrTorchvocResult">
         <result property="id"    column="id"    />
         <result property="subId"    column="sub_id"    />
@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrTorchvocList" parameterType="TPssrTorchvoc" resultMap="TPssrTorchvocResult">
         <include refid="selectTPssrTorchvocVo"/>
-        <where>  
+        <where>
             <if test="subId != null "> and sub_id = #{subId}</if>
             <if test="approveId != null "> and approve_id = #{approveId}</if>
             <if test="torchvocType != null  and torchvocType != ''"> and torchvoc_type = #{torchvocType}</if>
@@ -59,12 +59,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrTorchvocById" parameterType="Long" resultMap="TPssrTorchvocResult">
         <include refid="selectTPssrTorchvocVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrTorchvoc" parameterType="TPssrTorchvoc">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_torchvoc.NEXTVAL as id FROM DUAL
@@ -136,6 +136,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateTPssrTorchvocByIds" parameterType="TPssrTorchvoc">
+        update t_pssr_torchvoc
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="confirm != null">confirm = #{confirm},</if>
+            <if test="confirmationDate != null">confirmation_date = #{confirmationDate},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
     <update id="deleteTPssrTorchvocById" parameterType="Long">
         update t_pssr_torchvoc set del_flag = 2 where id = #{id}
     </update>
@@ -146,5 +163,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 6 - 6
master/src/main/resources/mybatis/pssr/TPssrVesselMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.pssr.mapper.TPssrVesselMapper">
-    
+
     <resultMap type="TPssrVessel" id="TPssrVesselResult">
         <result property="approveStatus"    column="approve_status"    />
         <result property="unit"    column="unit"    />
@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTPssrVesselList" parameterType="TPssrVessel" resultMap="TPssrVesselResult">
         <include refid="selectTPssrVesselVo"/>
-        <where>  
+        <where>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
             <if test="vesselName != null  and vesselName != ''"> and vessel_name like concat(concat('%', #{vesselName}), '%')</if>
@@ -63,12 +63,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScope}
     </select>
-    
+
     <select id="selectTPssrVesselById" parameterType="Long" resultMap="TPssrVesselResult">
         <include refid="selectTPssrVesselVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTPssrVessel" parameterType="TPssrVessel">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_pssr_vessel.NEXTVAL as id FROM DUAL
@@ -188,5 +188,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

+ 2 - 1
master/src/main/resources/mybatis/sems/TMeasureThicknessMapper.xml

@@ -50,10 +50,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="nextWarnDate"    column="next_warn_date"    />
         <result property="isSend"    column="is_send"    />
         <result property="deptName" column="dept_name" />
+        <result property="loopNo"    column="loop_no"    />
     </resultMap>
 
     <sql id="selectTMeasureThicknessVo">
-        select d.id,d.next_warn_date, d.plant_code, d.unit_code, d.tagno, d.status, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.position, d.recorder, d.recorder_date, d.equipment_name, d.material, d.cor_allowance, d.original_thickness, d.medium, d.pressure, d.specification, d.flow_rate, d.temperature, d.corrosion_type, d.inspection_method, d.photo, d.analysis, d.nominal_tickness, d.thickness_min, d.st_corrosion, d.lt_corrosion, d.est_remain, d.method_cause, d.effect_tracing, d.raiser, d.raiser_date, d.del_flag, d.location_url, d.analysis_url, d.measure_cycle, d.record_url, d.other_content ,d.measure_no, d.is_send,s.dept_name from t_measure_thickness d
+        select d.id,d.next_warn_date, d.plant_code, d.unit_code,d.loop_no, d.tagno, d.status, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.position, d.recorder, d.recorder_date, d.equipment_name, d.material, d.cor_allowance, d.original_thickness, d.medium, d.pressure, d.specification, d.flow_rate, d.temperature, d.corrosion_type, d.inspection_method, d.photo, d.analysis, d.nominal_tickness, d.thickness_min, d.st_corrosion, d.lt_corrosion, d.est_remain, d.method_cause, d.effect_tracing, d.raiser, d.raiser_date, d.del_flag, d.location_url, d.analysis_url, d.measure_cycle, d.record_url, d.other_content ,d.measure_no, d.is_send,s.dept_name from t_measure_thickness d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 

+ 3 - 3
master/src/main/resources/mybatis/system/SysUserMapper.xml

@@ -76,9 +76,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectUserByMgrRegion" parameterType="tStaffmgr" resultType="map">
 		SELECT
-		a.region,
-		listagg ( b.NICK_NAME, ',' ) within GROUP ( ORDER BY a.region ) nickName,
-		listagg ( b.user_id, ',' ) within GROUP ( ORDER BY a.region ) userId
+		a.region "REGION",
+		listagg ( b.NICK_NAME, ',' ) within GROUP ( ORDER BY a.region ) "NICKNAME",
+		listagg ( b.user_id, ',' ) within GROUP ( ORDER BY a.region ) "USERID"
 		FROM
 		T_STAFFMGR a
 		LEFT JOIN SYS_USER b ON a.STAFFID = b.STAFFID

+ 21 - 0
ui/src/views/sems/thickness/index.vue

@@ -19,6 +19,15 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item :label="$t('腐蚀回路图')" prop="loopNo">
+        <el-input
+          v-model="queryParams.loopNo"
+          :placeholder="$t('请输入') + $t('腐蚀回路图号')"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item :label="$t('单位内编号')" prop="tagno">
         <el-input
           v-model="queryParams.tagno"
@@ -220,6 +229,12 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="$t('装置名称')" align="center" prop="plantCode" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('单元名称')" align="center" prop="unitCode" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('腐蚀回路图号')" align="center" prop="loopNo" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <a style="color: #0000ff; text-decoration: underline;" :href="scope.row.loopNo"> {{ scope.row.loopNo }} </a>
+        </template>
+      </el-table-column>
+
       <el-table-column :label="$t('单位内编号')" align="center" prop="tagno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('状态')" align="center" prop="status" :formatter="statusFormat" />
       <el-table-column :label="$t('测厚部位CML')" align="center" prop="position" :show-overflow-tooltip="true"/>
@@ -253,6 +268,12 @@
         align="center"
         :label="$t('测厚周期(月)')">
       </el-table-column>
+      <el-table-column
+        prop="firstMeasureDate"
+        header-align="center"
+        align="center"
+        :label="$t('安装日期')">
+      </el-table-column>
       <el-table-column
         prop="firstMeasureDate"
         header-align="center"