From 18b4216a50a2a6bb5f29149abcc4ac8f1bb2ba89 Mon Sep 17 00:00:00 2001
From: lujiang <ljxuzhou@163.com>
Date: Thu, 3 Oct 2024 12:28:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=AE=A4=E9=A2=84=E7=BA=A6?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E8=BF=87=E5=8E=BB=E7=9A=84=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E9=A2=84=E7=BA=A6=EF=BC=8C=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E5=AE=A4=E7=AD=9B=E9=80=89=E4=BA=BA=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/controller/MeetingReservationController.java |  4 ++++
 .../mapper/admin/MeetingReservationMapper.xml          | 10 ++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

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 4455c08..02c2ab4 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
@@ -173,6 +173,7 @@ public class MeetingReservationController extends BaseController {
             meetingReservation.getParams().put("endTime",end);//根据上、下午、晚上，确定具体时间
         }
         if (meetingReservation.getEnd().getTime() <= meetingReservation.getStart().getTime()) return R.error("预约时间无效");
+        if (meetingReservation.getStart().getTime() <= new Date().getTime()) return R.error("已逝去的时间不能被预约");
         Long userId = getLoginStaffId();
         String result = meetingReservationService.insertMeetingReservation(userId, meetingReservation, meetingReservationDTO.getServe());
         if (IMeetingReservationService.OK.equals(result)) {
@@ -243,6 +244,7 @@ public class MeetingReservationController extends BaseController {
         if (meetingReservation.getStart() == null || meetingReservation.getEnd() == null)
             return R.error("预约时间解析错误");//防止用户端置空预约记录时间
         if (meetingReservation.getEnd().getTime() <= meetingReservation.getStart().getTime()) return R.error("预约时间无效");
+        if (meetingReservation.getStart().getTime() <= new Date().getTime()) return R.error("已逝去的时间不能被预约");
         String result = meetingReservationService.updateMeetingReservation(userId, meetingReservation, meetingReservationDTO.getServe());
         if (IMeetingReservationService.OK.equals(result)) {
             return R.ok("操作成功");
@@ -276,6 +278,8 @@ public class MeetingReservationController extends BaseController {
         meetingReservation.setEnd(meetingReservationDTO.getMr().getEnd());
         meetingReservation.setTimeFormat(0);
         meetingReservation.setTitle("占用");
+        if (meetingReservation.getEnd().getTime() <= meetingReservation.getStart().getTime()) return R.error("预约时间无效");
+        if (meetingReservation.getStart().getTime() <= new Date().getTime()) return R.error("已逝去的时间不能被预约");
         String result = meetingReservationService.beforehand(userId, meetingReservation);
         if (IMeetingReservationService.OK.equals(result)) {
             return R.ok("占用成功");
diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationMapper.xml
index 6a78f69..42d66d1 100644
--- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationMapper.xml
+++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationMapper.xml
@@ -53,10 +53,12 @@
             <if test="floor != null  and floor != ''"> AND room.floor = #{floor}</if>
             <if test="name != null  and name != ''"> AND room.name LIKE CONCAT('%', #{name}, '%')</if>
             <if test="typeName != null  and typeName != ''"> AND room.type_name = #{typeName}</if>
-            <foreach item="dev" collection="devices">
+            <if test="devices != null">
+              <foreach item="dev" collection="devices">
                 AND device LIKE CONCAT('%', #{dev}, '%')
-            </foreach>
-            <if test="capacityNum != null"> AND room.capacity_num = #{capacityNum}</if>
+              </foreach>
+            </if>
+            <if test="capacityNum != null"> AND room.capacity_num &lt;= #{capacityNum}</if>
         order by room_num
     </select>
 
@@ -91,7 +93,7 @@
         <if test="name != null  and name != ''"> AND name LIKE CONCAT('%', #{name}, '%')</if>
         <if test="typeName != null  and typeName != ''"> AND type_name = #{typeName}</if>
         <if test="device != null  and device != ''"> AND room.device LIKE CONCAT('%', #{device}, '%')</if>
-        <if test="capacityNum != null"> AND capacity_num = #{capacityNum}</if>
+        <if test="capacityNum != null"> AND capacity_num &lt;= #{capacityNum}</if>
         <if test="status != null"> AND status = #{status}</if>
         <if test="filterDate != null and filterDate != ''"> AND start LIKE CONCAT(#{filterDate}, '%')</if>
         order by start desc,status