From 745d27feae34022ccb708aba034123e08e4e9e14 Mon Sep 17 00:00:00 2001
From: 1098226878@qq.com <1098226878@qq.com>
Date: 星期二, 28 十二月 2021 22:21:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml | 116 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 79 insertions(+), 37 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
index babf9d0..48aa7cb 100755
--- a/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
@@ -8,10 +8,10 @@
<insert id="saveBusinessRoomInfo" parameterType="Map">
insert into business_building_room(
fee_coefficient,section,remark,user_id,room_id,layer,built_up_area,operate,room_num,unit_id,b_id,apartment,state,community_id,
- room_type
+ room_type,room_sub_type,room_rent,room_area
) values (
#{feeCoefficient},#{section},#{remark},#{userId},#{roomId},#{layer},#{builtUpArea},#{operate},#{roomNum},#{unitId},#{bId},#{apartment},#{state},
- #{communityId},#{roomType}
+ #{communityId},#{roomType},#{roomSubType},#{roomRent},#{roomArea}
)
</insert>
@@ -22,7 +22,9 @@
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,t.room_type,t.room_type roomType
+ communityId,t.room_type,t.room_type roomType,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type
+ roomSubType,
+ t.room_rent roomRent,t.room_area roomArea
from business_building_room t
where 1 =1
<if test="feeCoefficient !=null and feeCoefficient != ''">
@@ -67,6 +69,9 @@
<if test="roomType !=null and roomType != ''">
and t.room_type= #{roomType}
</if>
+ <if test="roomSubType !=null and roomSubType != ''">
+ and t.room_sub_type= #{roomSubType}
+ </if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
@@ -78,10 +83,10 @@
<insert id="saveRoomInfoInstance" parameterType="Map">
insert into building_room(
fee_coefficient,section,status_cd,remark,user_id,room_id,layer,built_up_area,room_num,unit_id,b_id,apartment,state,community_id,
- room_type
+ room_type,room_sub_type,room_rent,room_area
) select
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,
- t.room_type
+ t.room_type,t.room_sub_type,t.room_rent,t.room_area
from business_building_room t where 1=1
<if test="feeCoefficient !=null and feeCoefficient != ''">
and t.fee_coefficient= #{feeCoefficient}
@@ -123,19 +128,21 @@
<if test="roomType !=null and roomType != ''">
and t.room_type= #{roomType}
</if>
+ <if test="roomSubType !=null and roomSubType != ''">
+ and t.room_sub_type= #{roomSubType}
+ </if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
-
</insert>
-
<!-- 鏌ヨ灏忓尯鎴垮眿淇℃伅 add by wuxw 2018-07-03 -->
<select id="getRoomInfo" 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,t.community_id,t.community_id communityId,t.room_type,t.room_type roomType
+ bId,t.apartment,t.state,t.community_id,t.community_id communityId,t.room_type,t.room_type roomType,
+ t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea
from building_room t
where 1 =1
<if test="feeCoefficient !=null and feeCoefficient != ''">
@@ -156,7 +163,6 @@
<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=",">
@@ -187,17 +193,18 @@
<if test="roomType !=null and roomType != ''">
and t.room_type= #{roomType}
</if>
+ <if test="roomSubType !=null and roomSubType != ''">
+ and t.room_sub_type= #{roomSubType}
+ </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>
-
-
</select>
-
<!-- 淇敼灏忓尯鎴垮眿淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateRoomInfoInstance" parameterType="Map">
@@ -235,6 +242,15 @@
<if test="state !=null and state != ''">
, t.state= #{state}
</if>
+ <if test="roomSubType !=null and roomSubType != ''">
+ , t.room_sub_type= #{roomSubType}
+ </if>
+ <if test="roomRent !=null and roomRent != ''">
+ , t.room_rent= #{roomRent}
+ </if>
+ <if test="roomArea !=null and roomArea != ''">
+ , t.room_area= #{roomArea}
+ </if>
where 1=1
<if test="roomId !=null and roomId != ''">
and t.room_id= #{roomId}
@@ -245,7 +261,6 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
-
</update>
<!-- 鏌ヨ灏忓尯鎴垮眿鏁伴噺 add by wuxw 2018-07-03 -->
@@ -298,10 +313,11 @@
<if test="roomType !=null and roomType != ''">
and t.room_type= #{roomType}
</if>
-
-
+ <if test="roomSubType !=null and roomSubType != ''">
+ and t.room_sub_type= #{roomSubType}
+ </if>
+
</select>
-
<!-- 鏌ヨ灏忓尯鎴垮眿鏁伴噺 add by wuxw 2018-07-03 -->
<select id="queryRoomsByCommunityIdCount" parameterType="Map" resultType="Map">
@@ -317,7 +333,6 @@
<if test="floorId !=null and floorId != ''">
and f.`floor_id`= #{floorId}
</if>
-
<if test="feeCoefficient !=null and feeCoefficient != ''">
and t.fee_coefficient= #{feeCoefficient}
</if>
@@ -330,7 +345,6 @@
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
</if>
-
<if test="roomId !=null and roomId != ''">
and t.room_id= #{roomId}
</if>
@@ -358,6 +372,9 @@
<if test="roomType !=null and roomType != ''">
and t.room_type= #{roomType}
</if>
+ <if test="roomSubType !=null and roomSubType != ''">
+ and t.room_sub_type= #{roomSubType}
+ </if>
<if test="states != null">
and t.state in
<foreach collection="states" item="item" open="(" close=")" separator=",">
@@ -367,15 +384,13 @@
<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>
-
-
+
</select>
<!-- 鏌ヨ灏忓尯鎴垮眿鏁伴噺 add by wuxw 2018-07-03 -->
@@ -435,12 +450,13 @@
<if test="roomType !=null and roomType != ''">
and t.room_type= #{roomType}
</if>
+ <if test="roomSubType !=null and roomSubType != ''">
+ and t.room_sub_type= #{roomSubType}
+ </if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
and borr.`room_id` is null
-
-
</select>
<!-- 鏌ヨ灏忓尯鎴垮眿鏁伴噺 add by wuxw 2018-07-03 -->
@@ -500,12 +516,13 @@
<if test="roomType !=null and roomType != ''">
and t.room_type= #{roomType}
</if>
+ <if test="roomSubType !=null and roomSubType != ''">
+ and t.room_sub_type= #{roomSubType}
+ </if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
AND borr.`room_id` is not null
-
-
</select>
<!-- 鏌ヨ灏忓尯鎴垮眿淇℃伅 add by wuxw 2018-07-03 -->
@@ -513,8 +530,10 @@
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,
- t.room_type roomType,t.room_type
+ 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
+ ,t.room_type roomType,t.room_type,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type
+ roomSubType,t.room_rent roomRent,t.room_area roomArea
FROM
building_room t
INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
@@ -568,14 +587,17 @@
<if test="roomType !=null and roomType != ''">
and t.room_type= #{roomType}
</if>
+ <if test="roomSubType !=null and roomSubType != ''">
+ and t.room_sub_type= #{roomSubType}
+ </if>
<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>
-
</select>
<!-- 鏌ヨ灏忓尯鎴垮眿淇℃伅 add by wuxw 2018-07-03 -->
@@ -584,7 +606,8 @@
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,
- t.room_type roomType,t.room_type
+ t.room_type roomType,t.room_type,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent
+ roomRent,t.room_area roomArea
FROM
building_room t
INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
@@ -638,6 +661,9 @@
<if test="roomType !=null and roomType != ''">
and t.room_type= #{roomType}
</if>
+ <if test="roomSubType !=null and roomSubType != ''">
+ and t.room_sub_type= #{roomSubType}
+ </if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
@@ -645,9 +671,7 @@
<if test="page != -1 and page != null">
limit #{page},#{row}
</if>
-
</select>
-
<!-- 鏌ヨ灏忓尯鎴垮眿淇℃伅 add by wuxw 2018-07-03 -->
<select id="getRoomInfoByCommunityId" parameterType="Map" resultType="Map">
@@ -656,14 +680,20 @@
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,f.floor_area floorArea,u.unit_area unitArea,td.name
- stateName,t.room_type roomType,t.room_type
+ stateName,t.room_type roomType,t.room_type,t.`community_id` communityId,td1.`name` roomSubTypeName
+ ,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea
+
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'
+ left join t_dict td1 on t.room_sub_type = td1.status_cd and td1.table_name = 'building_room' and
+ td1.table_columns = 'room_sub_type'
WHERE 1 =1
- AND t.`community_id` = #{communityId}
+ <if test="floorId !=null and floorId != ''">
+ AND t.`community_id` = #{communityId}
+ </if>
<if test="floorId !=null and floorId != ''">
and f.`floor_id`= #{floorId}
</if>
@@ -724,6 +754,9 @@
<if test="roomType !=null and roomType != ''">
and t.room_type= #{roomType}
</if>
+ <if test="roomSubType !=null and roomSubType != ''">
+ and t.room_sub_type= #{roomSubType}
+ </if>
<if test="states != null">
and t.state in
<foreach collection="states" item="item" open="(" close=")" separator=",">
@@ -733,11 +766,11 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
+
order by f.floor_num ,u.unit_num,t.room_num
<if test="page != -1 and page != null">
limit #{page},#{row}
</if>
-
</select>
<!-- 鏍规嵁涓氫富鏌ヨ鎴垮眿淇℃伅 -->
@@ -747,7 +780,9 @@
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,t.room_type roomType,t.room_type
+ unitNum,f.`floor_num` floorNum,t.room_type roomType,t.room_type,f.floor_id floorId
+ ,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea
+
FROM
building_owner bo,building_room t,building_owner_room_rel borr,building_unit u,f_floor f
WHERE
@@ -762,6 +797,9 @@
AND bo.`owner_type_cd` = '1001'
<if test="roomType !=null and roomType != ''">
and t.room_type= #{roomType}
+ </if>
+ <if test="roomSubType !=null and roomSubType != ''">
+ and t.room_sub_type= #{roomSubType}
</if>
<if test="statusCd !=null and statusCd != ''">
and borr.`status_cd` = #{statusCd}
@@ -799,8 +837,8 @@
<if test="ownerTypeCd !=null and ownerTypeCd != ''">
and bo.owner_type_cd= #{ownerTypeCd}
</if>
- </select>
+ </select>
<!-- 鏌ヨ灏忓尯鎴垮眿淇℃伅 add by wuxw 2018-07-03 -->
<select id="getRoomInfos" parameterType="Map" resultType="Map">
@@ -809,6 +847,8 @@
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,
t.room_type roomType,t.room_type,f.floor_num floorNum
+ ,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea
+
FROM
building_room t
INNER JOIN building_unit u on t.`unit_id` = u.`unit_id` and u.`status_cd` = '0'
@@ -845,12 +885,14 @@
<if test="roomType !=null and roomType != ''">
and t.room_type= #{roomType}
</if>
+ <if test="roomSubType !=null and roomSubType != ''">
+ and t.room_sub_type= #{roomSubType}
+ </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