提交代码

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GEmergencyRepair.java

@@ -23,6 +23,7 @@ public class GEmergencyRepair extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     private String processStatus;
+    private String houseHolds;
     private String processComments;
     /**
      * 主键id

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GEmergencyRepairBo.java

@@ -26,7 +26,9 @@ public class GEmergencyRepairBo extends BaseEntity {
 
     private List<String> photoList;
     private String processStatus;
+    private List<String> time;
     private String processComments;
+    private String houseHolds;
 
     /**
      * 主键id

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GEmergencyRepairVo.java

@@ -24,6 +24,7 @@ public class GEmergencyRepairVo {
 	private static final long serialVersionUID = 1L;
 
 	private String processStatus;
+	private String houseHolds;
 	private String processComments;
 //	private Long areaId;
 //	private String areaName;

ruoyi-gas/src/main/resources/mapper/GAreaMapper.xml

@@ -51,10 +51,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where del_flag = '0'
 
         <if test="name != null  and name != ''">
-            and name like '%' #{name} '%'
+            and name like CONCAT('%',#{name},'%')
         </if>
         <if test="userId != null and userId != ''">
-            and user_id like '%' #{userId} '%'
+            and user_id like CONCAT('%',#{userId},'%')
         </if>
 
     </select>

ruoyi-gas/src/main/resources/mapper/GEmergencyRepairMapper.xml

@@ -46,7 +46,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             a.del_flag = '0'
             <if test="p.repairName != null  and p.repairName != ''">
-                and a.repair_name = #{p.repairName}
+                and a.repair_name like CONCAT('%',#{p.repairName},'%')
+            </if>
+            <if test="p.enginName != null  and p.enginName != ''">
+                and a.engin_name like CONCAT('%',#{p.enginName},'%')
             </if>
             <if test="p.repairType != null  and p.repairType != ''">
                 and a.repair_type = #{p.repairType}
@@ -57,6 +60,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="p.pipelinePressure != null  and p.pipelinePressure != ''">
                 and a.pipeline_pressure = #{p.pipelinePressure}
             </if>
+            <if test="p.time != null  and p.time != ''">
+                and a.repair_time between #{p.time[0]} and #{p.time[1]}
+            </if>
         </where>
         ORDER BY a.create_time DESC
     </select>