From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/community/RoomRenovationDetailServiceDaoImplMapper.xml |  206 +++++++++++++++++++++++++--------------------------
 1 files changed, 102 insertions(+), 104 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/community/RoomRenovationDetailServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/RoomRenovationDetailServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index ca1a33b..2194c5e
--- a/java110-db/src/main/resources/mapper/community/RoomRenovationDetailServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/RoomRenovationDetailServiceDaoImplMapper.xml
@@ -5,129 +5,127 @@
 <mapper namespace="roomRenovationDetailServiceDaoImpl">
 
 
-
-
-
     <!-- 淇濆瓨瑁呬慨鏄庣粏淇℃伅 add by wuxw 2018-07-03 -->
     <insert id="saveRoomRenovationDetailInfo" parameterType="Map">
         insert into room_renovation_detail(
-detail_type,staff_name,detail_id,remark,state,r_id,community_id,staff_id
-) values (
-#{detailType},#{staffName},#{detailId},#{remark},#{state},#{rId},#{communityId},#{staffId}
-)
+        detail_type,staff_name,detail_id,remark,state,r_id,community_id,staff_id
+        ) values (
+        #{detailType},#{staffName},#{detailId},#{remark},#{state},#{rId},#{communityId},#{staffId}
+        )
     </insert>
-
 
 
     <!-- 鏌ヨ瑁呬慨鏄庣粏淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getRoomRenovationDetailInfo" parameterType="Map" resultType="Map">
-        select  t.detail_type,t.detail_type detailType,t.staff_name,t.staff_name staffName,t.detail_id,t.detail_id detailId,t.status_cd,t.status_cd statusCd,t.remark,t.state,t.r_id,t.r_id rId,t.community_id,t.community_id communityId,t.staff_id,t.staff_id staffId 
-from room_renovation_detail t 
-where 1 =1 
-<if test="detailType !=null and detailType != ''">
-   and t.detail_type= #{detailType}
-</if> 
-<if test="staffName !=null and staffName != ''">
-   and t.staff_name= #{staffName}
-</if> 
-<if test="detailId !=null and detailId != ''">
-   and t.detail_id= #{detailId}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="rId !=null and rId != ''">
-   and t.r_id= #{rId}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="staffId !=null and staffId != ''">
-   and t.staff_id= #{staffId}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.detail_type,t.detail_type detailType,t.staff_name,t.staff_name staffName,t.detail_id,t.detail_id
+        detailId,
+        t.status_cd,t.status_cd statusCd,t.remark,t.state,t.r_id,t.r_id rId,t.community_id,t.community_id communityId,
+        t.staff_id,t.staff_id staffId ,t.create_time createTime
+        from room_renovation_detail t
+        where 1 =1
+        <if test="detailType !=null and detailType != ''">
+            and t.detail_type= #{detailType}
+        </if>
+        <if test="staffName !=null and staffName != ''">
+            and t.staff_name= #{staffName}
+        </if>
+        <if test="detailId !=null and detailId != ''">
+            and t.detail_id= #{detailId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="rId !=null and rId != ''">
+            and t.r_id= #{rId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="staffId !=null and staffId != ''">
+            and t.staff_id= #{staffId}
+        </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="updateRoomRenovationDetailInfo" parameterType="Map">
-        update  room_renovation_detail t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="detailType !=null and detailType != ''">
-, t.detail_type= #{detailType}
-</if> 
-<if test="staffName !=null and staffName != ''">
-, t.staff_name= #{staffName}
-</if> 
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if> 
-<if test="state !=null and state != ''">
-, t.state= #{state}
-</if> 
-<if test="rId !=null and rId != ''">
-, t.r_id= #{rId}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
-<if test="staffId !=null and staffId != ''">
-, t.staff_id= #{staffId}
-</if> 
- where 1=1 <if test="detailId !=null and detailId != ''">
-and t.detail_id= #{detailId}
-</if> 
+        update room_renovation_detail t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="detailType !=null and detailType != ''">
+            , t.detail_type= #{detailType}
+        </if>
+        <if test="staffName !=null and staffName != ''">
+            , t.staff_name= #{staffName}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
+        </if>
+        <if test="rId !=null and rId != ''">
+            , t.r_id= #{rId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="staffId !=null and staffId != ''">
+            , t.staff_id= #{staffId}
+        </if>
+        where 1=1
+        <if test="detailId !=null and detailId != ''">
+            and t.detail_id= #{detailId}
+        </if>
 
     </update>
 
     <!-- 鏌ヨ瑁呬慨鏄庣粏鏁伴噺 add by wuxw 2018-07-03 -->
-     <select id="queryRoomRenovationDetailsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from room_renovation_detail t 
-where 1 =1 
-<if test="detailType !=null and detailType != ''">
-   and t.detail_type= #{detailType}
-</if> 
-<if test="staffName !=null and staffName != ''">
-   and t.staff_name= #{staffName}
-</if> 
-<if test="detailId !=null and detailId != ''">
-   and t.detail_id= #{detailId}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="rId !=null and rId != ''">
-   and t.r_id= #{rId}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="staffId !=null and staffId != ''">
-   and t.staff_id= #{staffId}
-</if> 
+    <select id="queryRoomRenovationDetailsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from room_renovation_detail t
+        where 1 =1
+        <if test="detailType !=null and detailType != ''">
+            and t.detail_type= #{detailType}
+        </if>
+        <if test="staffName !=null and staffName != ''">
+            and t.staff_name= #{staffName}
+        </if>
+        <if test="detailId !=null and detailId != ''">
+            and t.detail_id= #{detailId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="rId !=null and rId != ''">
+            and t.r_id= #{rId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="staffId !=null and staffId != ''">
+            and t.staff_id= #{staffId}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

--
Gitblit v1.8.0