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 | 83 +++++++++++++++++++++++++++++++----------
1 files changed, 62 insertions(+), 21 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
index 4a49c87..89f6622 100755
--- a/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
@@ -1,6 +1,5 @@
<?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">
@@ -13,7 +12,6 @@
#{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">
@@ -71,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">
@@ -93,7 +89,6 @@
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
</if>
-
<if test="roomId !=null and roomId != ''">
and t.room_id= #{roomId}
</if>
@@ -173,6 +168,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="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
@@ -191,7 +192,6 @@
<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}
@@ -272,7 +272,6 @@
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
</if>
-
<if test="roomId !=null and roomId != ''">
and t.room_id= #{roomId}
</if>
@@ -287,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}
@@ -306,7 +311,6 @@
<if test="roomSubType !=null and roomSubType != ''">
and t.room_sub_type= #{roomSubType}
</if>
-
</select>
<!-- 鏌ヨ灏忓尯鎴垮眿鏁伴噺 add by wuxw 2018-07-03 -->
@@ -353,6 +357,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="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
@@ -383,7 +393,6 @@
<if test="unitNum !=null and unitNum != ''">
and u.unit_num= #{unitNum}
</if>
-
</select>
<!-- 鏌ヨ灏忓尯鎴垮眿鏁伴噺 add by wuxw 2018-07-03 -->
@@ -413,7 +422,6 @@
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
</if>
-
<if test="roomId !=null and roomId != ''">
and t.room_id= #{roomId}
</if>
@@ -428,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}
@@ -477,7 +491,6 @@
<if test="remark !=null and remark != ''">
and t.remark= #{remark}
</if>
-
<if test="roomId !=null and roomId != ''">
and t.room_id= #{roomId}
</if>
@@ -492,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}
@@ -562,6 +581,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="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
@@ -580,7 +605,6 @@
<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}
@@ -634,6 +658,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="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
@@ -666,8 +696,8 @@
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` =
@@ -727,6 +757,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="unitNum !=null and unitNum != ''">
and u.unit_num= #{unitNum}
</if>
@@ -754,8 +790,7 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
-
- order by f.floor_num ,u.unit_num,CONVERT(t.layer,SIGNED),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>
@@ -804,9 +839,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>
@@ -825,6 +860,7 @@
<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 -->
@@ -835,7 +871,6 @@
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'
@@ -866,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>
--
Gitblit v1.8.0