From cd0cc8910180826a92451c44a55c2799d7cdca81 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 10 Nov 2023 17:28:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml | 126 +++++++++++++++++++++++++----------------
1 files changed, 77 insertions(+), 49 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 11a8af9..c70c3f1 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
@@ -31,29 +31,55 @@
</collection>
</resultMap>
-
+ <!--自定义列表查询-->
<select id="selectHouseRentalPage" resultType="org.springblade.modules.house.vo.HouseRentalTenantVO">
SELECT jhr.*,jda.address_name as houseName,b.tenantName,b.phone
FROM jczz_house_rental jhr
- LEFT JOIN jczz_doorplate_address jda ON jda.address_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 MAX(ID) as id,housing_rental_id
- FROM jczz_house_tenant
- WHERE is_deleted = 0
- <if test="vo.tenantName != null and vo.tenantName != ''">
- AND name LIKE CONCAT('%',#{vo.tenantName},'%')
- </if>
- GROUP BY housing_rental_id
- ) a ON a.id = jht.id
+ LEFT JOIN jczz_doorplate_address jda ON jda.address_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 MAX(ID) as id,housing_rental_id
+ FROM jczz_house_tenant
+ WHERE is_deleted = 0
+ <if test="vo.tenantName != null and vo.tenantName != ''">
+ AND name LIKE CONCAT('%',#{vo.tenantName},'%')
+ </if>
+ GROUP BY housing_rental_id
+ ) a ON a.id = jht.id
) b ON b.housing_rental_id = jhr.id
WHERE jhr.is_deleted = 0
- <if test="vo.auditStatus != null and vo.auditStatus != '' or vo.auditStatus == 0 ">
- AND jhr.audit_status = #{vo.auditStatus}
+ <if test="vo.auditStatus != null and vo.auditStatus != ''">
+ <if test="vo.auditStatus ==0 || vo.auditStatus ==1">
+ AND jhr.audit_status = #{vo.auditStatus}
+ </if>
+ <if test="vo.auditStatus ==10">
+ AND date_format(jhr.due_time,'%Y-%m-%d')>= date_format(now(),'%Y-%m-%d')
+ </if>
+ <if test="vo.auditStatus ==20">
+ AND TIMESTAMPDIFF( day, now(), jhr.due_time )<30
+ </if>
+ <if test="vo.auditStatus ==30">
+ AND date_format(jhr.due_time,'%Y-%m-%d')< date_format(now(),'%Y-%m-%d')
+ </if>
</if>
<if test="vo.tenantName != null and vo.tenantName != ''">
AND b.tenantName LIKE CONCAT('%',#{vo.tenantName},'%')
+ </if>
+ <if test="vo.tenantName != null and vo.tenantName != ''">
+ AND b.tenantName LIKE CONCAT('%',#{vo.tenantName},'%')
+ </if>
+ <if test="vo.dldType != null">
+ <if test="vo.dldType ==1 ">
+ 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 )
+ AND TIMESTAMPDIFF( MONTH, jhr.rental_time, jhr.due_time )<=8
+ </if>
+ <if test="vo.dldType ==3 ">
+ AND TIMESTAMPDIFF( MONTH, jhr.rental_time, jhr.due_time )<4
+ </if>
</if>
</select>
@@ -72,46 +98,48 @@
<select id="getStatistics" resultType="org.springblade.modules.house.vo.HouseRentalStatistics">
SELECT
- 'longTerm' AS term,COUNT( 1 ) total,temp.personNum
- FROM(
- SELECT COUNT( 1 ) personNum
- FROM jczz_house_rental jhr
- LEFT JOIN jczz_house_tenant jht ON jht.housing_rental_id = jhr.id
- WHERE
- TIMESTAMPDIFF( MONTH, jhr.rental_time, jhr.due_time )>= 8
- AND jhr.is_deleted = 0 and jht.is_deleted = 0
- GROUP BY jht.housing_rental_id
- ) TEMP
- GROUP BY TEMP.personNum
+ 'longTerm' as term,count(1) total,ifnull(sum(num),0) as personNum
+ FROM jczz_house_rental jhr
+ LEFT JOIN
+ (
+ select housing_rental_id,count(*) num from jczz_house_tenant where is_deleted = 0 GROUP BY housing_rental_id
+ ) jht
+ ON jht.housing_rental_id = jhr.id
+ WHERE jhr.is_deleted = 0
+ AND TIMESTAMPDIFF( MONTH, jhr.rental_time, jhr.due_time )>= 8
+ <if test="vo.auditStatus != null and vo.auditStatus != '' or vo.auditStatus == 0 ">
+ AND jhr.audit_status = #{vo.auditStatus}
+ </if>
UNION ALL
- SELECT 'middleTerm' AS term,COUNT( 1 ) total, temp.personNum
- FROM(
- SELECT COUNT( 1 ) personNum
- FROM jczz_house_rental jhr
- LEFT JOIN jczz_house_tenant jht ON jht.housing_rental_id = jhr.id
- WHERE
- 4 <= TIMESTAMPDIFF( MONTH, rental_time, due_time )
- AND TIMESTAMPDIFF( MONTH, rental_time, due_time )<=8
- AND jhr.is_deleted = 0 and jht.is_deleted = 0
- GROUP BY jht.housing_rental_id
- ) TEMP
- GROUP BY TEMP.personNum
+ SELECT 'middleTerm' AS term,count(1) total,ifnull(sum(num),0) as personNum
+ FROM jczz_house_rental jhr
+ LEFT JOIN
+ (
+ select housing_rental_id,count(*) num from jczz_house_tenant where is_deleted = 0 GROUP BY housing_rental_id
+ ) jht
+ ON jht.housing_rental_id = jhr.id
+ WHERE jhr.is_deleted = 0
+ AND 4 <= TIMESTAMPDIFF( MONTH, rental_time, due_time ) AND TIMESTAMPDIFF( MONTH, rental_time, due_time )<=8
+ <if test="vo.auditStatus != null and vo.auditStatus != '' or vo.auditStatus == 0 ">
+ AND jhr.audit_status = #{vo.auditStatus}
+ </if>
UNION ALL
- SELECT 'shortTerm' AS term,COUNT( 1 ) total,temp.personNum
- FROM(
- SELECT COUNT( 1 ) personNum
- FROM jczz_house_rental jhr
- LEFT JOIN jczz_house_tenant jht ON jht.housing_rental_id = jhr.id
- WHERE
- TIMESTAMPDIFF( MONTH, rental_time, due_time )<4
- AND jhr.is_deleted = 0 and jht.is_deleted = 0
- GROUP BY jht.housing_rental_id
- ) TEMP
- GROUP BY TEMP.personNum
+ SELECT 'shortTerm' AS term,count(1) total,ifnull(sum(num),0) as personNum
+ FROM jczz_house_rental jhr
+ LEFT JOIN
+ (
+ select housing_rental_id,count(*) num from jczz_house_tenant where is_deleted = 0 GROUP BY housing_rental_id
+ ) jht
+ ON jht.housing_rental_id = jhr.id
+ WHERE jhr.is_deleted = 0
+ AND TIMESTAMPDIFF( MONTH, rental_time, due_time )<4
+ <if test="vo.auditStatus != null and vo.auditStatus != '' or vo.auditStatus == 0 ">
+ AND jhr.audit_status = #{vo.auditStatus}
+ </if>
</select>
--
Gitblit v1.9.3