From 65763d38cf9b6b8067a293d9c99297efea0de3e3 Mon Sep 17 00:00:00 2001
From: 928255095 <928255095@qq.com>
Date: 星期二, 07 九月 2021 22:04:15 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' into 'master'
---
java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml | 482 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 350 insertions(+), 132 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 9df3e4f..b299091
--- a/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
@@ -7,23 +7,28 @@
<!-- 淇濆瓨灏忓尯鎴垮眿淇℃伅 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,
+ room_type,room_sub_type,room_rent,room_area,start_time,end_time
) values (
- #{unitPrice},#{section},#{remark},#{userId},#{roomId},#{layer},#{builtUpArea},#{operate},#{roomNum},#{unitId},#{bId},#{apartment},#{state},#{communityId}
+ #{feeCoefficient},#{section},#{remark},#{userId},#{roomId},#{layer},#{builtUpArea},#{operate},#{roomNum},#{unitId},#{bId},#{apartment},#{state},
+ #{communityId},#{roomType},#{roomSubType},#{roomRent},#{roomArea},#{startTime},#{endTime}
)
</insert>
<!-- 鏌ヨ灏忓尯鎴垮眿淇℃伅锛圔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
+ 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,t.start_time,t.start_time startTime,t.end_time,t.end_time endTime
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}
@@ -61,22 +66,35 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
+ <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="startTime !=null">
+ and t.start_time= #{startTime}
+ </if>
+ <if test="endTime !=null">
+ and t.end_time= #{endTime}
+ </if>
</select>
<!-- 淇濆瓨灏忓尯鎴垮眿淇℃伅鑷� 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,
+ room_type,room_sub_type,room_rent,room_area,start_time,end_time
) 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,
+ t.room_type,t.room_sub_type,t.room_rent,t.room_area,t.start_time,t.end_time
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}
@@ -112,23 +130,35 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
+ <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="startTime !=null">
+ and t.start_time= #{startTime}
+ </if>
+ <if test="endTime !=null">
+ and t.end_time= #{endTime}
+ </if>
</insert>
-
<!-- 鏌ヨ灏忓尯鎴垮眿淇℃伅 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
+ 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,
+ t.start_time,t.start_time startTime,t.end_time,t.end_time endTime
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}
@@ -145,7 +175,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=",">
@@ -173,17 +202,26 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
+ <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="startTime !=null">
+ and t.start_time= #{startTime}
+ </if>
+ <if test="endTime !=null">
+ and t.end_time= #{endTime}
</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">
@@ -191,8 +229,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}
@@ -221,6 +259,21 @@
<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>
+ <if test="startTime !=null">
+ , t.start_time= #{startTime}
+ </if>
+ <if test="endTime !=null">
+ , t.end_time= #{endTime}
+ </if>
where 1=1
<if test="roomId !=null and roomId != ''">
and t.room_id= #{roomId}
@@ -231,7 +284,6 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
-
</update>
<!-- 鏌ヨ灏忓尯鎴垮眿鏁伴噺 add by wuxw 2018-07-03 -->
@@ -239,8 +291,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}
@@ -281,27 +333,36 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
-
-
+ <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="startTime !=null">
+ and t.start_time= #{startTime}
+ </if>
+ <if test="endTime !=null">
+ and t.end_time= #{endTime}
+ </if>
</select>
-
<!-- 鏌ヨ灏忓尯鎴垮眿鏁伴噺 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}
+ and t.status_cd ='0'
<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}
@@ -311,9 +372,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}
@@ -339,11 +397,33 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
+ <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=",">
+ #{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>
+ <if test="startTime !=null">
+ and t.start_time= #{startTime}
+ </if>
+ <if test="endTime !=null">
+ and t.end_time= #{endTime}
+ </if>
</select>
<!-- 鏌ヨ灏忓尯鎴垮眿鏁伴噺 add by wuxw 2018-07-03 -->
@@ -351,21 +431,18 @@
select
count(1) count
FROM
- building_room t,
- 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.`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}
@@ -403,16 +480,22 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
+ <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 NOT EXISTS(
- SELECT 1 FROM building_owner_room_rel borr
- WHERE borr.`status_cd` = '0'
- AND borr.`room_id` = t.`room_id`
- )
-
-
+ <if test="startTime !=null">
+ and t.start_time= #{startTime}
+ </if>
+ <if test="endTime !=null">
+ and t.end_time= #{endTime}
+ </if>
+ and borr.`room_id` is null
</select>
<!-- 鏌ヨ灏忓尯鎴垮眿鏁伴噺 add by wuxw 2018-07-03 -->
@@ -420,21 +503,18 @@
select
count(1) count
FROM
- building_room t,
- 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.`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}
@@ -472,37 +552,46 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
+ <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 EXISTS(
- SELECT 1 FROM building_owner_room_rel borr
- WHERE borr.`status_cd` = '0'
- AND borr.`room_id` = t.`room_id`
- )
-
-
+ <if test="startTime !=null">
+ and t.start_time= #{startTime}
+ </if>
+ <if test="endTime !=null">
+ and t.end_time= #{endTime}
+ </if>
+ AND borr.`room_id` is not null
</select>
<!-- 鏌ヨ灏忓尯鎴垮眿淇℃伅 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 building_room t,building_unit u,f_floor f
+ 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,t.start_time,t.start_time startTime,t.end_time,t.end_time endTime
+ 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 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}
@@ -540,38 +629,48 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
+ <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 NOT EXISTS(
- SELECT 1 FROM building_owner_room_rel borr
- WHERE borr.`status_cd` = '0'
- AND borr.`room_id` = t.`room_id`
- )
+ <if test="startTime !=null">
+ and t.start_time= #{startTime}
+ </if>
+ <if test="endTime !=null">
+ and t.end_time= #{endTime}
+ </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 -->
<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 building_room t,building_unit u,f_floor f
+ 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.start_time,t.start_time startTime,t.end_time,t.end_time endTime
+ 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.`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}
@@ -609,40 +708,56 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
+ <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 EXISTS(
- SELECT 1 FROM building_owner_room_rel borr
- WHERE borr.`status_cd` = '0'
- AND borr.`room_id` = t.`room_id`
- )
+ <if test="startTime !=null">
+ and t.start_time= #{startTime}
+ </if>
+ <if test="endTime !=null">
+ and t.end_time= #{endTime}
+ </if>
+ AND borr.`room_id` is not null
<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">
- 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,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.start_time,t.start_time startTime,t.end_time,t.end_time endTime
+ 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.`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 t.`community_id` = #{communityId}
+ </if>
<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}
@@ -652,9 +767,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}
@@ -668,6 +780,12 @@
<if test="layer !=null and layer != ''">
and t.layer= #{layer}
</if>
+ <if test="layers != null">
+ and t.layer in
+ <foreach collection="layers" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
<if test="builtUpArea !=null and builtUpArea != ''">
and t.built_up_area= #{builtUpArea}
</if>
@@ -676,6 +794,9 @@
</if>
<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}
@@ -686,22 +807,43 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
+ <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=",">
+ #{item}
+ </foreach>
+ </if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
+ <if test="startTime !=null">
+ and t.start_time= #{startTime}
+ </if>
+ <if test="endTime !=null">
+ and t.end_time= #{endTime}
+ </if>
+ order by f.floor_num ,u.unit_num,t.room_num
<if test="page != -1 and page != null">
limit #{page},#{row}
</if>
-
</select>
<!-- 鏍规嵁涓氫富鏌ヨ鎴垮眿淇℃伅 -->
<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
+ 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.start_time,t.start_time startTime,t.end_time ,t.end_time endTime
FROM
building_owner bo,building_room t,building_owner_room_rel borr,building_unit u,f_floor f
WHERE
@@ -711,10 +853,18 @@
AND u.`floor_id` = f.`floor_id`
AND u.`status_cd` = '0'
AND f.`status_cd` = '0'
- AND borr.`status_cd` = '0'
AND t.`status_cd` = '0'
AND bo.`status_cd` = '0'
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}
+ </if>
<if test="sex !=null ">
and bo.sex= #{sex}
</if>
@@ -724,9 +874,9 @@
<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>
@@ -748,5 +898,73 @@
<if test="ownerTypeCd !=null and ownerTypeCd != ''">
and bo.owner_type_cd= #{ownerTypeCd}
</if>
+ <if test="startTime !=null">
+ and t.start_time= #{startTime}
+ </if>
+ <if test="endTime !=null">
+ and t.end_time= #{endTime}
+ </if>
</select>
-</mapper>
+
+ <!-- 鏌ヨ灏忓尯鎴垮眿淇℃伅 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,
+ 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,
+ t.start_time,t.start_time startTime,t.end_time,t.end_time endTime
+ 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="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="startTime !=null">
+ and t.start_time= #{startTime}
+ </if>
+ <if test="endTime !=null">
+ and t.end_time= #{endTime}
+ </if>
+ <if test="page != -1 and page != null">
+ limit #{page},#{row}
+ </if>
+ </select>
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0