From 02ee149247ca123ff4df76d439fa93d7ae764f1f Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 21 Jun 2024 16:54:27 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 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 9251d39..69d278e 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
@@ -119,6 +119,8 @@
jhr.*,
jh.address as houseName,
b.tenantName,
+ br.town_name as townStreetName,
+ br.name as neiName,
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
@@ -128,6 +130,7 @@
FROM jczz_house_rental jhr
JOIN jczz_house jh ON jh.house_code = jhr.house_code and jh.is_deleted = 0
LEFT JOIN jczz_grid jg on jg.grid_code = jh.grid_code and jg.is_deleted = 0
+ left join blade_region br on br.code = jg.community_code
LEFT JOIN jczz_police_affairs_grid jpag on jh.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
LEFT JOIN (
SELECT jht.housing_rental_id,jht.name as tenantName,jht.phone_number as phone
@@ -143,11 +146,20 @@
) 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.townStreetName!=null and vo.townStreetName!=''">
+ and br.town_name like concat('%',#{vo.townStreetName},'%')
+ </if>
+ <if test="vo.neiName!=null and vo.neiName!=''">
+ and br.name like concat('%',#{vo.neiName},'%')
+ </if>
<if test="vo.auditStatus != null and vo.auditStatus != ''">
<if test="vo.auditStatus ==1">
AND jhr.audit_status = 1
</if>
<if test="vo.auditStatus ==2">
+ AND jhr.audit_status = 0
+ </if>
+ <if test="vo.auditStatus ==0">
AND jhr.audit_status = 0
</if>
<if test="vo.auditStatus ==10">
@@ -195,21 +207,22 @@
<include refid="filterData"/>
- order by jhr.create_time desc,jhr.id desc
+ order by jhr.update_time desc
</select>
<!--查询房屋出租情况-->
<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.*
+ 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_household 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 jhr.house_code = #{code}
+ and jhr.is_deleted = 0
+ and jhr.house_code = #{code}
+ order by jhr.id desc
</select>
<sql id="filterHouseGrid">
--
Gitblit v1.9.3