|
|
@@ -139,10 +139,10 @@
|
|
|
and a.build_id = #{mnpBuildingId}
|
|
|
</if>
|
|
|
<if test="roomAddress!=null and roomAddress!=''">
|
|
|
- and concat(a.group_name, a.disc_name, a.build_name, '号', a.room_no, '室') like concat('%',#{roomAddress},'%')
|
|
|
+ and concat(d.group_name, e.name, f.build_num, '号', a.room_no, '室') like concat('%',#{roomAddress},'%')
|
|
|
</if>
|
|
|
</where>
|
|
|
- order by group_name, build_name + 0, room_no + 0
|
|
|
+ order by d.group_name, f.build_num + 0, room_no + 0
|
|
|
</select>
|
|
|
|
|
|
<select id="getReservationByRoomAndTime" resultType="com.idea.buildManage.model.ParkRoomReservation">
|
