From 774c8b2ee14eef5fd10bbd46d85a180e7b19ab21 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 22 Mar 2024 14:34:12 +0800
Subject: [PATCH] 查询过滤优化

---
 src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 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 ac7de1b..c92e61d 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
@@ -235,9 +239,20 @@
             <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">

--
Gitblit v1.9.3