From bd92c2ab5b7baee24cb8204a3856c9de188a4f97 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 25 Dec 2023 21:53:18 +0800
Subject: [PATCH] 区域查询修改，场所，房屋，住户，租赁，网格信息区域过滤，机构新增区域字段

---
 src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 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 a018fd9..f8cdc45 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
@@ -58,13 +58,15 @@
     <select id="selectHouseRentalPage" resultType="org.springblade.modules.house.vo.HouseRentalTenantVO">
         SELECT jhr.*,jda.address_name as houseName,b.tenantName,b.phone,
         concat(jh.district_name," ",jh.building," ",unit," ",room) as address,
-        case when TIMESTAMPDIFF( MONTH, jhr.rental_time, jhr.due_time )>= 8 then 1
+        case when TIMESTAMPDIFF( MONTH, jhr.rental_time, jhr.due_time )&gt;= 8 then 1
              when TIMESTAMPDIFF( MONTH, jhr.rental_time, jhr.due_time )&lt;4 then 3
              else 2 end as dldType,
         if(jhr.termination_time is null,if(date_format(jhr.due_time,'%Y-%m-%d') >= date_format(now(),'%Y-%m-%d'),0,1),2) as status
         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 (
@@ -91,6 +93,7 @@
             </if>
             <if test="vo.auditStatus ==20">
                 AND TIMESTAMPDIFF( day, now(), jhr.due_time )&lt;30
+                AND TIMESTAMPDIFF( day, now(), jhr.due_time )&gt;= 0
             </if>
             <if test="vo.auditStatus ==30">
                 AND date_format(jhr.due_time,'%Y-%m-%d')&lt; date_format(now(),'%Y-%m-%d')
@@ -110,7 +113,7 @@
         </if>
         <if test="vo.dldType != null">
             <if test="vo.dldType ==1 ">
-                AND TIMESTAMPDIFF( MONTH, jhr.rental_time, jhr.due_time )>= 8
+                AND TIMESTAMPDIFF( MONTH, jhr.rental_time, jhr.due_time )&gt;= 8
             </if>
             <if test="vo.dldType ==2 ">
                 AND  4 &lt;= TIMESTAMPDIFF( MONTH, jhr.rental_time, jhr.due_time )
@@ -120,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