From 9feb0f92711c426ca024ec2000e3fac15eff120b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 10 六月 2021 13:06:06 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/user/RentingAppointmentServiceDaoImplMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/RentingAppointmentServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/RentingAppointmentServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 377cd24..c442960
--- a/java110-db/src/main/resources/mapper/user/RentingAppointmentServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/RentingAppointmentServiceDaoImplMapper.xml
@@ -19,13 +19,15 @@
<!-- 鏌ヨ绉熻祦棰勭害淇℃伅 add by wuxw 2018-07-03 -->
<select id="getRentingAppointmentInfo" parameterType="Map" resultType="Map">
- select t.msg,t.tenant_tel,t.tenant_tel tenantTel,t.tenant_name,t.tenant_name
+ select DISTINCT t.msg,t.tenant_tel,t.tenant_tel tenantTel,t.tenant_name,t.tenant_name
tenantName,t.appointment_time,t.appointment_time appointmentTime,t.appointment_room_id,t.appointment_room_id
appointmentRoomId,t.appointment_id,t.appointment_id appointmentId,t.remark,t.status_cd,t.status_cd
statusCd,t.state,t.tenant_sex,t.tenant_sex tenantSex,t.store_id,t.store_id storeId,t.room_id,t.room_id roomId,
- td.`name` stateName,t.renting_id rentingId
+ td.`name` stateName,t.renting_id rentingId,rp.community_id appointmentCommunityId,rpr.community_id communityId
from renting_appointment t
LEFT JOIN t_dict td on t.state=td.status_cd and td.table_columns = 'state' and td.table_name = 'renting_appointment'
+ LEFT JOIN renting_pool rp on t.appointment_room_id = rp.room_id and rp.status_cd = '0'
+ left join renting_pool rpr on t.renting_id = rpr.renting_id and rpr.status_cd = '0'
where 1 =1
<if test="msg !=null and msg != ''">
and t.msg= #{msg}
--
Gitblit v1.8.0