From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 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 be2c060..b11983c 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml
@@ -118,20 +118,24 @@
SELECT
jhr.*,
jh.address as houseName,
- b.tenantName,
br.town_name as townStreetName,
br.name as neiName,
- b.phone,
+ <if test="vo.tenantInfoFlag != null and vo.tenantInfoFlag != 0">
+ b.tenantName,
+ b.phone,
+ </if>
concat(jh.district_name," ",jh.building," ",unit," ",room) as address,
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
+ 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
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
+ <if test="vo.tenantInfoFlag != null and vo.tenantInfoFlag != 0">
LEFT JOIN (
SELECT jht.housing_rental_id,jht.name as tenantName,jht.phone_number as phone
FROM jczz_household jht RIGHT JOIN (
@@ -145,6 +149,7 @@
GROUP BY housing_rental_id
) a ON a.id = jht.id and a.housing_rental_id is not null
) b ON b.housing_rental_id = jhr.id
+ </if>
WHERE jhr.is_deleted = 0
<if test="vo.townStreetName!=null and vo.townStreetName!=''">
and br.town_name like concat('%',#{vo.townStreetName},'%')
@@ -157,6 +162,9 @@
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">
@@ -204,21 +212,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