From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/community/CommunitySpacePersonTimeV1ServiceDaoImplMapper.xml | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/CommunitySpacePersonTimeV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/CommunitySpacePersonTimeV1ServiceDaoImplMapper.xml
index 587f6f6..172fd6a 100644
--- a/java110-db/src/main/resources/mapper/community/CommunitySpacePersonTimeV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/CommunitySpacePersonTimeV1ServiceDaoImplMapper.xml
@@ -8,9 +8,9 @@
<!-- 淇濆瓨鍦哄湴棰勭害鏃堕棿淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveCommunitySpacePersonTimeInfo" parameterType="Map">
insert into community_space_person_time(
- space_id,csp_id,hours,time_id,community_id
+ space_id,csp_id,hours,time_id,community_id,state
) values (
- #{spaceId},#{cspId},#{hours},#{timeId},#{communityId}
+ #{spaceId},#{cspId},#{hours},#{timeId},#{communityId},#{state}
)
</insert>
@@ -18,9 +18,13 @@
<!-- 鏌ヨ鍦哄湴棰勭害鏃堕棿淇℃伅 add by wuxw 2018-07-03 -->
<select id="getCommunitySpacePersonTimeInfo" parameterType="Map" resultType="Map">
select t.space_id,t.space_id spaceId,t.csp_id,t.csp_id cspId,t.hours,t.time_id,t.time_id
- timeId,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId
+ timeId,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.state
from community_space_person_time t
+ left join community_space_person csp on t.csp_id = csp.csp_id and csp.status_cd = '0'
where 1 =1
+ <if test="appointmentTime !=null and appointmentTime != ''">
+ and csp.appointment_time = #{appointmentTime}
+ </if>
<if test="spaceId !=null and spaceId != ''">
and t.space_id= #{spaceId}
</if>
@@ -33,8 +37,17 @@
#{item}
</foreach>
</if>
+ <if test="states !=null ">
+ and t.state in
+ <foreach collection="states" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
<if test="hours !=null and hours != ''">
and t.hours= #{hours}
+ </if>
+ <if test="state !=null and state != ''">
+ and t.state= #{state}
</if>
<if test="timeId !=null and timeId != ''">
and t.time_id= #{timeId}
@@ -62,8 +75,9 @@
<if test="spaceId !=null and spaceId != ''">
, t.space_id= #{spaceId}
</if>
- <if test="cspId !=null and cspId != ''">
- , t.csp_id= #{cspId}
+
+ <if test="state !=null and state != ''">
+ , t.state = #{state}
</if>
<if test="hours !=null and hours != ''">
, t.hours= #{hours}
@@ -75,6 +89,9 @@
<if test="timeId !=null and timeId != ''">
and t.time_id= #{timeId}
</if>
+ <if test="cspId !=null and cspId != ''">
+ and t.csp_id= #{cspId}
+ </if>
</update>
@@ -82,7 +99,11 @@
<select id="queryCommunitySpacePersonTimesCount" parameterType="Map" resultType="Map">
select count(1) count
from community_space_person_time t
+ left join community_space_person csp on t.csp_id = csp.csp_id and csp.status_cd = '0'
where 1 =1
+ <if test="appointmentTime !=null and appointmentTime != ''">
+ and csp.appointment_time= #{appointmentTime}
+ </if>
<if test="spaceId !=null and spaceId != ''">
and t.space_id= #{spaceId}
</if>
@@ -107,6 +128,9 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
+ <if test="state !=null and state != ''">
+ and t.state= #{state}
+ </if>
</select>
--
Gitblit v1.8.0