From 2901ab60fac3b706fd7858374201087793dfde6c Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 06 Dec 2023 10:42:24 +0800
Subject: [PATCH] 租客表迁移到住户表
---
src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 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 a52d157..a149486 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
@@ -25,8 +25,8 @@
<resultMap id="houseRentalTenant" type="org.springblade.modules.house.vo.HouseRentalVO"
autoMapping="true">
<id property="id" column="id"/>
- <collection property="houseTenantVOList" javaType="java.util.List"
- ofType="org.springblade.modules.house.vo.HouseTenantVO" autoMapping="true">
+ <collection property="householdVOList" javaType="java.util.List"
+ ofType="org.springblade.modules.house.vo.HouseholdVO" autoMapping="true">
<id property="id" column="tenantId"/>
</collection>
</resultMap>
@@ -60,21 +60,23 @@
concat(jh.district_name," ",jh.building," ",unit," ",room) as address,
case when TIMESTAMPDIFF( MONTH, jhr.rental_time, jhr.due_time )>= 8 then 1
when TIMESTAMPDIFF( MONTH, jhr.rental_time, jhr.due_time )<4 then 3
- else 2 end as dldType
+ 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 (
- SELECT jht.housing_rental_id,jht.name as tenantName,jht.phone
- FROM jczz_house_tenant jht RIGHT JOIN (
+ SELECT jht.housing_rental_id,jht.name as tenantName,jht.phone_number as phone
+ FROM jczz_household jht RIGHT JOIN (
SELECT MAX(ID) as id,housing_rental_id
- FROM jczz_house_tenant
+ FROM jczz_household
WHERE is_deleted = 0
<if test="vo.tenantName != null and vo.tenantName != ''">
AND name LIKE CONCAT('%',#{vo.tenantName},'%')
</if>
+ and housing_rental_id is not null
GROUP BY housing_rental_id
- ) a ON a.id = jht.id
+ ) a ON a.id = jht.id and a.housing_rental_id is not null
) b ON b.housing_rental_id = jhr.id
WHERE jhr.is_deleted = 0
<if test="vo.auditStatus != null and vo.auditStatus != ''">
@@ -126,12 +128,13 @@
select
jhr.*,
if(termination_time is null,if(date_format(jhr.due_time,'%Y-%m-%d') >= date_format(now(),'%Y-%m-%d'),0,1),2) as status,
- jht.id as tenantId,jht.*
+ jht.id as tenantId,
+ jht.*
from jczz_house_rental jhr
- left join jczz_house_tenant jht on jhr.id = jht.housing_rental_id and jht.is_deleted = 0
+ left join jczz_household jht on jhr.id = jht.housing_rental_id and jht.is_deleted = 0
where 1 = 1
and jhr.is_deleted = 0
- and house_code = #{code}
+ and jhr.house_code = #{code}
</select>
<sql id="filterHouseGrid">
--
Gitblit v1.9.3