From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据，不设置网格信息

---
 src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml |   55 ++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 44 insertions(+), 11 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..efbea42 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,14 @@
     <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
+        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 (
             SELECT jht.housing_rental_id,jht.name as tenantName,jht.phone_number as phone
             FROM jczz_household jht RIGHT JOIN (
@@ -91,6 +92,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 +112,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,7 +122,24 @@
                 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="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>
         <include refid="filterHouseGrid"/>
+        order by jhr.create_time desc,jhr.id desc
     </select>
 
     <!--查询房屋出租情况-->
@@ -286,16 +305,30 @@
 
     <select id="getStatisticsCount" resultType="java.lang.Integer">
         SELECT
-            count(1)
+        count( 1 )
         FROM
-            jczz_grid_range jgr
+        jczz_house_rental jhr
+        LEFT JOIN jczz_doorplate_address jda ON jhr.house_code = jda.address_code
+        <where>
+            <if test="neiCode != null and neiCode != ''">
+                and jda.nei_code = #{neiCode}
+            </if>
+            <if test="userId != null">
+                AND jhr.house_code IN (
+                SELECT
+                jgr.house_code
+                FROM
+                jczz_grid_range jgr
                 LEFT JOIN jczz_grid jg ON jg.id = jgr.grid_id
-                LEFT JOIN jczz_gridman jgm on jg.id = jgm.grid_id
-                LEFT JOIN jczz_house_rental jhr on jhr.house_code=jgr.house_code
-        WHERE
-            jg.is_deleted = 0
-          and jhr.audit_status = 0
-          AND jgm.user_id = #{userId}
+                LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
+                WHERE
+                jg.is_deleted = 0
+                AND jgm.user_id = #{userId} )
+            </if>
+            and jhr.is_deleted = 0
+            and jhr.audit_status = 0
+        </where>
+
     </select>
 
 

--
Gitblit v1.9.3