From 1cd545d974e58c8cc01433d793207de9e59fd4ae Mon Sep 17 00:00:00 2001 From: lujiang Date: Fri, 27 Sep 2024 01:03:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ics/admin/controller/MeetingReservationController.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java index 91a83cd..62c517c 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java @@ -163,6 +163,9 @@ public class MeetingReservationController extends BaseController { MeetingReservation meetingReservation = new MeetingReservation(); BeanUtils.copyBeanProp(meetingReservation, meetingReservationDTO.getMr()); if (meetingReservation.getTimeFormat() > 0) { + String bookingDate = DateUtils.dateTime(meetingReservation.getStart()); + if (!bookingDate.equals(meetingReservationDTO.getMr().getMrdate())) + return R.error("预约日期与会议时间不符！"); Date start = convert(meetingReservationDTO.getMr().getMrdate(), meetingReservation.getTimeFormat(), true); Date end = convert(meetingReservationDTO.getMr().getMrdate(), meetingReservation.getTimeFormat(), false); if (start == null || end == null) return R.error("预约时间解析错误"); @@ -230,6 +233,8 @@ public class MeetingReservationController extends BaseController { BeanUtils.copyBeanProp(meetingReservation, meetingReservationDTO.getMr()); meetingReservation.setStatus(status);//防止用户端修改预约记录状态 if (meetingReservation.getTimeFormat() > 0) {//非任意时间 + if (!DateUtils.dateTime(meetingReservation.getStart()).equals(meetingReservationDTO.getMr().getMrdate())) + return R.error("预约日期与会议时间不符！"); Date start = convert(meetingReservationDTO.getMr().getMrdate(), meetingReservation.getTimeFormat(), true); Date end = convert(meetingReservationDTO.getMr().getMrdate(), meetingReservation.getTimeFormat(), false); meetingReservation.getParams().put("startTime",start);