diff --git a/ics-admin/src/main/resources/mapper/admin/meeting/ReservationMapper.xml b/ics-admin/src/main/resources/mapper/admin/meeting/ReservationMapper.xml index 9455840..accee4b 100644 --- a/ics-admin/src/main/resources/mapper/admin/meeting/ReservationMapper.xml +++ b/ics-admin/src/main/resources/mapper/admin/meeting/ReservationMapper.xml @@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" DATE_FORMAT( start_time, '%Y-%m-%d %H:%i:%S' ) > DATE_FORMAT( NOW(), '%Y-%m-%d %H:%i:%S' ))) and room_content_id =#{id} - and `stauts` = 1 + and (`stauts` = 1 OR `stauts` = 2) ORDER BY start_time ASC diff --git a/ics-quartz/src/main/java/com/ics/quartz/task/MeetingStatusTask.java b/ics-quartz/src/main/java/com/ics/quartz/task/MeetingStatusTask.java index 6b07944..e9e39a7 100644 --- a/ics-quartz/src/main/java/com/ics/quartz/task/MeetingStatusTask.java +++ b/ics-quartz/src/main/java/com/ics/quartz/task/MeetingStatusTask.java @@ -22,7 +22,7 @@ public class MeetingStatusTask { log.info("执行开会结束状态任务"); Reservation reservation = new Reservation(); - reservation.setStatusValue(2); + reservation.setStatusValue(3); List reservations = iReservationService.selectReservationList(reservation); for (Reservation reservation1 : reservations) { Date endDate = reservation1.getEndDate();