From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/user/RentingAppointmentServiceDaoImplMapper.xml | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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 b0f5d45..cb86d47
--- a/java110-db/src/main/resources/mapper/user/RentingAppointmentServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/RentingAppointmentServiceDaoImplMapper.xml
@@ -8,20 +8,26 @@
<!-- 淇濆瓨绉熻祦棰勭害淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveRentingAppointmentInfo" parameterType="Map">
insert into renting_appointment(
- msg,tenant_tel,tenant_name,appointment_time,appointment_room_id,appointment_id,remark,state,tenant_sex,store_id,room_id
+ msg,tenant_tel,tenant_name,appointment_time,appointment_room_id,appointment_id,remark,state,tenant_sex,store_id,
+ room_id,renting_id
) values (
- #{msg},#{tenantTel},#{tenantName},#{appointmentTime},#{appointmentRoomId},#{appointmentId},#{remark},#{state},#{tenantSex},#{storeId},#{roomId}
+ #{msg},#{tenantTel},#{tenantName},#{appointmentTime},#{appointmentRoomId},#{appointmentId},#{remark},#{state},
+ #{tenantSex},#{storeId},#{roomId},#{rentingId}
)
</insert>
<!-- 鏌ヨ绉熻祦棰勭害淇℃伅 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
+ 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,rp.community_id appointmentCommunityId,rpr.community_id communityId,t.create_time
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}
@@ -103,6 +109,10 @@
<if test="roomId !=null and roomId != ''">
, t.room_id= #{roomId}
</if>
+ <if test="rentingId !=null and rentingId != ''">
+ ,t.renting_id= #{rentingId}
+ </if>
+
where 1=1
<if test="appointmentId !=null and appointmentId != ''">
and t.appointment_id= #{appointmentId}
--
Gitblit v1.8.0