fix

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

@@ -5,6 +5,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.business.dto.TodayBookingQueryDto;
 import org.jeecg.modules.business.entity.BusBookingRooms;
 import org.jeecg.modules.business.entity.BusRoomBookingOrders;
@@ -38,4 +39,6 @@ public interface BusRoomBookingOrdersMapper extends BaseMapper<BusRoomBookingOrd
 
     IPage<KeLiItemVo> getKeLiLiving(IPage<KeLiItemVo> page,String thirdUserId, String hotelId,String keyw,Integer status);
     IPage<KeLiItemVo> getKeBooking(IPage<KeLiItemVo> page,String thirdUserId, String hotelId,String keyw,Integer status);
+    @Select("SELECT o.id from bus_room_booking_orders o inner join bus_booking_rooms br on o.id = br.booking_orders_id inner join ces_room_layout l on l.id = br.room_layout_id where l.hotel_id = #{hotelId} and o.arrival_time >= now() and o.arrival_time <= DATE_ADD(o.arrival_time,interval 1 day)")
+    List<BusRoomBookingOrders> countTodayYD(String hotelId);
 }

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

@@ -70,5 +70,6 @@ public interface IBusRoomBookingOrdersService extends IService<BusRoomBookingOrd
     Boolean updateOrderPrice(UpdateOrderPriceDto info);
     void syncDayOrderFee();
     void syncDayOrderFeeItem(BusRoomsLivingOrder order, CesAllDayPriceRule allDayRule);
+    List<BusRoomBookingOrders> countTodayYD(String hotelId);
 
 }

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

@@ -1702,7 +1702,10 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
         });
 
     }
-
+    @Override
+    public List<BusRoomBookingOrders> countTodayYD(String hotelId) {
+        return  baseMapper.countTodayYD(hotelId);
+    }
     @SneakyThrows
     @Override
     @Transactional(rollbackFor = Exception.class)

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/controller/CesRoomsController.java

@@ -451,15 +451,17 @@ public class CesRoomsController {
             counts.add(Long.valueOf(0));//今日平均房价
         }
         LambdaQueryWrapper<BusRoomsLivingOrder> lambdaQueryWrapper3 = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper3.ge(BusRoomsLivingOrder::getDueOutTime, LocalDate.now());
-        lambdaQueryWrapper3.le(BusRoomsLivingOrder::getDueOutTime, DateUtil.parseDate(dateString));
+        lambdaQueryWrapper3.ge(BusRoomsLivingOrder::getDueOutTime, DateUtil.formatDate(new Date())+" 00:00:00");
+        lambdaQueryWrapper3.eq(BusRoomsLivingOrder::getHotelId, hotelId);
+        lambdaQueryWrapper3.le(BusRoomsLivingOrder::getDueOutTime, DateUtil.formatDate(new Date())+" 23:59:59");
         Long ylCount = busRoomsLivingOrderService.count(lambdaQueryWrapper3);
         counts.add(ylCount);//今日预离
 
         LambdaQueryWrapper<BusRoomBookingOrders> lambdaQueryWrapper4 = new LambdaQueryWrapper<>();
         lambdaQueryWrapper4.ge(BusRoomBookingOrders::getArrivalTime, LocalDate.now());
         lambdaQueryWrapper4.le(BusRoomBookingOrders::getArrivalTime, DateUtil.parseDate(dateString));
-        Long ydCount = busRoomBookingOrdersService.count(lambdaQueryWrapper4);
+
+        Long ydCount =Long.parseLong( busRoomBookingOrdersService.countTodayYD(hotelId).size()+"");
         counts.add(ydCount);//今日预抵
 
         LambdaQueryWrapper<BusRoomsLivingOrder> lambdaQueryWrapper5 = new LambdaQueryWrapper<>();
@@ -469,14 +471,15 @@ public class CesRoomsController {
         });
         lambdaQueryWrapper5.ge(BusRoomsLivingOrder::getDueOutTime, LocalDate.now());
         lambdaQueryWrapper5.le(BusRoomsLivingOrder::getDueOutTime, DateUtil.parseDate(dateString));
+        lambdaQueryWrapper5.eq(BusRoomsLivingOrder::getHotelId, hotelId);
         Long qfCount = busRoomsLivingOrderService.count(lambdaQueryWrapper5);
         counts.add(qfCount);//今日欠费
 
         LambdaQueryWrapper<CesRooms> lambdaQueryWrapper6 = new LambdaQueryWrapper<>();
         lambdaQueryWrapper6.eq(CesRooms::getHotelId, hotelId);
         lambdaQueryWrapper6.eq(CesRooms::getInvalid, false);
-        lambdaQueryWrapper.and(j -> {
-            j.or().eq(CesRooms::getRoomStatus, RoomStatusEnum.LIVE_DIRTY.getKey());
+        lambdaQueryWrapper6.and(j -> {
+            j.eq(CesRooms::getRoomStatus, RoomStatusEnum.LIVE_DIRTY.getKey());
             j.or().eq(CesRooms::getRoomStatus, RoomStatusEnum.EMPTY_DIRTY.getKey());
         });
         Long zfCount = roomsService.count(lambdaQueryWrapper6);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/mapper/CesRoomsMapper.java

@@ -60,7 +60,7 @@ public interface CesRoomsMapper extends BaseMapper<CesRooms> {
     @Select("<script>select\n" +
             "(case room_status when 1 then '空净' when 2 then '空脏' when 3 then '住净' when 4 then '住脏' when 5 then '维修' when 6  then '锁房' else '' end) as name,\n" +
             "count(0) as count\n" +
-            "from ces_rooms where 1=1\n" +
+            "from ces_rooms where 1=1\n and invalid = 0" +
             "<if test='hotelId != null and hotelId !=\"\"'> and hotel_id = #{hotelId} </if>"+
             "group by room_status</script>")
     public List<LivingSourceStatVo> roomLiveStat(@Param("hotelId") String hotelId);