From 91e2a286bb5b72172bb2e2d5f96be03439c51f72 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 08 Dec 2023 10:46:24 +0800
Subject: [PATCH] 驾驶舱代码
---
src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml | 5 +++--
1 files changed, 3 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 a018fd9..9281865 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
@@ -58,7 +58,7 @@
<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 )>= 8 then 1
when TIMESTAMPDIFF( MONTH, jhr.rental_time, jhr.due_time )<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
@@ -91,6 +91,7 @@
</if>
<if test="vo.auditStatus ==20">
AND TIMESTAMPDIFF( day, now(), jhr.due_time )<30
+ AND TIMESTAMPDIFF( day, now(), jhr.due_time )>= 0
</if>
<if test="vo.auditStatus ==30">
AND date_format(jhr.due_time,'%Y-%m-%d')< date_format(now(),'%Y-%m-%d')
@@ -110,7 +111,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 )>= 8
</if>
<if test="vo.dldType ==2 ">
AND 4 <= TIMESTAMPDIFF( MONTH, jhr.rental_time, jhr.due_time )
--
Gitblit v1.9.3