From d54b03d01788503c4acfb78b3c291d489319ddc3 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 20 Mar 2024 12:52:41 +0800
Subject: [PATCH] 出租屋查询数量修改（数据过滤）

---
 src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 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 273e3be..3fedb27 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
@@ -237,13 +237,15 @@
         GROUP BY housing_rental_id
         ) jht
         ON jht.housing_rental_id = jhr.id
-        LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jhr.house_code
+        JOIN jczz_house jh ON jh.house_code = jhr.house_code and jh.is_deleted = 0
+        LEFT JOIN jczz_grid jg on jg.grid_code = jh.grid_code and jg.is_deleted = 0
+        LEFT JOIN jczz_police_affairs_grid jpag on jh.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
         WHERE jhr.is_deleted = 0
         AND TIMESTAMPDIFF( MONTH, jhr.rental_time, jhr.due_time )>= 8
         <if test="vo.auditStatus != null and vo.auditStatus != '' or vo.auditStatus == 0 ">
             AND jhr.audit_status = #{vo.auditStatus}
         </if>
-        <include refid="filterHouseGrid"/>
+        <include refid="filterData"/>
 
         UNION ALL
 
@@ -256,13 +258,15 @@
         GROUP BY housing_rental_id
         ) jht
         ON jht.housing_rental_id = jhr.id
-        LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jhr.house_code
+        JOIN jczz_house jh ON jh.house_code = jhr.house_code and jh.is_deleted = 0
+        LEFT JOIN jczz_grid jg on jg.grid_code = jh.grid_code and jg.is_deleted = 0
+        LEFT JOIN jczz_police_affairs_grid jpag on jh.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
         WHERE jhr.is_deleted = 0
         AND 4 &lt;= TIMESTAMPDIFF( MONTH, rental_time, due_time ) AND TIMESTAMPDIFF( MONTH, rental_time, due_time )&lt;=8
         <if test="vo.auditStatus != null and vo.auditStatus != '' or vo.auditStatus == 0 ">
             AND jhr.audit_status = #{vo.auditStatus}
         </if>
-        <include refid="filterHouseGrid"/>
+        <include refid="filterData"/>
 
         UNION ALL
 
@@ -275,13 +279,15 @@
         GROUP BY housing_rental_id
         ) jht
         ON jht.housing_rental_id = jhr.id
-        LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jhr.house_code
+        JOIN jczz_house jh ON jh.house_code = jhr.house_code and jh.is_deleted = 0
+        LEFT JOIN jczz_grid jg on jg.grid_code = jh.grid_code and jg.is_deleted = 0
+        LEFT JOIN jczz_police_affairs_grid jpag on jh.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
         WHERE jhr.is_deleted = 0
         AND TIMESTAMPDIFF( MONTH, rental_time, due_time )&lt;4
         <if test="vo.auditStatus != null and vo.auditStatus != '' or vo.auditStatus == 0 ">
-                AND jhr.audit_status  = #{vo.auditStatus}
-            </if>
-            <include refid="filterHouseGrid"/>
+            AND jhr.audit_status  = #{vo.auditStatus}
+        </if>
+        <include refid="filterData"/>
     </select>
 
     <!--导出租赁信息-->

--
Gitblit v1.9.3