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/community/CommunitySpaceConfirmOrderV1ServiceDaoImplMapper.xml | 195 +++++++++++++++++++++++++++---------------------
1 files changed, 109 insertions(+), 86 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/CommunitySpaceConfirmOrderV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/CommunitySpaceConfirmOrderV1ServiceDaoImplMapper.xml
index 123bfeb..7872029 100644
--- a/java110-db/src/main/resources/mapper/community/CommunitySpaceConfirmOrderV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/CommunitySpaceConfirmOrderV1ServiceDaoImplMapper.xml
@@ -5,111 +5,134 @@
<mapper namespace="communitySpaceConfirmOrderV1ServiceDaoImpl">
-
-
-
<!-- 淇濆瓨鍦哄湴棰勭害鏍搁攢淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveCommunitySpaceConfirmOrderInfo" parameterType="Map">
insert into community_space_confirm_order(
-space_id,csp_id,time_id,order_id,remark,community_id
-) values (
-#{spaceId},#{cspId},#{timeId},#{orderId},#{remark},#{communityId}
-)
+ space_id,csp_id,time_id,order_id,remark,community_id
+ ) values (
+ #{spaceId},#{cspId},#{timeId},#{orderId},#{remark},#{communityId}
+ )
</insert>
-
<!-- 鏌ヨ鍦哄湴棰勭害鏍搁攢淇℃伅 add by wuxw 2018-07-03 -->
<select id="getCommunitySpaceConfirmOrderInfo" parameterType="Map" resultType="Map">
- select t.space_id,t.space_id spaceId,t.csp_id,t.csp_id cspId,t.time_id,t.time_id timeId,t.order_id,t.order_id orderId,t.remark,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId
-from community_space_confirm_order t
-where 1 =1
-<if test="spaceId !=null and spaceId != ''">
- and t.space_id= #{spaceId}
-</if>
-<if test="cspId !=null and cspId != ''">
- and t.csp_id= #{cspId}
-</if>
-<if test="timeId !=null and timeId != ''">
- and t.time_id= #{timeId}
-</if>
-<if test="orderId !=null and orderId != ''">
- and t.order_id= #{orderId}
-</if>
-<if test="remark !=null and remark != ''">
- and t.remark= #{remark}
-</if>
-<if test="statusCd !=null and statusCd != ''">
- and t.status_cd= #{statusCd}
-</if>
-<if test="communityId !=null and communityId != ''">
- and t.community_id= #{communityId}
-</if>
-order by t.create_time desc
-<if test="page != -1 and page != null ">
- limit #{page}, #{row}
-</if>
+ select t.space_id,t.space_id spaceId,t.csp_id,t.csp_id cspId,t.time_id,t.time_id timeId,t.order_id,t.order_id
+ orderId,t.remark,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,
+ cs.name spaceName,csp.person_name personName,csp.person_tel personTel,csp.appointment_time appointmentTime,
+ cspt.hours,t.create_time createTime,cv.`name` venueName
+ from community_space_confirm_order t
+ left join community_space_person_time cspt on t.time_id = cspt.time_id and cspt.status_cd = '0'
+ left join community_space_person csp on t.csp_id = csp.csp_id and csp.status_cd = '0'
+ left join community_space cs on csp.space_id = cs.space_id and cs.status_cd = '0'
+ left join community_venue cv on cs.venue_id = cv.venue_id and cv.status_cd = '0'
+ where 1 =1
+ <if test="personName !=null and personName != ''">
+ and csp.person_name like concat('%',#{personName},'%')
+ </if>
+ <if test="personTel !=null and personTel != ''">
+ and csp.person_tel = #{personTel}
+ </if>
+ <if test="appointmentTime !=null and appointmentTime != ''">
+ and csp.appointment_time = #{appointmentTime}
+ </if>
+ <if test="spaceId !=null and spaceId != ''">
+ and t.space_id= #{spaceId}
+ </if>
+ <if test="cspId !=null and cspId != ''">
+ and t.csp_id= #{cspId}
+ </if>
+ <if test="timeId !=null and timeId != ''">
+ and t.time_id= #{timeId}
+ </if>
+ <if test="orderId !=null and orderId != ''">
+ and t.order_id= #{orderId}
+ </if>
+ <if test="remark !=null and remark != ''">
+ and t.remark= #{remark}
+ </if>
+ <if test="statusCd !=null and statusCd != ''">
+ and t.status_cd= #{statusCd}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ order by t.create_time desc
+ <if test="page != -1 and page != null ">
+ limit #{page}, #{row}
+ </if>
</select>
-
-
<!-- 淇敼鍦哄湴棰勭害鏍搁攢淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateCommunitySpaceConfirmOrderInfo" parameterType="Map">
- update community_space_confirm_order t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if>
-<if test="spaceId !=null and spaceId != ''">
-, t.space_id= #{spaceId}
-</if>
-<if test="cspId !=null and cspId != ''">
-, t.csp_id= #{cspId}
-</if>
-<if test="timeId !=null and timeId != ''">
-, t.time_id= #{timeId}
-</if>
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if>
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if>
- where 1=1 <if test="orderId !=null and orderId != ''">
-and t.order_id= #{orderId}
-</if>
+ update community_space_confirm_order t set t.status_cd = #{statusCd}
+ <if test="newBId != null and newBId != ''">
+ ,t.b_id = #{newBId}
+ </if>
+ <if test="spaceId !=null and spaceId != ''">
+ , t.space_id= #{spaceId}
+ </if>
+ <if test="cspId !=null and cspId != ''">
+ , t.csp_id= #{cspId}
+ </if>
+ <if test="timeId !=null and timeId != ''">
+ , t.time_id= #{timeId}
+ </if>
+ <if test="remark !=null and remark != ''">
+ , t.remark= #{remark}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ , t.community_id= #{communityId}
+ </if>
+ where 1=1
+ <if test="orderId !=null and orderId != ''">
+ and t.order_id= #{orderId}
+ </if>
</update>
<!-- 鏌ヨ鍦哄湴棰勭害鏍搁攢鏁伴噺 add by wuxw 2018-07-03 -->
- <select id="queryCommunitySpaceConfirmOrdersCount" parameterType="Map" resultType="Map">
- select count(1) count
-from community_space_confirm_order t
-where 1 =1
-<if test="spaceId !=null and spaceId != ''">
- and t.space_id= #{spaceId}
-</if>
-<if test="cspId !=null and cspId != ''">
- and t.csp_id= #{cspId}
-</if>
-<if test="timeId !=null and timeId != ''">
- and t.time_id= #{timeId}
-</if>
-<if test="orderId !=null and orderId != ''">
- and t.order_id= #{orderId}
-</if>
-<if test="remark !=null and remark != ''">
- and t.remark= #{remark}
-</if>
-<if test="statusCd !=null and statusCd != ''">
- and t.status_cd= #{statusCd}
-</if>
-<if test="communityId !=null and communityId != ''">
- and t.community_id= #{communityId}
-</if>
+ <select id="queryCommunitySpaceConfirmOrdersCount" parameterType="Map" resultType="Map">
+ select count(1) count
+ from community_space_confirm_order t
+ left join community_space_person_time cspt on t.time_id = cspt.time_id and cspt.status_cd = '0'
+ left join community_space_person csp on t.csp_id = csp.csp_id and csp.status_cd = '0'
+ left join community_space cs on csp.space_id = cs.space_id and cs.status_cd = '0'
+ where 1 =1
+ <if test="personName !=null and personName != ''">
+ and csp.person_name like concat('%',#{personName},'%')
+ </if>
+ <if test="personTel !=null and personTel != ''">
+ and csp.person_tel = #{personTel}
+ </if>
+ <if test="appointmentTime !=null and appointmentTime != ''">
+ and csp.appointment_time = #{appointmentTime}
+ </if>
+ <if test="spaceId !=null and spaceId != ''">
+ and t.space_id= #{spaceId}
+ </if>
+ <if test="cspId !=null and cspId != ''">
+ and t.csp_id= #{cspId}
+ </if>
+ <if test="timeId !=null and timeId != ''">
+ and t.time_id= #{timeId}
+ </if>
+ <if test="orderId !=null and orderId != ''">
+ and t.order_id= #{orderId}
+ </if>
+ <if test="remark !=null and remark != ''">
+ and t.remark= #{remark}
+ </if>
+ <if test="statusCd !=null and statusCd != ''">
+ and t.status_cd= #{statusCd}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
- </select>
+ </select>
</mapper>
--
Gitblit v1.8.0