From f37e7e5c00cb8196ff978f8eac2aab3fe9465b0d Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 03 Nov 2023 10:04:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 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 807cb03..55acd6b 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
@@ -39,12 +39,13 @@
<!--查询房屋出租情况-->
<select id="getHouseRentalListByCode" resultMap="houseRentalTenant">
select
- jhr.*,if(date_format(jhr.due_time,'%Y-%m-%d') >= date_format(now(),'%Y-%m-%d'),0,1) as status,
+ 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.*
from jczz_house_rental jhr
- left join jczz_house_tenant jht on jhr.id = jht.housing_rental_id
+ left join jczz_house_tenant jht on jhr.id = jht.housing_rental_id and jht.is_deleted = 0
where 1 = 1
- and jhr.is_deleted = 0 and jht.is_deleted = 0
+ and jhr.is_deleted = 0
and house_code = #{code}
</select>
--
Gitblit v1.9.3