Bladeren bron

PSSR添加模糊搜索

jiangbiao 6 maanden geleden
bovenliggende
commit
c70d6342f9
33 gewijzigde bestanden met toevoegingen van 90 en 10 verwijderingen
  1. 10 10
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAboveallController.java
  2. 9 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrOverhaulExchanger.java
  3. 23 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrOverhaulFilter.java
  4. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrOverhaulTower.java
  5. 10 0
      master/src/main/java/com/ruoyi/project/pssr/domain/TPssrOverhaulValve.java
  6. 1 0
      master/src/main/resources/mybatis/pssr/TPssrAirtightMapper.xml
  7. 1 0
      master/src/main/resources/mybatis/pssr/TPssrAnalyzerMapper.xml
  8. 1 0
      master/src/main/resources/mybatis/pssr/TPssrBlindMapper.xml
  9. 1 0
      master/src/main/resources/mybatis/pssr/TPssrCircuitMapper.xml
  10. 1 0
      master/src/main/resources/mybatis/pssr/TPssrCleaningMapper.xml
  11. 1 0
      master/src/main/resources/mybatis/pssr/TPssrFrameMapper.xml
  12. 1 0
      master/src/main/resources/mybatis/pssr/TPssrGasdetectorMapper.xml
  13. 1 0
      master/src/main/resources/mybatis/pssr/TPssrInstrumentCalibrationMapper.xml
  14. 1 0
      master/src/main/resources/mybatis/pssr/TPssrLaboratoryMapper.xml
  15. 1 0
      master/src/main/resources/mybatis/pssr/TPssrLockMapper.xml
  16. 1 0
      master/src/main/resources/mybatis/pssr/TPssrMeasureMapper.xml
  17. 1 0
      master/src/main/resources/mybatis/pssr/TPssrMocMapper.xml
  18. 1 0
      master/src/main/resources/mybatis/pssr/TPssrMotorMapper.xml
  19. 1 0
      master/src/main/resources/mybatis/pssr/TPssrNitrogenMapper.xml
  20. 1 0
      master/src/main/resources/mybatis/pssr/TPssrOverhaulExchangerMapper.xml
  21. 1 0
      master/src/main/resources/mybatis/pssr/TPssrOverhaulFilterMapper.xml
  22. 1 0
      master/src/main/resources/mybatis/pssr/TPssrOverhaulTowerMapper.xml
  23. 1 0
      master/src/main/resources/mybatis/pssr/TPssrOverhaulValveMapper.xml
  24. 1 0
      master/src/main/resources/mybatis/pssr/TPssrPipeMapper.xml
  25. 1 0
      master/src/main/resources/mybatis/pssr/TPssrPumpCleaningMapper.xml
  26. 1 0
      master/src/main/resources/mybatis/pssr/TPssrPumpFillMapper.xml
  27. 1 0
      master/src/main/resources/mybatis/pssr/TPssrPumpOverhaulMapper.xml
  28. 1 0
      master/src/main/resources/mybatis/pssr/TPssrSafetyBleedMapper.xml
  29. 1 0
      master/src/main/resources/mybatis/pssr/TPssrSafetyBreathMapper.xml
  30. 1 0
      master/src/main/resources/mybatis/pssr/TPssrSafetyBrustMapper.xml
  31. 1 0
      master/src/main/resources/mybatis/pssr/TPssrSafetyFlamearresterMapper.xml
  32. 1 0
      master/src/main/resources/mybatis/pssr/TPssrSafetyValveMapper.xml
  33. 1 0
      master/src/main/resources/mybatis/pssr/TPssrVesselMapper.xml

+ 10 - 10
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAboveallController.java

@@ -306,23 +306,23 @@ public class TPssrAboveallController extends BaseController {
         tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(3L, subId, "1", "公用工程(消防水、仪表风、氮气、电、中、低压蒸汽等)已投用或具备使用条件。", userId, new Date()));
         tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(4L, subId, "1", "火炬系统的所有仪表功能检查正常。", userId, new Date()));
         tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(5L, subId, "1", "火炬点火用燃料气已引到PCV-9994、PC-9991阀前。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(6L, subId, "1", "仪表空气送至PCV-9995阀前。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(6L, subId, "1", "仪表空气送至PCV-9995阀前。", userId, new Date()));
         tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(7L, subId, "1", "加热火炬气的甲醇已充进换热器390-E-903,390-E-903的低压蒸汽管线暖管结束。", userId, new Date()));
         tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(8L, subId, "1", "火炬总管分子封用氮已经投用。", userId, new Date()));
         tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(9L, subId, "1", "点火器装置和电视监控器等电器设备已送电,设备完好。", userId, new Date()));
         tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(10L, subId, "1", "火炬消烟蒸汽已引到蒸汽调节阀前,RO-9991~3的前后闸阀全开,管线上所有疏水器均须投用。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(11L, subId, "1", "由LV-9990向水封罐390-V-940注生产工艺水,直到工艺水由从U形管排出。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(12L, subId, "1", "设定390-P-940去急冷水塔的流程,投用390-P-940自启动及停车控制器UC-9990。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(13L, subId, "1", "投用各火炬总管端点的吹扫气。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(14L, subId, "1", "火炬长明灯点火完成,确认正常。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(15L, subId, "1", "火炬系统可以接收装置物料排放。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(11L, subId, "1", "由LV-9990向水封罐390-V-940注生产工艺水,直到工艺水由从U形管排出已完成。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(12L, subId, "1", "设定390-P-940去急冷水塔的流程,投用390-P-940自启动及停车控制器UC-9990。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(13L, subId, "1", "投用各火炬总管端点的吹扫气。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(14L, subId, "1", "火炬长明灯点火完成,确认正常。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(15L, subId, "1", "火炬系统可以接收装置物料排放。", userId, new Date()));
         tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(1L, subId, "2", "VOC系统检修时所加装的盲板已拆除。", userId, new Date()));
         tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(2L, subId, "2", "VOC系统已完成氮气置换,氧含量合格。", userId, new Date()));
         tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(3L, subId, "2", "公用工程(消防水、仪表风、氮气、电、中、低压蒸汽等)已投用或具备使用条件。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(4L, subId, "2", "VOC系统的所有仪表功能检查正常。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(5L, subId, "2", "VOC系统具备使用条件,开车流程打通,确认正常。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(6L, subId, "2", "按操作程序启动390-K-950,确认K950运行正常。", userId, new Date()));
-        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(7L, subId, "2", "VOC系统运行正常,可以接收VOC排放。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(4L, subId, "2", "VOC系统的所有仪表功能检查正常。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(5L, subId, "2", "VOC系统具备使用条件,开车流程打通,确认正常。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(6L, subId, "2", "按操作程序启动390-K-950,确认K950运行正常。", userId, new Date()));
+        tPssrTorchvocService.insertTPssrTorchvoc(new TPssrTorchvoc(7L, subId, "2", "VOC系统运行正常,可以接收VOC排放。", userId, new Date()));
     }
 
     /**

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

@@ -106,6 +106,15 @@ public class TPssrOverhaulExchanger extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    private String completionStatus;
+
+    public String getCompletionStatus() {
+        return completionStatus;
+    }
+
+    public void setCompletionStatus(String completionStatus) {
+        this.completionStatus = completionStatus;
+    }
 
     public String getReason() {
         return reason;

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

@@ -116,6 +116,29 @@ public class TPssrOverhaulFilter extends BaseEntity
     private List<TPssrFile> fileList;
 
     private String reason;
+    private String changeClean;
+
+    private String completionStatus;
+
+    public String getCompletionStatus() {
+        return completionStatus;
+    }
+
+    public void setCompletionStatus(String completionStatus) {
+        this.completionStatus = completionStatus;
+    }
+
+    public void setConfirmerName(String confirmerName) {
+        this.confirmerName = confirmerName;
+    }
+
+    public String getChangeClean() {
+        return changeClean;
+    }
+
+    public void setChangeClean(String changeClean) {
+        this.changeClean = changeClean;
+    }
 
     public String getReason() {
         return reason;

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

@@ -105,6 +105,16 @@ public class TPssrOverhaulTower extends BaseEntity
 
     private String reason;
 
+    private String completionStatus;
+
+    public String getCompletionStatus() {
+        return completionStatus;
+    }
+
+    public void setCompletionStatus(String completionStatus) {
+        this.completionStatus = completionStatus;
+    }
+
     public String getReason() {
         return reason;
     }

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

@@ -149,6 +149,16 @@ public class TPssrOverhaulValve extends BaseEntity
 
     private String reason;
 
+    private String completionStatus;
+
+    public String getCompletionStatus() {
+        return completionStatus;
+    }
+
+    public void setCompletionStatus(String completionStatus) {
+        this.completionStatus = completionStatus;
+    }
+
     public String getReason() {
         return reason;
     }

+ 1 - 0
master/src/main/resources/mybatis/pssr/TPssrAirtightMapper.xml

@@ -66,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="confirm1 != null  and confirm1 != ''"> and confirm1 = #{confirm1}</if>
             <if test="confirm2 != null  and confirm2 != ''"> and confirm2 = #{confirm2}</if>
+            <if test="searchValue != null "> and (system_name like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 1 - 0
master/src/main/resources/mybatis/pssr/TPssrAnalyzerMapper.xml

@@ -63,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="confirm1 != null  and confirm1 != ''"> and confirm1 = #{confirm1}</if>
             <if test="confirm2 != null  and confirm2 != ''"> and confirm2 = #{confirm2}</if>
+            <if test="searchValue != null "> and (dev_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 1 - 0
master/src/main/resources/mybatis/pssr/TPssrBlindMapper.xml

@@ -113,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="startupStatus != null "> and startup_status = #{startupStatus}</if>
             <if test="actualStatus != null "> and actual_status = #{actualStatus}</if>
             <if test="satisfy != null "> and satisfy = #{satisfy}</if>
+            <if test="searchValue != null "> and (pid_no like concat('%',concat(#{searchValue},'%')) or blind_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 1 - 0
master/src/main/resources/mybatis/pssr/TPssrCircuitMapper.xml

@@ -71,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+            <if test="searchValue != null "> and (pid_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 1 - 0
master/src/main/resources/mybatis/pssr/TPssrCleaningMapper.xml

@@ -61,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+            <if test="searchValue != null "> and (dev_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 1 - 0
master/src/main/resources/mybatis/pssr/TPssrFrameMapper.xml

@@ -106,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="confirm1 != null "> and confirm1 = #{confirm1}</if>
             <if test="confirm2 != null "> and confirm2 = #{confirm2}</if>
             <if test="examiner != null "> and examiner = #{examiner}</if>
+            <if test="searchValue != null "> and (dev_no like concat('%',concat(#{searchValue},'%')) or bracket_number like concat('%',concat(#{searchValue},'%')) or pipeline_number like concat('%',concat(#{searchValue},'%')) or )</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 1 - 0
master/src/main/resources/mybatis/pssr/TPssrGasdetectorMapper.xml

@@ -63,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="confirm1 != null  and confirm1 != ''"> and confirm1 = #{confirm1}</if>
             <if test="confirm2 != null  and confirm2 != ''"> and confirm2 = #{confirm2}</if>
+            <if test="searchValue != null "> and (dev_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 1 - 0
master/src/main/resources/mybatis/pssr/TPssrInstrumentCalibrationMapper.xml

@@ -65,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="confirm1 != null "> and confirm1 = #{confirm1}</if>
             <if test="confirm2 != null "> and confirm2 = #{confirm2}</if>
+            <if test="searchValue != null "> and (dev_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 1 - 0
master/src/main/resources/mybatis/pssr/TPssrLaboratoryMapper.xml

@@ -61,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+            <if test="searchValue != null "> and (instrument_number like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 1 - 0
master/src/main/resources/mybatis/pssr/TPssrLockMapper.xml

@@ -84,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="medium != null "> and medium = #{medium}</if>
             <if test="riskLevel != null "> and risk_level = #{riskLevel}</if>
             <if test="codeAccord != null "> and code_accord = #{codeAccord}</if>
+            <if test="searchValue != null "> and (pid_no like concat('%',concat(#{searchValue},'%')) or lock_code like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 1 - 0
master/src/main/resources/mybatis/pssr/TPssrMeasureMapper.xml

@@ -63,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="searchValue != null "> and (dev_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 1 - 0
master/src/main/resources/mybatis/pssr/TPssrMocMapper.xml

@@ -63,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+            <if test="searchValue != null "> and (moc_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 1 - 0
master/src/main/resources/mybatis/pssr/TPssrMotorMapper.xml

@@ -63,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="confirm1 != null  and confirm1 != ''"> and confirm1 = #{confirm1}</if>
             <if test="confirm2 != null  and confirm2 != ''"> and confirm2 = #{confirm2}</if>
+            <if test="searchValue != null "> and (dev_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 1 - 0
master/src/main/resources/mybatis/pssr/TPssrNitrogenMapper.xml

@@ -65,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="dewPoint != null "> and dew_point = #{dewPoint}</if>
             <if test="dewPointValue != null "> and dew_point_value = #{dewPointValue}</if>
+            <if test="searchValue != null "> and (system_name like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 1 - 0
master/src/main/resources/mybatis/pssr/TPssrOverhaulExchangerMapper.xml

@@ -61,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+            <if test="searchValue != null "> and (pid_no like concat('%',concat(#{searchValue},'%')) or tag_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 1 - 0
master/src/main/resources/mybatis/pssr/TPssrOverhaulFilterMapper.xml

@@ -56,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+            <if test="searchValue != null "> and (pid_no like concat('%',concat(#{searchValue},'%')) or iso_dwg_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 1 - 0
master/src/main/resources/mybatis/pssr/TPssrOverhaulTowerMapper.xml

@@ -50,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+            <if test="searchValue != null "> and (pid_no like concat('%',concat(#{searchValue},'%')) or tag_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 1 - 0
master/src/main/resources/mybatis/pssr/TPssrOverhaulValveMapper.xml

@@ -72,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+            <if test="searchValue != null "> and (pid_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 1 - 0
master/src/main/resources/mybatis/pssr/TPssrPipeMapper.xml

@@ -61,6 +61,7 @@
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+            <if test="searchValue != null "> and (pipeline_name like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 1 - 0
master/src/main/resources/mybatis/pssr/TPssrPumpCleaningMapper.xml

@@ -66,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+            <if test="searchValue != null "> and (position like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 1 - 0
master/src/main/resources/mybatis/pssr/TPssrPumpFillMapper.xml

@@ -58,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+            <if test="searchValue != null "> and (dev_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 1 - 0
master/src/main/resources/mybatis/pssr/TPssrPumpOverhaulMapper.xml

@@ -54,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+            <if test="searchValue != null "> and (dev_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 1 - 0
master/src/main/resources/mybatis/pssr/TPssrSafetyBleedMapper.xml

@@ -76,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="putUse != null "> and put_use = #{putUse}</if>
+            <if test="searchValue != null "> and (dev_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 1 - 0
master/src/main/resources/mybatis/pssr/TPssrSafetyBreathMapper.xml

@@ -66,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="putUse != null "> and put_use = #{putUse}</if>
+            <if test="searchValue != null "> and (pid_no like concat('%',concat(#{searchValue},'%')) or dev_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 1 - 0
master/src/main/resources/mybatis/pssr/TPssrSafetyBrustMapper.xml

@@ -66,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="putUse != null "> and put_use = #{putUse}</if>
+            <if test="searchValue != null "> and (dev_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 1 - 0
master/src/main/resources/mybatis/pssr/TPssrSafetyFlamearresterMapper.xml

@@ -58,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="putUse != null "> and put_use = #{putUse}</if>
+            <if test="searchValue != null "> and (dev_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

+ 1 - 0
master/src/main/resources/mybatis/pssr/TPssrSafetyValveMapper.xml

@@ -68,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="putUse != null "> and put_use = #{putUse}</if>
+            <if test="searchValue != null "> and (pid_no like concat('%',concat(#{searchValue},'%')) or dev_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->

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

@@ -62,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
+            <if test="searchValue != null "> and (vessel_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->