From 884a6cfe6edb6fd42322a9c86dc63a36153a3e29 Mon Sep 17 00:00:00 2001 From: myxz Date: Tue, 6 May 2025 14:50:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E3=80=81=E4=BF=AE=E6=94=B9=E5=AE=89=E5=8D=93=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E9=80=BB=E8=BE=91-20250506?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/admin/meeting/ReservationMapper.xml | 2 +- .../src/main/java/com/ics/quartz/task/MeetingStatusTask.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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();