From df774e4fd262b0a39e52152f166ccddb2aa9f90e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 11 十月 2020 23:44:43 +0800
Subject: [PATCH] 优化代码

---
 java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml |  166 ++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 115 insertions(+), 51 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
index f1e6ada..baacdc9 100644
--- a/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
@@ -7,9 +7,9 @@
     <!-- 淇濆瓨灏忓尯鎴垮眿淇℃伅 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessRoomInfo" parameterType="Map">
         insert into business_building_room(
-        unit_price,section,remark,user_id,room_id,layer,built_up_area,operate,room_num,unit_id,b_id,apartment,state,community_id
+        fee_coefficient,section,remark,user_id,room_id,layer,built_up_area,operate,room_num,unit_id,b_id,apartment,state,community_id
         ) values (
-        #{unitPrice},#{section},#{remark},#{userId},#{roomId},#{layer},#{builtUpArea},#{operate},#{roomNum},#{unitId},#{bId},#{apartment},#{state},
+        #{feeCoefficient},#{section},#{remark},#{userId},#{roomId},#{layer},#{builtUpArea},#{operate},#{roomNum},#{unitId},#{bId},#{apartment},#{state},
         #{communityId}
         )
     </insert>
@@ -17,14 +17,14 @@
 
     <!-- 鏌ヨ灏忓尯鎴垮眿淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
     <select id="getBusinessRoomInfo" parameterType="Map" resultType="Map">
-        select t.unit_price,t.unit_price unitPrice,t.section,t.remark,t.user_id,t.user_id userId,t.room_id,t.room_id
+        select t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.remark,t.user_id,t.user_id userId,t.room_id,t.room_id
         roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.operate,t.room_num,t.room_num
         roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,t.community_id,t.community_id
         communityId
         from business_building_room t
         where 1 =1
-        <if test="unitPrice !=null and unitPrice != ''">
-            and t.unit_price= #{unitPrice}
+        <if test="feeCoefficient !=null and feeCoefficient != ''">
+            and t.fee_coefficient= #{feeCoefficient}
         </if>
         <if test="section !=null and section != ''">
             and t.section= #{section}
@@ -72,12 +72,12 @@
     <!-- 淇濆瓨灏忓尯鎴垮眿淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
     <insert id="saveRoomInfoInstance" parameterType="Map">
         insert into building_room(
-        unit_price,section,status_cd,remark,user_id,room_id,layer,built_up_area,room_num,unit_id,b_id,apartment,state,community_id
+        fee_coefficient,section,status_cd,remark,user_id,room_id,layer,built_up_area,room_num,unit_id,b_id,apartment,state,community_id
         ) select
-        t.unit_price,t.section,'0',t.remark,t.user_id,t.room_id,t.layer,t.built_up_area,t.room_num,t.unit_id,t.b_id,t.apartment,t.state,t.community_id
+        t.fee_coefficient,t.section,'0',t.remark,t.user_id,t.room_id,t.layer,t.built_up_area,t.room_num,t.unit_id,t.b_id,t.apartment,t.state,t.community_id
         from business_building_room t where 1=1
-        <if test="unitPrice !=null and unitPrice != ''">
-            and t.unit_price= #{unitPrice}
+        <if test="feeCoefficient !=null and feeCoefficient != ''">
+            and t.fee_coefficient= #{feeCoefficient}
         </if>
         <if test="section !=null and section != ''">
             and t.section= #{section}
@@ -122,14 +122,14 @@
 
     <!-- 鏌ヨ灏忓尯鎴垮眿淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getRoomInfo" parameterType="Map" resultType="Map">
-        select t.unit_price,t.unit_price unitPrice,t.section,t.status_cd,t.status_cd
+        select t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd
         statusCd,t.remark,t.user_id,t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area
         builtUpArea,t.room_num,t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id
         bId,t.apartment,t.state,t.community_id,t.community_id communityId
         from building_room t
         where 1 =1
-        <if test="unitPrice !=null and unitPrice != ''">
-            and t.unit_price= #{unitPrice}
+        <if test="feeCoefficient !=null and feeCoefficient != ''">
+            and t.fee_coefficient= #{feeCoefficient}
         </if>
         <if test="section !=null and section != ''">
             and t.section= #{section}
@@ -192,8 +192,8 @@
         <if test="newBId != null and newBId != ''">
             ,t.b_id = #{newBId}
         </if>
-        <if test="unitPrice !=null and unitPrice != ''">
-            , t.unit_price= #{unitPrice}
+        <if test="feeCoefficient !=null">
+            , t.fee_coefficient= #{feeCoefficient}
         </if>
         <if test="section !=null and section != ''">
             , t.section= #{section}
@@ -240,8 +240,8 @@
         select count(1) count
         from building_room t
         where 1 =1
-        <if test="unitPrice !=null and unitPrice != ''">
-            and t.unit_price= #{unitPrice}
+        <if test="feeCoefficient !=null and feeCoefficient != ''">
+            and t.fee_coefficient= #{feeCoefficient}
         </if>
         <if test="section !=null and section != ''">
             and t.section= #{section}
@@ -290,19 +290,18 @@
     <!-- 鏌ヨ灏忓尯鎴垮眿鏁伴噺 add by wuxw 2018-07-03 -->
     <select id="queryRoomsByCommunityIdCount" parameterType="Map" resultType="Map">
         select count(1) count
-        FROM building_room t,building_unit u,f_floor f
+        FROM building_room t
+        inner join building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
+        inner JOIN f_floor f on u.`floor_id` = f.`floor_id` AND f.`community_id` = t.`community_id` AND f.`status_cd` = '0'
+        left join t_dict td on t.state = td.status_cd and td.table_name = 'building_room' and td.table_columns = 'state'
         WHERE 1 =1
-        AND t.`unit_id` = u.`unit_id`
-        AND u.`floor_id` = f.`floor_id`
-        AND f.`community_id` = t.`community_id`
-        AND u.`status_cd` = '0'
-        AND f.`status_cd` = '0'
         AND t.`community_id` = #{communityId}
         <if test="floorId !=null and floorId != ''">
             and f.`floor_id`= #{floorId}
         </if>
-        <if test="unitPrice !=null and unitPrice != ''">
-            and t.unit_price= #{unitPrice}
+
+        <if test="feeCoefficient !=null and feeCoefficient != ''">
+            and t.fee_coefficient= #{feeCoefficient}
         </if>
         <if test="section !=null and section != ''">
             and t.section= #{section}
@@ -313,9 +312,7 @@
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
         </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>
@@ -340,8 +337,21 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
+        <if test="states != null">
+            and t.state in
+            <foreach collection="states" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
+        </if>
+
+        <if test="floorNum !=null and floorNum != ''">
+            and f.`floor_num`= #{floorNum}
+        </if>
+        <if test="unitNum !=null and unitNum != ''">
+            and u.unit_num= #{unitNum}
         </if>
 
 
@@ -361,8 +371,8 @@
         <if test="floorId !=null and floorId != ''">
             and f.`floor_id`= #{floorId}
         </if>
-        <if test="unitPrice !=null and unitPrice != ''">
-            and t.unit_price= #{unitPrice}
+        <if test="feeCoefficient !=null and feeCoefficient != ''">
+            and t.fee_coefficient= #{feeCoefficient}
         </if>
         <if test="section !=null and section != ''">
             and t.section= #{section}
@@ -422,8 +432,8 @@
         <if test="floorId !=null and floorId != ''">
             and f.`floor_id`= #{floorId}
         </if>
-        <if test="unitPrice !=null and unitPrice != ''">
-            and t.unit_price= #{unitPrice}
+        <if test="feeCoefficient !=null and feeCoefficient != ''">
+            and t.fee_coefficient= #{feeCoefficient}
         </if>
         <if test="section !=null and section != ''">
             and t.section= #{section}
@@ -471,7 +481,7 @@
 
     <!-- 鏌ヨ灏忓尯鎴垮眿淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getRoomInfoWithOutSellByCommunityId" parameterType="Map" resultType="Map">
-        SELECT t.unit_price,t.unit_price unitPrice,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,
+        SELECT t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,
         t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
         t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum
         FROM
@@ -484,8 +494,8 @@
         <if test="floorId !=null and floorId != ''">
             and f.`floor_id`= #{floorId}
         </if>
-        <if test="unitPrice !=null and unitPrice != ''">
-            and t.unit_price= #{unitPrice}
+        <if test="feeCoefficient !=null and feeCoefficient != ''">
+            and t.fee_coefficient= #{feeCoefficient}
         </if>
         <if test="section !=null and section != ''">
             and t.section= #{section}
@@ -535,7 +545,7 @@
 
     <!-- 鏌ヨ灏忓尯鎴垮眿淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getRoomInfoWithSellByCommunityId" parameterType="Map" resultType="Map">
-        SELECT t.unit_price,t.unit_price unitPrice,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,
+        SELECT t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,
         t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
         t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum
         FROM
@@ -548,8 +558,8 @@
         <if test="floorId !=null and floorId != ''">
             and f.`floor_id`= #{floorId}
         </if>
-        <if test="unitPrice !=null and unitPrice != ''">
-            and t.unit_price= #{unitPrice}
+        <if test="feeCoefficient !=null and feeCoefficient != ''">
+            and t.fee_coefficient= #{feeCoefficient}
         </if>
         <if test="section !=null and section != ''">
             and t.section= #{section}
@@ -600,23 +610,24 @@
 
     <!-- 鏌ヨ灏忓尯鎴垮眿淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getRoomInfoByCommunityId" parameterType="Map" resultType="Map">
-        SELECT t.unit_price,t.unit_price unitPrice,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,
+        SELECT t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,
         t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
         t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum,
-        u.unit_id unitId,f.floor_id floorId,f.floor_num floorNum
-        FROM building_room t,building_unit u,f_floor f
+        u.unit_id unitId,f.floor_id floorId,f.floor_num floorNum,f.floor_area floorArea,u.unit_area unitArea,td.name stateName
+        FROM building_room t
+        inner join building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
+        inner JOIN f_floor f on u.`floor_id` = f.`floor_id` AND f.`community_id` = t.`community_id` AND f.`status_cd` = '0'
+        left join t_dict td on t.state = td.status_cd and td.table_name = 'building_room' and td.table_columns = 'state'
         WHERE 1 =1
-        AND t.`unit_id` = u.`unit_id`
-        AND u.`floor_id` = f.`floor_id`
-        AND f.`community_id` = t.`community_id`
-        AND u.`status_cd` = '0'
-        AND f.`status_cd` = '0'
         AND t.`community_id` = #{communityId}
         <if test="floorId !=null and floorId != ''">
             and f.`floor_id`= #{floorId}
         </if>
-        <if test="unitPrice !=null and unitPrice != ''">
-            and t.unit_price= #{unitPrice}
+        <if test="floorNum !=null and floorNum != ''">
+            and f.`floor_num`= #{floorNum}
+        </if>
+        <if test="feeCoefficient !=null and feeCoefficient != ''">
+            and t.fee_coefficient= #{feeCoefficient}
         </if>
         <if test="section !=null and section != ''">
             and t.section= #{section}
@@ -626,9 +637,6 @@
         </if>
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
-        </if>
-        <if test="userId !=null and userId != ''">
-            and t.user_id= #{userId}
         </if>
         <if test="roomId !=null and roomId != ''">
             and t.room_id= #{roomId}
@@ -651,6 +659,9 @@
         <if test="unitId !=null and unitId != ''">
             and t.unit_id= #{unitId}
         </if>
+        <if test="unitNum !=null and unitNum != ''">
+            and u.unit_num= #{unitNum}
+        </if>
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
@@ -659,6 +670,12 @@
         </if>
         <if test="state !=null and state != ''">
             and t.state= #{state}
+        </if>
+        <if test="states != null">
+            and t.state in
+            <foreach collection="states" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
         </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
@@ -672,7 +689,7 @@
     <!-- 鏍规嵁涓氫富鏌ヨ鎴垮眿淇℃伅 -->
     <select id="getRoomInfoByOwner" parameterType="Map" resultType="Map">
         SELECT
-        t.unit_price,t.unit_price unitPrice,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,
+        t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,
         t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
         t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num`
         unitNum,f.`floor_num` floorNum
@@ -723,4 +740,51 @@
             and bo.owner_type_cd= #{ownerTypeCd}
         </if>
     </select>
+
+
+    <!-- 鏌ヨ灏忓尯鎴垮眿淇℃伅 add by wuxw 2018-07-03 -->
+    <select id="getRoomInfos" parameterType="Map" resultType="Map">
+        SELECT t.fee_coefficient,t.fee_coefficient feeCoefficient,t.section,t.status_cd,t.status_cd statusCd,t.remark,t.user_id,
+        t.user_id userId,t.room_id,t.room_id roomId,t.layer,t.built_up_area,t.built_up_area builtUpArea,t.room_num,
+        t.room_num roomNum,t.unit_id,t.unit_id unitId,t.b_id,t.b_id bId,t.apartment,t.state,u.`unit_num` unitNum
+        FROM
+        building_room t
+        INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
+        INNER JOIN f_floor f on u.`floor_id` = f.`floor_id` and f.`community_id` = t.`community_id` and f.`status_cd` = '0'
+        WHERE t.status_cd= '0'
+        <if test="floorId !=null and floorId != ''">
+            and f.`floor_id`= #{floorId}
+        </if>
+        <if test="floorNum !=null and floorNum != ''">
+            and f.`floor_num`= #{floorNum}
+        </if>
+        <if test="unitNum !=null and unitNum != ''">
+            and u.`unit_num`= #{unitNum}
+        </if>
+        <if test="section !=null and section != ''">
+            and t.section= #{section}
+        </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="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="page != -1 and page != null">
+            limit #{page},#{row}
+        </if>
+
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0