From 022ffe220344d387380fad4ffe33ebcf318c6eab Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 09 七月 2020 10:42:08 +0800
Subject: [PATCH] 优化错别字
---
java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml | 175 +++++++++++++++++++++++++++-------------------------------
1 files changed, 82 insertions(+), 93 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
index abe93bc..f1e6ada 100644
--- a/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
@@ -7,9 +7,10 @@
<!-- 淇濆瓨灏忓尯鎴垮眿淇℃伅 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
+ unit_price,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}
+ #{unitPrice},#{section},#{remark},#{userId},#{roomId},#{layer},#{builtUpArea},#{operate},#{roomNum},#{unitId},#{bId},#{apartment},#{state},
+ #{communityId}
)
</insert>
@@ -18,7 +19,8 @@
<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
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
+ 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 != ''">
@@ -60,6 +62,9 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
</select>
@@ -67,9 +72,9 @@
<!-- 淇濆瓨灏忓尯鎴垮眿淇℃伅鑷� 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
+ unit_price,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.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
from business_building_room t where 1=1
<if test="unitPrice !=null and unitPrice != ''">
and t.unit_price= #{unitPrice}
@@ -108,6 +113,9 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
</insert>
@@ -116,7 +124,8 @@
<select id="getRoomInfo" 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.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
+ 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 != ''">
@@ -165,6 +174,10 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ order by t.create_time desc
<if test="page != -1 and page != null">
limit #{page},#{row}
</if>
@@ -212,6 +225,9 @@
where 1=1
<if test="roomId !=null and roomId != ''">
and t.room_id= #{roomId}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
</if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
@@ -263,6 +279,9 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
</select>
@@ -271,18 +290,14 @@
<!-- 鏌ヨ灏忓尯鎴垮眿鏁伴噺 add by wuxw 2018-07-03 -->
<select id="queryRoomsByCommunityIdCount" parameterType="Map" resultType="Map">
select count(1) count
- FROM building_room t,s_community c,s_community_member cm,building_unit u,f_floor f
+ FROM building_room t,building_unit u,f_floor f
WHERE 1 =1
AND t.`unit_id` = u.`unit_id`
AND u.`floor_id` = f.`floor_id`
- AND f.`floor_id` = cm.`member_id`
- AND cm.`community_id` = c.`community_id`
- AND cm.`member_type_cd` = '390001200004'
- AND c.`status_cd` = '0'
- AND cm.`status_cd` = '0'
+ AND f.`community_id` = t.`community_id`
AND u.`status_cd` = '0'
AND f.`status_cd` = '0'
- AND c.`community_id` = #{communityId}
+ AND t.`community_id` = #{communityId}
<if test="floorId !=null and floorId != ''">
and f.`floor_id`= #{floorId}
</if>
@@ -324,6 +339,9 @@
</if>
<if test="state !=null and state != ''">
and t.state= #{state}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
</if>
@@ -334,22 +352,12 @@
select
count(1) count
FROM
- building_room t,
- s_community c,
- s_community_member cm,
- building_unit u,
- f_floor f
+ 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 building_owner_room_rel borr on borr.`room_id` = t.`room_id` and borr.`status_cd` = '0'
WHERE 1 =1
- AND t.`unit_id` = u.`unit_id`
- AND u.`floor_id` = f.`floor_id`
- AND f.`floor_id` = cm.`member_id`
- AND cm.`community_id` = c.`community_id`
- AND cm.`member_type_cd` = '390001200004'
- AND c.`status_cd` = '0'
- AND cm.`status_cd` = '0'
- AND u.`status_cd` = '0'
- AND f.`status_cd` = '0'
- AND c.`community_id` = #{communityId}
+ AND t.`community_id` = #{communityId}
<if test="floorId !=null and floorId != ''">
and f.`floor_id`= #{floorId}
</if>
@@ -392,11 +400,10 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
- AND NOT EXISTS(
- SELECT 1 FROM building_owner_room_rel borr
- WHERE borr.`status_cd` = '0'
- AND borr.`room_id` = t.`room_id`
- )
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ and borr.`room_id` is null
</select>
@@ -406,22 +413,12 @@
select
count(1) count
FROM
- building_room t,
- s_community c,
- s_community_member cm,
- building_unit u,
- f_floor f
+ 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 building_owner_room_rel borr on borr.`room_id` = t.`room_id` and borr.`status_cd` = '0'
WHERE 1 =1
- AND t.`unit_id` = u.`unit_id`
- AND u.`floor_id` = f.`floor_id`
- AND f.`floor_id` = cm.`member_id`
- AND cm.`community_id` = c.`community_id`
- AND cm.`member_type_cd` = '390001200004'
- AND c.`status_cd` = '0'
- AND cm.`status_cd` = '0'
- AND u.`status_cd` = '0'
- AND f.`status_cd` = '0'
- AND c.`community_id` = #{communityId}
+ AND t.`community_id` = #{communityId}
<if test="floorId !=null and floorId != ''">
and f.`floor_id`= #{floorId}
</if>
@@ -464,11 +461,10 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
- AND EXISTS(
- SELECT 1 FROM building_owner_room_rel borr
- WHERE borr.`status_cd` = '0'
- AND borr.`room_id` = t.`room_id`
- )
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ AND borr.`room_id` is not null
</select>
@@ -478,18 +474,13 @@
SELECT t.unit_price,t.unit_price unitPrice,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,s_community c,s_community_member cm,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 building_owner_room_rel borr on borr.`room_id` = t.`room_id` and borr.`status_cd` = '0'
WHERE 1 =1
- AND t.`unit_id` = u.`unit_id`
- AND u.`floor_id` = f.`floor_id`
- AND f.`floor_id` = cm.`member_id`
- AND cm.`community_id` = c.`community_id`
- AND cm.`member_type_cd` = '390001200004'
- AND c.`status_cd` = '0'
- AND cm.`status_cd` = '0'
- AND u.`status_cd` = '0'
- AND f.`status_cd` = '0'
- AND c.`community_id` = #{communityId}
+ AND t.`community_id` = #{communityId}
<if test="floorId !=null and floorId != ''">
and f.`floor_id`= #{floorId}
</if>
@@ -532,11 +523,10 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
- AND NOT EXISTS(
- SELECT 1 FROM building_owner_room_rel borr
- WHERE borr.`status_cd` = '0'
- AND borr.`room_id` = t.`room_id`
- )
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ and borr.`room_id` is null
<if test="page != -1 and page != null">
limit #{page},#{row}
</if>
@@ -548,18 +538,13 @@
SELECT t.unit_price,t.unit_price unitPrice,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,s_community c,s_community_member cm,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 building_owner_room_rel borr on borr.`room_id` = t.`room_id` and borr.`status_cd` = '0'
WHERE 1 =1
- AND t.`unit_id` = u.`unit_id`
- AND u.`floor_id` = f.`floor_id`
- AND f.`floor_id` = cm.`member_id`
- AND cm.`community_id` = c.`community_id`
- AND cm.`member_type_cd` = '390001200004'
- AND c.`status_cd` = '0'
- AND cm.`status_cd` = '0'
- AND u.`status_cd` = '0'
- AND f.`status_cd` = '0'
- AND c.`community_id` = #{communityId}
+ AND t.`community_id` = #{communityId}
<if test="floorId !=null and floorId != ''">
and f.`floor_id`= #{floorId}
</if>
@@ -602,11 +587,10 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
- AND EXISTS(
- SELECT 1 FROM building_owner_room_rel borr
- WHERE borr.`status_cd` = '0'
- AND borr.`room_id` = t.`room_id`
- )
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ AND borr.`room_id` is not null
<if test="page != -1 and page != null">
limit #{page},#{row}
</if>
@@ -620,18 +604,14 @@
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,s_community c,s_community_member cm,building_unit u,f_floor f
+ FROM building_room t,building_unit u,f_floor f
WHERE 1 =1
AND t.`unit_id` = u.`unit_id`
AND u.`floor_id` = f.`floor_id`
- AND f.`floor_id` = cm.`member_id`
- AND cm.`community_id` = c.`community_id`
- AND cm.`member_type_cd` = '390001200004'
- AND c.`status_cd` = '0'
- AND cm.`status_cd` = '0'
+ AND f.`community_id` = t.`community_id`
AND u.`status_cd` = '0'
AND f.`status_cd` = '0'
- AND c.`community_id` = #{communityId}
+ AND t.`community_id` = #{communityId}
<if test="floorId !=null and floorId != ''">
and f.`floor_id`= #{floorId}
</if>
@@ -653,6 +633,12 @@
<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="layer !=null and layer != ''">
and t.layer= #{layer}
</if>
@@ -673,6 +659,9 @@
</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}
@@ -734,4 +723,4 @@
and bo.owner_type_cd= #{ownerTypeCd}
</if>
</select>
-</mapper>
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0