From 21ad7244723fd12c4fe278e5d735051cf5b8a0b5 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 06 Nov 2023 16:38:01 +0800
Subject: [PATCH] 报事查询,报事数据统计接口

---
 src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml |    7 +++++--
 1 files changed, 5 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 f920577..55acd6b 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
@@ -40,10 +40,13 @@
     <select id="getHouseRentalListByCode" resultMap="houseRentalTenant">
         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.*
         from jczz_house_rental jhr
-        left join jczz_house_tenant jht on jhr.id = jht.housing_rental_id
-        where 1 = 1 and house_code = #{code}
+        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 house_code = #{code}
     </select>
 
 

--
Gitblit v1.9.3