Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks

ruoyi-modules/Property/src/main/resources/mapper/Property/TbRoomMapper.xml

@@ -14,4 +14,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         inner join tb_community c on r.community_id=c.id
         where r.id=#{roomId}
     </select>
+
+    <select id="queryRoomNameList" resultType="java.util.Map">
+        select
+            r.id,
+            concat(c.community_name,b.building_name,u.unit_name,f.floor_name,r.room_number)
+            from tb_room r
+        inner join tb_floor f on r.floor_id=f.id
+        inner join tb_unit u on r.unit_id=u.id
+        inner join tb_building b on r.building_id=b.id
+        inner join tb_community c on r.community_id=c.id
+        where r.id IN
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
 </mapper>