fix 订单状态筛选

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusRoomBookingOrdersMapper.xml

@@ -6,7 +6,7 @@
     <select id="getTodayBookingOrder" resultType="org.jeecg.modules.business.dto.TodayBookingQueryDto">
         select o.id,br.room_id from bus_booking_rooms br inner join
                                     (
-                                        select id from bus_room_booking_orders where DATE_FORMAT(arrival_time,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
+                                        select id from bus_room_booking_orders where booking_status = 1 and DATE_FORMAT(arrival_time,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
                                     ) as o on br.booking_orders_id = o.id
         where br.room_id in
         <foreach collection="roomIds" item="roomId" open="(" close=")" separator=",">

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusRoomBookingOrdersServiceImpl.java

@@ -921,6 +921,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
     public List<FloorBuildingRoomVo> getRealtimeInfo(List<CesRooms> rooms) {
         List<FloorBuildingRoomVo> roomVos = new ArrayList<>();
 //        List<String> bookingOrderIds = rooms.stream().map(s->s.getBookingOrderId()).collect(Collectors.toList());
+        // 这里只获取当天预约的房间预约单，而非上面的那种情况，即：ces_rooms 表中的booking_order_id作废
         List<TodayBookingQueryDto> roomBookingOrders = baseMapper.getTodayBookingOrder(rooms.stream().map(s->s.getId()).collect(Collectors.toList()));
         List<String> bookingOrderIds = roomBookingOrders.stream().map(s->s.getBookingOrderId()).collect(Collectors.toList());
         List<String> livingOrderIds = rooms.stream().map(s->s.getLivingOrderId()).collect(Collectors.toList());