From b6184e2ddf3db37a94f7efb3b619bbc64642a292 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期二, 27 一月 2026 18:12:48 +0800
Subject: [PATCH] Z四

---
 java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml |   46 ++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
index 8d13822..d5209da 100755
--- a/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
@@ -167,6 +167,7 @@
         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
+        left join building_unit bu on bu.unit_id = t.unit_id
         where 1 =1
         <if test="feeCoefficient !=null and feeCoefficient != ''">
             and t.fee_coefficient= #{feeCoefficient}
@@ -182,6 +183,9 @@
         </if>
         <if test="roomId !=null and roomId != ''">
             and t.room_id= #{roomId}
+        </if>
+        <if test="roadName !=null and roadName != ''">
+            and t.road_name= #{roadName}
         </if>
         <if test="roomIds != null">
             and t.room_id in
@@ -200,6 +204,9 @@
         </if>
         <if test="unitId !=null and unitId != ''">
             and t.unit_id= #{unitId}
+        </if>
+        <if test="unitNum !=null and unitNum != ''">
+            and bu.unit_num= #{unitNum}
         </if>
         <if test="unitIds != null">
             and t.unit_id in
@@ -354,6 +361,8 @@
         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 building_owner_room_rel borr on borr.room_id = t.room_id
+        left join building_owner bo on bo.owner_id = borr.owner_id
         WHERE 1 =1
         <if test="communityId !=null and communityId != ''">
             AND t.`community_id` = #{communityId}
@@ -376,6 +385,9 @@
         </if>
         <if test="roomId !=null and roomId != ''">
             and t.room_id= #{roomId}
+        </if>
+        <if test="ownerName != null">
+            and bo.`name` = #{ownerName}
         </if>
         <if test="roomIds != null">
             and t.room_id in
@@ -743,7 +755,18 @@
         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.door_room_num doorRoomNum,t.property_type propertyType,t.property_address propertyAddress,t.house_certificate_no houseCertificateNo,
-        concat(f.floor_num,'-',u.unit_num,'-',t.room_num) roomName
+        concat(f.floor_num,'-',u.unit_num,'-',t.room_num) roomName,
+        t.property_type propertyType,
+        t.property_address propertyAddress,
+        t.house_certificate_no houseCertificateNo,
+        t.road_name roadName,
+        t.buy_date buyDate,
+        t.sell_date sellDate,
+        t.sell_state sellState,
+        t.room_buyer roomBuyer,
+        t.eoc eoc,
+        t.property_certificate_no propertyCertificateNo,
+        t.is_ev_charger_installed isEvChargerInstalled
         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` =
@@ -983,6 +1006,25 @@
          inner join f_floor bf on bu.floor_id = bf.floor_id
          left join building_owner_room_rel borr on borr.room_id = br.room_id
          left join building_owner bo on bo.owner_id = borr.owner_id
-        limit 1,10
+        where 1 = 1
+            <if test="communityId != null">
+                and br.community_id = #{communityId}
+            </if>
+        <if test="floorNum != null">
+            and bf.floor_num = #{floorNum}
+        </if>
+        <if test="unitNum != null">
+            and bu.unit_num = #{unitNum}
+        </if>
+        <if test="roomNum != null">
+            and br.room_num = #{roomNum}
+        </if>
+        <if test="ownerName != null">
+            and bo.`name` = #{ownerName}
+        </if>
+
+        <if test="page != -1 and page != null">
+            limit #{page},#{row}
+        </if>
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0