From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml | 172 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 95 insertions(+), 77 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
index 0bc7d85..89f6622 100755
--- a/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
@@ -1,20 +1,17 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="roomServiceDaoImpl">
<!-- 淇濆瓨灏忓尯鎴垮眿淇℃伅 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,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 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>
-
<!-- 鏌ヨ灏忓尯鎴垮眿淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
<select id="getBusinessRoomInfo" parameterType="Map" resultType="Map">
@@ -22,7 +19,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,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea
+ 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 +32,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}
@@ -73,9 +69,7 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
-
</select>
-
<!-- 淇濆瓨灏忓尯鎴垮眿淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveRoomInfoInstance" parameterType="Map">
@@ -94,9 +88,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}
@@ -132,9 +123,7 @@
<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">
@@ -157,13 +146,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=",">
@@ -181,6 +167,12 @@
</if>
<if test="unitId !=null and unitId != ''">
and t.unit_id= #{unitId}
+ </if>
+ <if test="unitIds != null">
+ and t.unit_id in
+ <foreach collection="unitIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
@@ -204,10 +196,7 @@
<if test="page != -1 and page != null">
limit #{page},#{row}
</if>
-
-
</select>
-
<!-- 淇敼灏忓尯鎴垮眿淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateRoomInfoInstance" parameterType="Map">
@@ -264,7 +253,6 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
-
</update>
<!-- 鏌ヨ灏忓尯鎴垮眿鏁伴噺 add by wuxw 2018-07-03 -->
@@ -284,9 +272,6 @@
<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>
@@ -301,6 +286,12 @@
</if>
<if test="unitId !=null and unitId != ''">
and t.unit_id= #{unitId}
+ </if>
+ <if test="unitIds != null">
+ and t.unit_id in
+ <foreach collection="unitIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
@@ -320,11 +311,7 @@
<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">
@@ -340,7 +327,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>
@@ -353,7 +339,6 @@
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
</if>
-
<if test="roomId !=null and roomId != ''">
and t.room_id= #{roomId}
</if>
@@ -366,8 +351,17 @@
<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>
+ <if test="unitIds != null">
+ and t.unit_id in
+ <foreach collection="unitIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
@@ -393,15 +387,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>
<!-- 鏌ヨ灏忓尯鎴垮眿鏁伴噺 add by wuxw 2018-07-03 -->
@@ -431,9 +422,6 @@
<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>
@@ -448,6 +436,12 @@
</if>
<if test="unitId !=null and unitId != ''">
and t.unit_id= #{unitId}
+ </if>
+ <if test="unitIds != null">
+ and t.unit_id in
+ <foreach collection="unitIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
@@ -468,8 +462,6 @@
and t.community_id= #{communityId}
</if>
and borr.`room_id` is null
-
-
</select>
<!-- 鏌ヨ灏忓尯鎴垮眿鏁伴噺 add by wuxw 2018-07-03 -->
@@ -499,9 +491,6 @@
<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>
@@ -516,6 +505,12 @@
</if>
<if test="unitId !=null and unitId != ''">
and t.unit_id= #{unitId}
+ </if>
+ <if test="unitIds != null">
+ and t.unit_id in
+ <foreach collection="unitIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
@@ -536,8 +531,6 @@
and t.community_id= #{communityId}
</if>
AND borr.`room_id` is not null
-
-
</select>
<!-- 鏌ヨ灏忓尯鎴垮眿淇℃伅 add by wuxw 2018-07-03 -->
@@ -545,8 +538,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_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea
+ 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'
@@ -570,9 +565,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>
@@ -587,6 +580,12 @@
</if>
<if test="unitId !=null and unitId != ''">
and t.unit_id= #{unitId}
+ </if>
+ <if test="unitIds != null">
+ and t.unit_id in
+ <foreach collection="unitIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
@@ -610,7 +609,6 @@
<if test="page != -1 and page != null">
limit #{page},#{row}
</if>
-
</select>
<!-- 鏌ヨ灏忓尯鎴垮眿淇℃伅 add by wuxw 2018-07-03 -->
@@ -619,7 +617,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_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea
+ 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'
@@ -643,9 +642,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>
@@ -660,6 +657,12 @@
</if>
<if test="unitId !=null and unitId != ''">
and t.unit_id= #{unitId}
+ </if>
+ <if test="unitIds != null">
+ and t.unit_id in
+ <foreach collection="unitIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
@@ -683,9 +686,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">
@@ -695,12 +696,15 @@
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,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
+ ,t.room_sub_type,t.room_rent,t.room_area,t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea,
+ concat(f.floor_num,'-',u.unit_num,'-',t.room_num) roomName
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'
+ 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'
+ 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}
@@ -747,8 +751,17 @@
<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>
+ <if test="unitIds != null">
+ and t.unit_id in
+ <foreach collection="unitIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
<if test="unitNum !=null and unitNum != ''">
and u.unit_num= #{unitNum}
@@ -777,11 +790,10 @@
<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.seq ,u.unit_num,CONVERT(t.layer,SIGNED),CONVERT(t.room_num,SIGNED) asc
<if test="page != -1 and page != null">
limit #{page},#{row}
</if>
-
</select>
<!-- 鏍规嵁涓氫富鏌ヨ鎴垮眿淇℃伅 -->
@@ -792,7 +804,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,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
+ ,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
@@ -820,12 +833,15 @@
<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}
</if>
- <!-- <if test="statusCd !=null and statusCd != ''">-->
- <!-- and bo.status_cd= #{statusCd}-->
- <!-- </if>-->
+ <!--<if test="statusCd !=null and statusCd != ''">
+ and bo.status_cd= #{statusCd}
+ </if>-->
<if test="remark !=null and remark != ''">
and bo.remark= #{remark}
</if>
@@ -834,9 +850,6 @@
</if>
<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}
@@ -847,8 +860,8 @@
<if test="ownerTypeCd !=null and ownerTypeCd != ''">
and bo.owner_type_cd= #{ownerTypeCd}
</if>
+ order by f.floor_num,u.unit_num,t.room_num desc
</select>
-
<!-- 鏌ヨ灏忓尯鎴垮眿淇℃伅 add by wuxw 2018-07-03 -->
<select id="getRoomInfos" parameterType="Map" resultType="Map">
@@ -888,6 +901,12 @@
<if test="unitId !=null and unitId != ''">
and t.unit_id= #{unitId}
</if>
+ <if test="unitIds != null">
+ and t.unit_id in
+ <foreach collection="unitIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
@@ -903,6 +922,5 @@
<if test="page != -1 and page != null">
limit #{page},#{row}
</if>
-
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0