From 5e014678ad6e5cf2be0bf40b08295518c67dcff8 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 26 Dec 2023 09:27:23 +0800
Subject: [PATCH] e呼即办街道社区数据过滤

---
 src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
index 9281865..f8cdc45 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
@@ -65,6 +65,8 @@
         FROM jczz_house_rental jhr
         JOIN jczz_doorplate_address jda ON jda.address_code = jhr.house_code
         JOIN jczz_house jh ON jh.house_code = jhr.house_code
+        LEFT JOIN jczz_grid_range jgr on jgr.house_code=jda.address_code
+        LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
         LEFT JOIN (
             SELECT jht.housing_rental_id,jht.name as tenantName,jht.phone_number as phone
             FROM jczz_household jht RIGHT JOIN (
@@ -121,6 +123,12 @@
                 AND TIMESTAMPDIFF( MONTH, jhr.rental_time, jhr.due_time )&lt;4
             </if>
         </if>
+        <if test="vo.startTime != null and vo.startTime != '' and vo.endTime != null and vo.endTime != '' ">
+            AND jhr.create_time BETWEEN #{vo.startTime} and #{vo.endTime}
+        </if>
+        <if test="vo.regionCode!=null and vo.regionCode!=''">
+            and jg.community_code like concat('%',#{vo.regionCode},'%')
+        </if>
         <include refid="filterHouseGrid"/>
     </select>
 

--
Gitblit v1.9.3