From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能

---
 java110-db/src/main/resources/mapper/community/RoomV1ServiceDaoImplMapper.xml |  379 +++++++++++++++++++++++++++++-------------------------
 1 files changed, 203 insertions(+), 176 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/community/RoomV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/RoomV1ServiceDaoImplMapper.xml
index 341106c..067d7d6 100644
--- a/java110-db/src/main/resources/mapper/community/RoomV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/RoomV1ServiceDaoImplMapper.xml
@@ -5,201 +5,228 @@
 <mapper namespace="roomV1ServiceDaoImpl">
 
 
-
-
-
     <!-- 淇濆瓨鎴垮眿淇℃伅 add by wuxw 2018-07-03 -->
     <insert id="saveRoomInfo" parameterType="Map">
         insert into building_room(
-section,remark,room_sub_type,room_area,user_id,room_id,layer,fee_coefficient,built_up_area,room_num,unit_id,state,community_id,apartment,room_type,room_rent
-) values (
-#{section},#{remark},#{roomSubType},#{roomArea},#{userId},#{roomId},#{layer},#{feeCoefficient},#{builtUpArea},#{roomNum},#{unitId},#{state},#{communityId},#{apartment},#{roomType},#{roomRent}
-)
+        section,remark,room_sub_type,room_area,user_id,room_id,layer,fee_coefficient,built_up_area,room_num,unit_id,state,community_id,apartment,room_type,room_rent
+        ) values (
+        #{section},#{remark},#{roomSubType},#{roomArea},#{userId},#{roomId},#{layer},#{feeCoefficient},#{builtUpArea},#{roomNum},#{unitId},#{state},#{communityId},#{apartment},#{roomType},#{roomRent}
+        )
     </insert>
-
 
 
     <!-- 鏌ヨ鎴垮眿淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getRoomInfo" parameterType="Map" resultType="Map">
-        select  t.section,t.remark,t.status_cd,t.status_cd statusCd,t.room_sub_type,t.room_sub_type roomSubType,t.room_area,t.room_area roomArea,t.user_id,t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.fee_coefficient,t.fee_coefficient feeCoefficient,t.built_up_area,t.built_up_area builtUpArea,t.room_num,t.room_num roomNum,t.unit_id,t.unit_id unitId,t.state,t.community_id,t.community_id communityId,t.apartment,t.room_type,t.room_type roomType,t.room_rent,t.room_rent roomRent 
-from building_room t 
-where 1 =1 
-<if test="section !=null and section != ''">
-   and t.section= #{section}
-</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="roomSubType !=null and roomSubType != ''">
-   and t.room_sub_type= #{roomSubType}
-</if> 
-<if test="roomArea !=null and roomArea != ''">
-   and t.room_area= #{roomArea}
-</if> 
-<if test="userId !=null and userId != ''">
-   and t.user_id= #{userId}
-</if> 
-<if test="roomId !=null and roomId != ''">
-   and t.room_id= #{roomId}
-</if> 
-<if test="layer !=null and layer != ''">
-   and t.layer= #{layer}
-</if> 
-<if test="feeCoefficient !=null and feeCoefficient != ''">
-   and t.fee_coefficient= #{feeCoefficient}
-</if> 
-<if test="builtUpArea !=null and builtUpArea != ''">
-   and t.built_up_area= #{builtUpArea}
-</if> 
-<if test="roomNum !=null and roomNum != ''">
-   and t.room_num= #{roomNum}
-</if> 
-<if test="unitId !=null and unitId != ''">
-   and t.unit_id= #{unitId}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="apartment !=null and apartment != ''">
-   and t.apartment= #{apartment}
-</if> 
-<if test="roomType !=null and roomType != ''">
-   and t.room_type= #{roomType}
-</if> 
-<if test="roomRent !=null and roomRent != ''">
-   and t.room_rent= #{roomRent}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.section,t.remark,t.status_cd,t.status_cd statusCd,t.room_sub_type,t.room_sub_type
+        roomSubType,t.room_area,t.room_area roomArea,t.user_id,t.user_id userId,t.room_id,t.room_id
+        roomId,t.layer,t.fee_coefficient,t.fee_coefficient feeCoefficient,t.built_up_area,t.built_up_area
+        builtUpArea,t.room_num,t.room_num roomNum,t.unit_id,t.unit_id unitId,t.state,t.community_id,t.community_id
+        communityId,t.apartment,t.room_type,t.room_type roomType,t.room_rent,t.room_rent roomRent,f.floor_num floorNum,bu.unit_num unitNum
+        from building_room t
+        left join  building_unit bu on t.unit_id = bu.unit_id and bu.status_cd = '0'
+        left join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
+        where 1 =1
+        <if test="section !=null and section != ''">
+            and t.section= #{section}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="unitId !=null and unitId != ''">
+            and bu.unit_id= #{unitId}
+        </if>
+        <if test="floorId !=null and floorId != ''">
+            and f.floor_id= #{floorId}
+        </if>
+        <if test="floorIds !=null ">
+            and f.floor_id in
+            <foreach collection="floorIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="roomSubType !=null and roomSubType != ''">
+            and t.room_sub_type= #{roomSubType}
+        </if>
+        <if test="roomArea !=null and roomArea != ''">
+            and t.room_area= #{roomArea}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+        <if test="roomId !=null and roomId != ''">
+            and t.room_id= #{roomId}
+        </if>
+        <if test="layer !=null and layer != ''">
+            and t.layer= #{layer}
+        </if>
+        <if test="feeCoefficient !=null and feeCoefficient != ''">
+            and t.fee_coefficient= #{feeCoefficient}
+        </if>
+        <if test="builtUpArea !=null and builtUpArea != ''">
+            and t.built_up_area= #{builtUpArea}
+        </if>
+        <if test="roomNum !=null and roomNum != ''">
+            and t.room_num= #{roomNum}
+        </if>
+        <if test="unitId !=null and unitId != ''">
+            and t.unit_id= #{unitId}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="apartment !=null and apartment != ''">
+            and t.apartment= #{apartment}
+        </if>
+        <if test="roomType !=null and roomType != ''">
+            and t.room_type= #{roomType}
+        </if>
+        <if test="roomRent !=null and roomRent != ''">
+            and t.room_rent= #{roomRent}
+        </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="updateRoomInfo" parameterType="Map">
-        update  building_room t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="section !=null and section != ''">
-, t.section= #{section}
-</if> 
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if> 
-<if test="roomSubType !=null and roomSubType != ''">
-, t.room_sub_type= #{roomSubType}
-</if> 
-<if test="roomArea !=null and roomArea != ''">
-, t.room_area= #{roomArea}
-</if> 
-<if test="userId !=null and userId != ''">
-, t.user_id= #{userId}
-</if> 
-<if test="layer !=null and layer != ''">
-, t.layer= #{layer}
-</if> 
-<if test="feeCoefficient !=null and feeCoefficient != ''">
-, t.fee_coefficient= #{feeCoefficient}
-</if> 
-<if test="builtUpArea !=null and builtUpArea != ''">
-, t.built_up_area= #{builtUpArea}
-</if> 
-<if test="roomNum !=null and roomNum != ''">
-, t.room_num= #{roomNum}
-</if> 
-<if test="unitId !=null and unitId != ''">
-, t.unit_id= #{unitId}
-</if> 
-<if test="state !=null and state != ''">
-, t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
-<if test="apartment !=null and apartment != ''">
-, t.apartment= #{apartment}
-</if> 
-<if test="roomType !=null and roomType != ''">
-, t.room_type= #{roomType}
-</if> 
-<if test="roomRent !=null and roomRent != ''">
-, t.room_rent= #{roomRent}
-</if> 
- where 1=1 <if test="roomId !=null and roomId != ''">
-and t.room_id= #{roomId}
-</if> 
+        update building_room t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="section !=null and section != ''">
+            , t.section= #{section}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
+        <if test="roomSubType !=null and roomSubType != ''">
+            , t.room_sub_type= #{roomSubType}
+        </if>
+        <if test="roomArea !=null and roomArea != ''">
+            , t.room_area= #{roomArea}
+        </if>
+        <if test="userId !=null and userId != ''">
+            , t.user_id= #{userId}
+        </if>
+        <if test="layer !=null and layer != ''">
+            , t.layer= #{layer}
+        </if>
+        <if test="feeCoefficient !=null and feeCoefficient != ''">
+            , t.fee_coefficient= #{feeCoefficient}
+        </if>
+        <if test="builtUpArea !=null and builtUpArea != ''">
+            , t.built_up_area= #{builtUpArea}
+        </if>
+        <if test="roomNum !=null and roomNum != ''">
+            , t.room_num= #{roomNum}
+        </if>
+        <if test="unitId !=null and unitId != ''">
+            , t.unit_id= #{unitId}
+        </if>
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="apartment !=null and apartment != ''">
+            , t.apartment= #{apartment}
+        </if>
+        <if test="roomType !=null and roomType != ''">
+            , t.room_type= #{roomType}
+        </if>
+        <if test="roomRent !=null and roomRent != ''">
+            , t.room_rent= #{roomRent}
+        </if>
+        where 1=1
+        <if test="roomId !=null and roomId != ''">
+            and t.room_id= #{roomId}
+        </if>
 
     </update>
 
     <!-- 鏌ヨ鎴垮眿鏁伴噺 add by wuxw 2018-07-03 -->
-     <select id="queryRoomsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from building_room t 
-where 1 =1 
-<if test="section !=null and section != ''">
-   and t.section= #{section}
-</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="roomSubType !=null and roomSubType != ''">
-   and t.room_sub_type= #{roomSubType}
-</if> 
-<if test="roomArea !=null and roomArea != ''">
-   and t.room_area= #{roomArea}
-</if> 
-<if test="userId !=null and userId != ''">
-   and t.user_id= #{userId}
-</if> 
-<if test="roomId !=null and roomId != ''">
-   and t.room_id= #{roomId}
-</if> 
-<if test="layer !=null and layer != ''">
-   and t.layer= #{layer}
-</if> 
-<if test="feeCoefficient !=null and feeCoefficient != ''">
-   and t.fee_coefficient= #{feeCoefficient}
-</if> 
-<if test="builtUpArea !=null and builtUpArea != ''">
-   and t.built_up_area= #{builtUpArea}
-</if> 
-<if test="roomNum !=null and roomNum != ''">
-   and t.room_num= #{roomNum}
-</if> 
-<if test="unitId !=null and unitId != ''">
-   and t.unit_id= #{unitId}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="apartment !=null and apartment != ''">
-   and t.apartment= #{apartment}
-</if> 
-<if test="roomType !=null and roomType != ''">
-   and t.room_type= #{roomType}
-</if> 
-<if test="roomRent !=null and roomRent != ''">
-   and t.room_rent= #{roomRent}
-</if> 
+    <select id="queryRoomsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from building_room t
+        left join  building_unit bu on t.unit_id = bu.unit_id and bu.status_cd = '0'
+        left join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
+        where 1 =1
+        <if test="unitId !=null and unitId != ''">
+            and bu.unit_id= #{unitId}
+        </if>
+        <if test="floorId !=null and floorId != ''">
+            and f.floor_id= #{floorId}
+        </if>
+        <if test="floorIds !=null ">
+            and f.floor_id in
+            <foreach collection="floorIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="section !=null and section != ''">
+            and t.section= #{section}
+        </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="roomSubType !=null and roomSubType != ''">
+            and t.room_sub_type= #{roomSubType}
+        </if>
+        <if test="roomArea !=null and roomArea != ''">
+            and t.room_area= #{roomArea}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+        <if test="roomId !=null and roomId != ''">
+            and t.room_id= #{roomId}
+        </if>
+        <if test="layer !=null and layer != ''">
+            and t.layer= #{layer}
+        </if>
+        <if test="feeCoefficient !=null and feeCoefficient != ''">
+            and t.fee_coefficient= #{feeCoefficient}
+        </if>
+        <if test="builtUpArea !=null and builtUpArea != ''">
+            and t.built_up_area= #{builtUpArea}
+        </if>
+        <if test="roomNum !=null and roomNum != ''">
+            and t.room_num= #{roomNum}
+        </if>
+        <if test="unitId !=null and unitId != ''">
+            and t.unit_id= #{unitId}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="apartment !=null and apartment != ''">
+            and t.apartment= #{apartment}
+        </if>
+        <if test="roomType !=null and roomType != ''">
+            and t.room_type= #{roomType}
+        </if>
+        <if test="roomRent !=null and roomRent != ''">
+            and t.room_rent= #{roomRent}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

--
Gitblit v1.8.0