From f075746fcd4be2b0c5322a5b9d7b5e81da8dcee8 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 20 Mar 2024 17:43:53 +0800
Subject: [PATCH] 租客管理查询

---
 src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml |   44 ++++++++++++++++++++++++--------------------
 1 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml
index 2112ee4..4ea3df1 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml
@@ -23,26 +23,29 @@
         left join blade_region br on br.code = jg.community_code
         <where>
             and jtrpa.is_deleted = 0
-            <if test="residen.id != null ">and id = #{residen.id}</if>
-            <if test="residen.name != null  and residen.name != ''">and name = #{residen.name}</if>
-            <if test="residen.phone != null  and residen.phone != ''">and phone = #{residen.phone}</if>
-            <if test="residen.idCard != null  and residen.idCard != ''">and id_card = #{residen.idCard}</if>
-            <if test="residen.address != null  and residen.address != ''">and address = #{residen.address}</if>
-            <if test="residen.houseCode != null  and residen.houseCode != ''">and house_code = #{residen.houseCode}</if>
-            <if test="residen.taskId != null ">and task_id = #{residen.taskId}</if>
-            <if test="residen.createTime != null ">and create_time = #{residen.createTime}</if>
-            <if test="residen.updateTime != null ">and update_time = #{residen.updateTime}</if>
-            <if test="residen.createUser != null ">and create_user = #{residen.createUser}</if>
-            <if test="residen.houseRentalId != null ">and house_rental_id = #{residen.houseRentalId}</if>
-            <if test="residen.isDeleted != null ">and is_deleted = #{residen.isDeleted}</if>
-            <if test="residen.remak != null  and residen.remak != ''">and remak = #{residen.remak}</if>
-            <if test="residen.gridCode != null  and residen.gridCode != ''"> and grid_code = #{residen.gridCode}</if>
-            <if test="residen.updateUser != null "> and update_user = #{residen.updateUser}</if>
-            <if test="residen.confirmUserId != null "> and confirm_user_id = #{residen.confirmUserId}</if>
-            <if test="residen.confirmTime != null "> and confirm_time = #{residen.confirmTime}</if>
-            <if test="residen.confirmFlag != null "> and confirm_flag = #{residen.confirmFlag}</if>
-            <if test="residen.confirmNotion != null  and residen.confirmNotion != ''"> and confirm_notion = #{residen.confirmNotion}</if>
-            <if test="residen.jwGridCode != null  and residen.jwGridCode != ''"> and jw_grid_code = #{residen.jwGridCode}</if>
+            <if test="residen.minors!=null and residen.minors ==2">
+                and TIMESTAMPDIFF(year, substring(jtrpa.id_card, 7, 8), now()) &lt; 18
+            </if>
+            <if test="residen.id != null ">and jtrpa.id = #{residen.id}</if>
+            <if test="residen.name != null  and residen.name != ''">and jtrpa.name like CONCAT('%',#{residen.name},'%')</if>
+            <if test="residen.phone != null  and residen.phone != ''">and jtrpa.phone like CONCAT('%',#{residen.phone},'%')</if>
+            <if test="residen.idCard != null  and residen.idCard != ''">and jtrpa.id_card like CONCAT('%',#{residen.idCard},'%')</if>
+            <if test="residen.address != null  and residen.address != ''">and jtrpa.address like CONCAT('%',#{residen.address},'%')</if>
+            <if test="residen.houseCode != null  and residen.houseCode != ''">and jtrpa.house_code = #{residen.houseCode}</if>
+            <if test="residen.taskId != null ">and jtrpa.task_id = #{residen.taskId}</if>
+            <if test="residen.createTime != null ">and jtrpa.create_time = #{residen.createTime}</if>
+            <if test="residen.updateTime != null ">and jtrpa.update_time = #{residen.updateTime}</if>
+            <if test="residen.createUser != null ">and jtrpa.create_user = #{residen.createUser}</if>
+            <if test="residen.houseRentalId != null ">and jtrpa.house_rental_id = #{residen.houseRentalId}</if>
+            <if test="residen.isDeleted != null ">and jtrpa.is_deleted = #{residen.isDeleted}</if>
+            <if test="residen.remak != null  and residen.remak != ''">and jtrpa.remak = #{residen.remak}</if>
+            <if test="residen.gridCode != null  and residen.gridCode != ''"> and jtrpa.grid_code = #{residen.gridCode}</if>
+            <if test="residen.updateUser != null "> and jtrpa.update_user = #{residen.updateUser}</if>
+            <if test="residen.confirmUserId != null "> and jtrpa.confirm_user_id = #{residen.confirmUserId}</if>
+            <if test="residen.confirmTime != null "> and jtrpa.confirm_time = #{residen.confirmTime}</if>
+            <if test="residen.confirmFlag != null "> and jtrpa.confirm_flag = #{residen.confirmFlag}</if>
+            <if test="residen.confirmNotion != null  and residen.confirmNotion != ''"> and jtrpa.confirm_notion = #{residen.confirmNotion}</if>
+            <if test="residen.jwGridCode != null  and residen.jwGridCode != ''"> and jtrpa.jw_grid_code = #{residen.jwGridCode}</if>
 
             <if test="isAdministrator==2">
                 <!-- 网格员及其他 -->
@@ -88,6 +91,7 @@
 
                 </if>
             </if>
+            order by jtrpa.create_time desc
         </where>
     </select>
 

--
Gitblit v1.9.3