From b88a288f4f787b509463678e3cd9ccfa3f37014b Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期三, 11 三月 2026 12:01:05 +0800
Subject: [PATCH] 导入测试

---
 java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml |   27 +++++++++++++++++++++++----
 1 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
index d5209da..f3cd0fd 100755
--- a/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml
@@ -168,7 +168,11 @@
         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
+        left join f_floor ff on ff.floor_id = bu.floor_id
         where 1 =1
+        <if test="floorNum !=null and floorNum != ''">
+            and ff.floor_num = #{floorNum}
+        </if>
         <if test="feeCoefficient !=null and feeCoefficient != ''">
             and t.fee_coefficient= #{feeCoefficient}
         </if>
@@ -183,6 +187,15 @@
         </if>
         <if test="roomId !=null and roomId != ''">
             and t.room_id= #{roomId}
+        </if>
+        <if test="doorRoomNum !=null and doorRoomNum != ''">
+            and t.door_room_num= #{doorRoomNum}
+        </if>
+        <if test="propertyType !=null and propertyType != ''">
+            and t.property_type= #{propertyType}
+        </if>
+        <if test="propertyAddress !=null and propertyAddress != ''">
+            and t.property_address= #{propertyAddress}
         </if>
         <if test="roadName !=null and roadName != ''">
             and t.road_name= #{roadName}
@@ -365,7 +378,7 @@
         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}
+            AND t.`community_id` in (#{communityId},'9999')
         </if>
         and t.status_cd ='0'
         <if test="floorId !=null and floorId != ''">
@@ -436,9 +449,6 @@
             <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="communityIds != null">
             and t.community_id in
@@ -784,6 +794,9 @@
                 #{item}
             </foreach>
         </if>
+        <if test="roadName !=null and roadName != ''">
+            AND t.`road_name` = #{roadName}
+        </if>
         <if test="floorId !=null and floorId != ''">
             and f.`floor_id`= #{floorId}
         </if>
@@ -826,6 +839,9 @@
         <if test="roomNum !=null and roomNum != ''">
             and t.room_num= #{roomNum}
         </if>
+        <if test="roomNumIsNull != null">
+            and t.room_num = ''
+        </if>
         <if test="roomNumLike !=null and roomNumLike != ''">
             and t.`room_num` like concat('%', #{roomNumLike},'%')
         </if>
@@ -859,6 +875,9 @@
         <if test="roomSubType !=null and roomSubType != ''">
             and t.room_sub_type= #{roomSubType}
         </if>
+        <if test="propertyType !=null and propertyType != ''">
+            and t.property_type= #{propertyType}
+        </if>
         <if test="states != null">
             and t.state in
             <foreach collection="states" item="item" open="(" close=")" separator=",">

--
Gitblit v1.8.0