|
@@ -118,7 +118,8 @@
|
|
|
|
|
|
<select id="roomListPage" parameterType="com.idea.buildManage.dto.RoomSearchDto"
|
|
|
resultType="com.idea.buildManage.vo.ParkRoomVo">
|
|
|
- select a.id, a.group_id, a.group_name, a.disc_id, a.disc_name, a.build_id, a.build_name, a.floor, a.room_no,
|
|
|
+ select a.id, a.group_id, d.group_name, a.disc_id, e.name as discName, a.build_id, f.build_num as buildName,
|
|
|
+ a.floor, a.room_no,
|
|
|
IF(b.id is not null, '已匹配', '未匹配') as doorStatus, c.num as personNum
|
|
|
from park_room a
|
|
|
left join park_room_bind_door b on b.park_room_id = a.id
|
|
@@ -127,6 +128,9 @@
|
|
|
from park_room_reservation
|
|
|
group by park_room_id
|
|
|
) c on c.park_room_id = a.id
|
|
|
+ left join park_info d on d.id = a.group_id
|
|
|
+ left join park_floor_disc e on e.id = a.disc_id
|
|
|
+ left join mnp_building f on f.id = a.build_id
|
|
|
<where>
|
|
|
<if test="parkInfoId!=null and parkInfoId!=''">
|
|
|
and a.group_id = #{parkInfoId}
|