From 57cbb7df3dcd52707c8d284ecc035bafb190312d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 01 八月 2020 00:14:32 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
java110-db/src/main/resources/mapper/store/ComplaintServiceDaoImplMapper.xml | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/store/ComplaintServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/ComplaintServiceDaoImplMapper.xml
index 228cc5c..01dfe65 100644
--- a/java110-db/src/main/resources/mapper/store/ComplaintServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/ComplaintServiceDaoImplMapper.xml
@@ -7,9 +7,10 @@
<!-- 淇濆瓨鎶曡瘔寤鸿淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessComplaintInfo" parameterType="Map">
insert into business_complaint(
- operate,complaint_id,type_cd,context,complaint_name,tel,state,store_id,b_id,room_id,community_id
+ operate,complaint_id,type_cd,context,complaint_name,tel,state,store_id,b_id,room_id,community_id,start_user_id
) values (
- #{operate},#{complaintId},#{typeCd},#{context},#{complaintName},#{tel},#{state},#{storeId},#{bId},#{roomId},#{communityId}
+ #{operate},#{complaintId},#{typeCd},#{context},#{complaintName},#{tel},#{state},#{storeId},#{bId},#{roomId},#{communityId},
+ #{startUserId}
)
</insert>
@@ -18,7 +19,8 @@
<select id="getBusinessComplaintInfo" parameterType="Map" resultType="Map">
select t.operate,t.complaint_id,t.complaint_id complaintId,t.type_cd,t.type_cd
typeCd,t.context,t.complaint_name,t.complaint_name complaintName,t.tel,t.state,t.store_id,t.store_id
- storeId,t.b_id,t.b_id bId,t.room_id,t.room_id roomId,t.community_id,t.community_id communityId
+ storeId,t.b_id,t.b_id bId,t.room_id,t.room_id roomId,t.community_id,t.community_id communityId,
+ t.start_user_id,t.start_user_id startUserId
from business_complaint t
where 1 =1
<if test="operate !=null and operate != ''">
@@ -61,8 +63,10 @@
<!-- 淇濆瓨鎶曡瘔寤鸿淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveComplaintInfoInstance" parameterType="Map">
insert into complaint(
- complaint_id,type_cd,context,complaint_name,tel,status_cd,state,store_id,b_id,room_id,community_id
- ) select t.complaint_id,t.type_cd,t.context,t.complaint_name,t.tel,'0',t.state,t.store_id,t.b_id,t.room_id,t.community_id
+ complaint_id,type_cd,context,complaint_name,tel,status_cd,state,store_id,b_id,room_id,community_id,
+ start_user_id
+ ) select t.complaint_id,t.type_cd,t.context,t.complaint_name,t.tel,'0',t.state,t.store_id,t.b_id,t.room_id,
+ t.community_id,t.start_user_id
from
business_complaint t where 1=1
and t.operate= 'ADD'
@@ -103,7 +107,8 @@
typeCd,td2.name typeCdName,t.context,t.complaint_name,t.complaint_name
complaintName,t.tel,t.status_cd,t.status_cd
statusCd,t.state,td.name stateName,t.store_id,t.store_id storeId,t.b_id,t.b_id bId,t.room_id,t.room_id
- roomId,t.create_time createTime,t.community_id,t.community_id communityId
+ roomId,t.create_time createTime,t.community_id,t.community_id communityId,
+ t.start_user_id,t.start_user_id startUserId
from complaint t,t_dict td,t_dict td2
where 1 =1
and t.state = td.status_cd
@@ -148,8 +153,17 @@
<if test="roomId !=null and roomId != ''">
and t.room_id= #{roomId}
</if>
+ <if test="roomIds != null ">
+ and t.room_id in
+ <foreach collection="roomIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
+ </if>
+ <if test="startUserId !=null and startUserId != ''">
+ and t.start_user_id= #{startUserId}
</if>
order by t.create_time desc
@@ -247,9 +261,18 @@
<if test="roomId !=null and roomId != ''">
and t.room_id= #{roomId}
</if>
+ <if test="roomIds != null ">
+ and t.room_id in
+ <foreach collection="roomIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
+ <if test="startUserId !=null and startUserId != ''">
+ and t.start_user_id= #{startUserId}
+ </if>
</select>
--
Gitblit v1.8.0