Selaa lähdekoodia

项目电梯增加注册代码和维保工搜索,项目列表增加区域主管搜索

别傲 5 vuotta sitten
vanhempi
commit
87a7236b30

+ 2 - 0
lift-business-service/src/main/java/cn/com/ty/lift/business/library/dao/entity/model/request/LiftRequest.java

@@ -132,4 +132,6 @@ public class LiftRequest extends PageRequest {
      * 电梯类型
      */
     private Integer liftType;
+
+    private String condition;
 }

+ 4 - 0
lift-business-service/src/main/resources/mapper/lift/LiftMapper.xml

@@ -149,6 +149,10 @@
         <if test="request.projectId!=null and request.projectId!=''">
             AND plr.project_id = #{request.projectId,jdbcType=BIGINT}
         </if>
+        <if test="request.condition!=null and request.condition!=''">
+            AND (l.registration_code LIKE CONCAT('%',#{request.condition,jdbcType=VARCHAR},'%')
+            OR ui.name LIKE CONCAT('%',#{request.condition,jdbcType=VARCHAR},'%'))
+        </if>
     </select>
 
     <!-- 选择电梯 -->

+ 1 - 1
lift-business-service/src/main/resources/mapper/project/ProjectMapper.xml

@@ -99,7 +99,7 @@
 			AND (p.project_name LIKE CONCAT('%',#{request.condition,jdbcType=VARCHAR},'%')
 			OR p.project_code LIKE CONCAT('%',#{request.condition,jdbcType=VARCHAR},'%')
 			OR p.address LIKE CONCAT('%',#{request.condition,jdbcType=VARCHAR},'%')
-		    OR r.user_id LIKE CONCAT('%',#{request.condition,jdbcType=VARCHAR},'%'))
+		    OR ui.name LIKE CONCAT('%',#{request.condition,jdbcType=VARCHAR},'%'))
 		</if>
 		<if test="request.projectStatus!=null and request.projectStatus!=''">
 			AND p.project_status = #{request.projectStatus,jdbcType=VARCHAR}