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/RoomServiceDaoImplMapper.xml | 161 +++++++++++++++++++++++++++++++----------------------
1 files changed, 94 insertions(+), 67 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index fb1407a..2818fe9
--- a/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
@@ -6,13 +6,12 @@
<!-- 淇濆瓨灏忓尯鎴垮眿淇℃伅 add by wuxw 2018-07-03 -->
<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
- ) values (
- #{feeCoefficient},#{section},#{remark},#{userId},#{roomId},#{layer},#{builtUpArea},#{operate},#{roomNum},#{unitId},#{bId},#{apartment},#{state},
- #{communityId},#{roomType}
- )
+ 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_sub_type, room_rent, room_area)
+ values (#{feeCoefficient}, #{section}, #{remark}, #{userId}, #{roomId}, #{layer}, #{builtUpArea}, #{operate},
+ #{roomNum}, #{unitId}, #{bId}, #{apartment}, #{state},
+ #{communityId}, #{roomType}, #{roomSubType}, #{roomRent}, #{roomArea})
</insert>
@@ -22,7 +21,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 != ''">
@@ -33,9 +34,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}
@@ -67,6 +65,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 +79,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}
@@ -92,9 +93,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>
@@ -123,19 +122,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 != ''">
@@ -150,13 +151,10 @@
<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>
-
<if test="roomIds != null">
and t.room_id in
<foreach collection="roomIds" item="item" open="(" close=")" separator=",">
@@ -187,17 +185,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 +234,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 +253,6 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
-
</update>
<!-- 鏌ヨ灏忓尯鎴垮眿鏁伴噺 add by wuxw 2018-07-03 -->
@@ -265,9 +272,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>
@@ -298,10 +303,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 +323,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 +335,6 @@
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
</if>
-
<if test="roomId !=null and roomId != ''">
and t.room_id= #{roomId}
</if>
@@ -342,6 +346,9 @@
</if>
<if test="roomNum !=null and roomNum != ''">
and t.room_num= #{roomNum}
+ </if>
+ <if test="roomNumLike !=null and roomNumLike != ''">
+ and t.`room_num` like concat('%', #{roomNumLike},'%')
</if>
<if test="unitId !=null and unitId != ''">
and t.unit_id= #{unitId}
@@ -358,6 +365,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,14 +377,12 @@
<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>
@@ -405,9 +413,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>
@@ -435,12 +441,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 -->
@@ -470,9 +477,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>
@@ -500,12 +505,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 +519,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'
@@ -538,9 +546,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>
@@ -568,14 +574,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 +593,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'
@@ -608,9 +618,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>
@@ -638,6 +646,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 +656,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,12 +665,16 @@
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,t.`community_id` communityId
+ 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
<if test="floorId !=null and floorId != ''">
AND t.`community_id` = #{communityId}
@@ -708,6 +721,9 @@
<if test="roomNum !=null and roomNum != ''">
and t.room_num= #{roomNum}
</if>
+ <if test="roomNumLike !=null and roomNumLike != ''">
+ and t.`room_num` like concat('%', #{roomNumLike},'%')
+ </if>
<if test="unitId !=null and unitId != ''">
and t.unit_id= #{unitId}
</if>
@@ -726,6 +742,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=",">
@@ -735,11 +754,11 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
- order by f.floor_num ,u.unit_num,t.room_num
+
+ order by f.floor_num ,u.unit_num,t.layer,t.room_num
<if test="page != -1 and page != null">
limit #{page},#{row}
</if>
-
</select>
<!-- 鏍规嵁涓氫富鏌ヨ鎴垮眿淇℃伅 -->
@@ -749,7 +768,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,bo.name ownerName
FROM
building_owner bo,building_room t,building_owner_room_rel borr,building_unit u,f_floor f
WHERE
@@ -765,6 +786,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="statusCd !=null and statusCd != ''">
and borr.`status_cd` = #{statusCd}
</if>
@@ -773,6 +797,9 @@
</if>
<if test="name !=null and name != ''">
and bo.name= #{name}
+ </if>
+ <if test="ownerNameLike !=null and ownerNameLike != ''">
+ and bo.name like concat('%',#{ownerNameLike},'%')
</if>
<if test="link !=null and link != ''">
and bo.link= #{link}
@@ -789,9 +816,6 @@
<if test="bId !=null and bId != ''">
and bo.b_id= #{bId}
</if>
- <if test="userId !=null and userId != ''">
- and bo.user_id= #{userId}
- </if>
<if test="age !=null and age != ''">
and bo.age= #{age}
</if>
@@ -803,7 +827,6 @@
</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
@@ -811,6 +834,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'
@@ -847,12 +872,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