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 |  426 ++++++++++++++++++++++++++++++----------------------
 1 files changed, 245 insertions(+), 181 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/store/ComplaintServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/store/ComplaintServiceDaoImplMapper.xml
index d6ed862..01dfe65 100644
--- a/java110-db/src/main/resources/mapper/store/ComplaintServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/store/ComplaintServiceDaoImplMapper.xml
@@ -5,212 +5,276 @@
 <mapper namespace="complaintServiceDaoImpl">
 
     <!-- 淇濆瓨鎶曡瘔寤鸿淇℃伅 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
-) values (
-#{operate},#{complaintId},#{typeCd},#{context},#{complaintName},#{tel},#{state},#{storeId},#{bId},#{roomId}
-)
-       </insert>
+    <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,start_user_id
+        ) values (
+        #{operate},#{complaintId},#{typeCd},#{context},#{complaintName},#{tel},#{state},#{storeId},#{bId},#{roomId},#{communityId},
+        #{startUserId}
+        )
+    </insert>
 
 
-       <!-- 鏌ヨ鎶曡瘔寤鸿淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
-       <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 
-from business_complaint t 
-where 1 =1 
-<if test="operate !=null and operate != ''">
-   and t.operate= #{operate}
-</if> 
-<if test="complaintId !=null and complaintId != ''">
-   and t.complaint_id= #{complaintId}
-</if> 
-<if test="typeCd !=null and typeCd != ''">
-   and t.type_cd= #{typeCd}
-</if> 
-<if test="context !=null and context != ''">
-   and t.context= #{context}
-</if> 
-<if test="complaintName !=null and complaintName != ''">
-   and t.complaint_name= #{complaintName}
-</if> 
-<if test="tel !=null and tel != ''">
-   and t.tel= #{tel}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="roomId !=null and roomId != ''">
-   and t.room_id= #{roomId}
-</if> 
+    <!-- 鏌ヨ鎶曡瘔寤鸿淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
+    <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,
+        t.start_user_id,t.start_user_id startUserId
+        from business_complaint t
+        where 1 =1
+        <if test="operate !=null and operate != ''">
+            and t.operate= #{operate}
+        </if>
+        <if test="complaintId !=null and complaintId != ''">
+            and t.complaint_id= #{complaintId}
+        </if>
+        <if test="typeCd !=null and typeCd != ''">
+            and t.type_cd= #{typeCd}
+        </if>
+        <if test="context !=null and context != ''">
+            and t.context= #{context}
+        </if>
+        <if test="complaintName !=null and complaintName != ''">
+            and t.complaint_name= #{complaintName}
+        </if>
+        <if test="tel !=null and tel != ''">
+            and t.tel= #{tel}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="roomId !=null and roomId != ''">
+            and t.room_id= #{roomId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
 
-       </select>
-
-
-
+    </select>
 
 
     <!-- 淇濆瓨鎶曡瘔寤鸿淇℃伅鑷� 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
-) 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 from business_complaint t where 1=1
-   and t.operate= 'ADD'
-<if test="complaintId !=null and complaintId != ''">
-   and t.complaint_id= #{complaintId}
-</if> 
-<if test="typeCd !=null and typeCd != ''">
-   and t.type_cd= #{typeCd}
-</if> 
-<if test="context !=null and context != ''">
-   and t.context= #{context}
-</if> 
-<if test="complaintName !=null and complaintName != ''">
-   and t.complaint_name= #{complaintName}
-</if> 
-<if test="tel !=null and tel != ''">
-   and t.tel= #{tel}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="roomId !=null and roomId != ''">
-   and t.room_id= #{roomId}
-</if> 
+        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'
+        <if test="complaintId !=null and complaintId != ''">
+            and t.complaint_id= #{complaintId}
+        </if>
+        <if test="typeCd !=null and typeCd != ''">
+            and t.type_cd= #{typeCd}
+        </if>
+        <if test="context !=null and context != ''">
+            and t.context= #{context}
+        </if>
+        <if test="complaintName !=null and complaintName != ''">
+            and t.complaint_name= #{complaintName}
+        </if>
+        <if test="tel !=null and tel != ''">
+            and t.tel= #{tel}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="roomId !=null and roomId != ''">
+            and t.room_id= #{roomId}
+        </if>
 
     </insert>
 
 
-
     <!-- 鏌ヨ鎶曡瘔寤鸿淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getComplaintInfo" parameterType="Map" resultType="Map">
-        select  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.status_cd,t.status_cd statusCd,t.state,t.store_id,t.store_id storeId,t.b_id,t.b_id bId,t.room_id,t.room_id roomId 
-from complaint t 
-where 1 =1 
-<if test="complaintId !=null and complaintId != ''">
-   and t.complaint_id= #{complaintId}
-</if> 
-<if test="typeCd !=null and typeCd != ''">
-   and t.type_cd= #{typeCd}
-</if> 
-<if test="context !=null and context != ''">
-   and t.context= #{context}
-</if> 
-<if test="complaintName !=null and complaintName != ''">
-   and t.complaint_name= #{complaintName}
-</if> 
-<if test="tel !=null and tel != ''">
-   and t.tel= #{tel}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="roomId !=null and roomId != ''">
-   and t.room_id= #{roomId}
-</if> 
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.complaint_id,t.complaint_id complaintId,t.type_cd,t.type_cd
+        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,
+        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
+        and td.table_name = 'complaint'
+        and td.table_columns = 'state'
+        and t.type_cd = td2.status_cd
+        and td2.table_name = 'complaint'
+        and td2.table_columns = 'type_cd'
+        <if test="complaintId !=null and complaintId != ''">
+            and t.complaint_id= #{complaintId}
+        </if>
+        <if test="complaintIds != null ">
+            and t.complaint_id in
+            <foreach collection="complaintIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="typeCd !=null and typeCd != ''">
+            and t.type_cd= #{typeCd}
+        </if>
+        <if test="context !=null and context != ''">
+            and t.context= #{context}
+        </if>
+        <if test="complaintName !=null and complaintName != ''">
+            and t.complaint_name= #{complaintName}
+        </if>
+        <if test="tel !=null and tel != ''">
+            and t.tel= #{tel}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <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
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 淇敼鎶曡瘔寤鸿淇℃伅 add by wuxw 2018-07-03 -->
     <update id="updateComplaintInfoInstance" parameterType="Map">
-        update  complaint t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="typeCd !=null and typeCd != ''">
-, t.type_cd= #{typeCd}
-</if> 
-<if test="context !=null and context != ''">
-, t.context= #{context}
-</if> 
-<if test="complaintName !=null and complaintName != ''">
-, t.complaint_name= #{complaintName}
-</if> 
-<if test="tel !=null and tel != ''">
-, t.tel= #{tel}
-</if> 
-<if test="state !=null and state != ''">
-, t.state= #{state}
-</if> 
-<if test="storeId !=null and storeId != ''">
-, t.store_id= #{storeId}
-</if> 
-<if test="roomId !=null and roomId != ''">
-, t.room_id= #{roomId}
-</if> 
- where 1=1 <if test="complaintId !=null and complaintId != ''">
-and t.complaint_id= #{complaintId}
-</if> 
-<if test="bId !=null and bId != ''">
-and t.b_id= #{bId}
-</if> 
+        update complaint t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="typeCd !=null and typeCd != ''">
+            , t.type_cd= #{typeCd}
+        </if>
+        <if test="context !=null and context != ''">
+            , t.context= #{context}
+        </if>
+        <if test="complaintName !=null and complaintName != ''">
+            , t.complaint_name= #{complaintName}
+        </if>
+        <if test="tel !=null and tel != ''">
+            , t.tel= #{tel}
+        </if>
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            , t.store_id= #{storeId}
+        </if>
+        <if test="roomId !=null and roomId != ''">
+            , t.room_id= #{roomId}
+        </if>
+        where 1=1
+        <if test="complaintId !=null and complaintId != ''">
+            and t.complaint_id= #{complaintId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
 
     </update>
 
     <!-- 鏌ヨ鎶曡瘔寤鸿鏁伴噺 add by wuxw 2018-07-03 -->
-     <select id="queryComplaintsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from complaint t 
-where 1 =1 
-<if test="complaintId !=null and complaintId != ''">
-   and t.complaint_id= #{complaintId}
-</if> 
-<if test="typeCd !=null and typeCd != ''">
-   and t.type_cd= #{typeCd}
-</if> 
-<if test="context !=null and context != ''">
-   and t.context= #{context}
-</if> 
-<if test="complaintName !=null and complaintName != ''">
-   and t.complaint_name= #{complaintName}
-</if> 
-<if test="tel !=null and tel != ''">
-   and t.tel= #{tel}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="roomId !=null and roomId != ''">
-   and t.room_id= #{roomId}
-</if> 
+    <select id="queryComplaintsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from complaint t,t_dict td,t_dict td2
+        where 1 =1
+        and t.state = td.status_cd
+        and td.table_name = 'complaint'
+        and td.table_columns = 'state'
+        and t.type_cd = td2.status_cd
+        and td2.table_name = 'complaint'
+        and td2.table_columns = 'type_cd'
+        <if test="complaintId !=null and complaintId != ''">
+            and t.complaint_id= #{complaintId}
+        </if>
+        <if test="complaintIds != null ">
+            and t.complaint_id in
+            <foreach collection="complaintIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="typeCd !=null and typeCd != ''">
+            and t.type_cd= #{typeCd}
+        </if>
+        <if test="context !=null and context != ''">
+            and t.context= #{context}
+        </if>
+        <if test="complaintName !=null and complaintName != ''">
+            and t.complaint_name= #{complaintName}
+        </if>
+        <if test="tel !=null and tel != ''">
+            and t.tel= #{tel}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <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>
+    </select>
 
 </mapper>

--
Gitblit v1.8.0