From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml |   66 ++++++++++++++++++++++++--------
 1 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
index 0296e5e..2b2f3c3 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -192,6 +192,10 @@
         jhs.building,
         jhs.district_code aoiCode,
         jh.volunteer_org,
+        case
+        when TIMESTAMPDIFF(year, substring(jh.id_card, 7, 8), now()) &lt; 18 then 2
+        when TIMESTAMPDIFF(year, substring(jh.id_card, 7, 8), now()) &gt;= 18 then 1
+        end as minors,
         jhs.unit
         FROM
         jczz_household jh
@@ -200,20 +204,61 @@
         LEFT JOIN jczz_grid jg on jg.grid_code = jhs.grid_code and jg.is_deleted = 0
         LEFT JOIN jczz_police_affairs_grid jpag on jhs.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
         <where>
+            <if test="household.labelIdList !=null and household.labelIdList.size() >0 ">
+                EXISTS (
+                SELECT
+                *
+                FROM
+                jczz_user_house_label juhl
+                LEFT JOIN jczz_label jl ON juhl.label_id = jl.id
+                where  juhl.household_id = jh.id
+                and juhl.lable_type = 1
+                AND juhl.household_id IS NOT NULL
+                AND jl.id in
+                <foreach collection="household.labelIdList" item="code" open="(" close=")" separator=",">
+                    #{code}
+                </foreach>
+                )
+            </if>
             <if test="household.userId!=null">
                 AND jg.grid_code IN ( SELECT DISTINCT jgm.grid_code FROM jczz_gridman jgm WHERE jgm.user_id =
                 #{household.userId}
                 )
             </if>
+
+            <if test="household.searchKey!=null and household.searchKey!=''">
+                and CONCAT(jh.name,jh.phone_number) like CONCAT ('%', #{household.searchKey},'%')
+            </if>
+
             <if test="household.name!=null and household.name !=''">
                 and jh.name like concat('%',#{household.name},'%')
             </if>
-            <if test="volunteerOrg != null  and volunteerOrg != ''">
+            <if test="household.volunteerOrg != null  and household.volunteerOrg != ''">
                 and jh.volunteer_org  like concat('%',#{household.volunteerOrg},'%')
             </if>
             <if test="household.houseCode!=null and household.houseCode !=''">
                 and jh.house_code = #{household.houseCode}
             </if>
+
+            <if test="household.communityCode!=null and household.communityCode !=''">
+                and jg.community_code = #{household.communityCode}
+            </if>
+                <!-- 等于18 就是租户 -->
+            <if test="household.relationship!=null and household.relationship == 18">
+                and jh.relationship = #{household.relationship}
+
+                <if test="household.minors!=null and household.minors ==2">
+                    and TIMESTAMPDIFF(year, substring(jh.id_card, 7, 8), now()) &lt; 18
+                </if>
+                <if test="household.minors!=null and household.minors ==1">
+                    and TIMESTAMPDIFF(year, substring(jh.id_card, 7, 8), now()) &gt;= 18
+                </if>
+            </if>
+            <!-- 不等于18 就是非租户 -->
+            <if test="household.relationship!=null and household.relationship != 18">
+                and jh.relationship != #{household.relationship}
+            </if>
+
             <if test="household.phoneNumber!=null and household.phoneNumber !=''">
                 and jh.phone_number like concat('%',#{household.phoneNumber},'%')
             </if>
@@ -292,19 +337,6 @@
                     </otherwise>
                 </choose>
             </if>
-<!--            <if test="isAdministrator==2">-->
-<!--                <choose>-->
-<!--                    <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">-->
-<!--                        and jg.community_code in-->
-<!--                        <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">-->
-<!--                            #{code}-->
-<!--                        </foreach>-->
-<!--                    </when>-->
-<!--                    <otherwise>-->
-<!--                        and jg.community_code in ('')-->
-<!--                    </otherwise>-->
-<!--                </choose>-->
-<!--            </if>-->
             <if test="household.building!=null and household.building!=''">
                 and jhs.building like concat(#{household.building},'%')
             </if>
@@ -563,10 +595,10 @@
         LEFT JOIN jczz_grid jg on jg.grid_code = jhs.grid_code and jg.is_deleted = 0
         LEFT JOIN jczz_police_affairs_grid jpag on jhs.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
         <where>
-            <if test="household.neiCode != null and household.neiCode != ''">
-                and jda.nei_code = #{household.neiCode}
+            <if test="household.communityCode != null and household.communityCode != ''">
+                and jg.community_code = #{household.communityCode}
             </if>
-            <if test="household.confirmFlag != null and household.confirmFlag != ''">
+            <if test="household.confirmFlag != null">
                 and jh.confirm_flag =  #{household.confirmFlag}
             </if>
             <if test="isAdministrator==2">

--
Gitblit v1.9.3