From 933534dab22c13d281dd07187ca18021a7e76b40 Mon Sep 17 00:00:00 2001
From: luoyu <mingyuxuezhang@qq.com>
Date: Fri, 23 May 2025 14:19:35 +0800
Subject: [PATCH] =?UTF-8?q?20250523-=E9=A2=84=E7=BA=A6=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A21.=E7=AD=9B=E9=80=89=E5=8A=A0=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E9=80=89=E6=8B=A9=E8=8C=83=E5=9B=B4,2.=E5=89=8D?=
 =?UTF-8?q?=E9=9D=A2=E5=88=97=E8=A1=A8=E5=8A=A0=E5=BA=8F=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/MeetingReservationServiceImpl.java   |  6 +--
 .../com/ics/admin/vo/MeetingRecordVo.java     | 10 +++++
 .../mapper/admin/MeetingReservationMapper.xml | 37 +++++++++++--------
 3 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingReservationServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingReservationServiceImpl.java
index e608ecc..ac7938c 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingReservationServiceImpl.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingReservationServiceImpl.java
@@ -306,9 +306,9 @@ public class MeetingReservationServiceImpl implements IMeetingReservationService
     private List<RepairRemind> processRemind(MeetingReservation meetingReservation, Long currentUserId, String content, Integer status, String voiceWaiter, String serveWaiter) {
         MeetingRoomVo meetingRoom = meetingRoomMapper.selectMeetingRoomById(meetingReservation.getRoomId());
         String remindContent = DateUtils.parseDateToStr("yyyy年MM月dd日 HH:mm", meetingReservation.getStart())
-                        + " ~ " + DateUtils.parseDateToStr("HH:mm", meetingReservation.getEnd())
-                        + "/" + meetingReservation.getTitle()
-                        + "/" + meetingRoom.getRoomNum();
+                + " ~ " + DateUtils.parseDateToStr("HH:mm", meetingReservation.getEnd())
+                + "/" + meetingReservation.getTitle()
+                + "/" + meetingRoom.getRoomNum();
         Date now = new Date();
         List<RepairRemind> list = new ArrayList<>();
         IcsCustomerStaff p = new IcsCustomerStaff();
diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MeetingRecordVo.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MeetingRecordVo.java
index 36b1a15..e62f81d 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MeetingRecordVo.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MeetingRecordVo.java
@@ -27,6 +27,16 @@ public class MeetingRecordVo implements Serializable {
      * 日期查询；格式 2024-09-22
      */
     private String filterDate;
+    
+    /**
+     * 查询起始日期（yyyy-MM-dd）
+     */
+    private String startDate;
+    
+    /**
+     * 查询结束日期（yyyy-MM-dd）
+     */
+    private String endDate;
 
     private Long id;
 
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 014da97..0c3b8c9 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
@@ -41,12 +41,12 @@
     <select id="getAllRoomByType" parameterType="com.ics.admin.vo.MeetingRoomVo" resultType="com.ics.admin.vo.MeetingRoomVo">
         select room.*,case when mr.room_id is null then 0 else 1 end as status from ics_meeting_room room left join
         (
-            select room_id from ics_meeting_reservation where delete_flag = 0 and status &gt; 3
-              <if test="type != null and (type == 'going' or type == 'free')"> AND status = 9 </if>
-            and start LIKE CONCAT(#{mrdate}, '%') group by room_id
+        select room_id from ics_meeting_reservation where delete_flag = 0 and status &gt; 3
+        <if test="type != null and (type == 'going' or type == 'free')"> AND status = 9 </if>
+        and start LIKE CONCAT(#{mrdate}, '%') group by room_id
         ) mr on mr.room_id=room.id
         where
-            room.delete_flag=0
+        room.delete_flag=0
         <if test="type != null and (type == 'already' or type == 'going')"> AND mr.room_id is not null</if>
         <if test="type != null and (type == 'without' or type == 'free')"> AND mr.room_id is null</if>
         <if test="floor != null  and floor != ''"> AND room.floor = #{floor}</if>
@@ -74,15 +74,15 @@
         where
             room.delete_flag=0
         ]]>
-            <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>
-            <if test="devices != null">
-              <foreach item="dev" collection="devices">
+        <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>
+        <if test="devices != null">
+            <foreach item="dev" collection="devices">
                 AND device LIKE CONCAT('%', #{dev}, '%')
-              </foreach>
-            </if>
-            <if test="min != null and max !=null"> and room.capacity_num &gt;= #{min} AND room.capacity_num &lt;= #{max}</if>
+            </foreach>
+        </if>
+        <if test="min != null and max !=null"> and room.capacity_num &gt;= #{min} AND room.capacity_num &lt;= #{max}</if>
         order by room_num
     </select>
 
@@ -97,13 +97,13 @@
     <!-- 分页列表 -->
     <select id="selectMeetingReservationList" parameterType="com.ics.admin.vo.MeetingRecordVo" resultType="com.ics.admin.vo.MeetingRecordVo">
         SELECT mr.id, sn, room_id, start, `end`, time_format, title, person_num, leader, booking_user_name, booking_user_phone, user_org_id, user_org, status, operate, mr.remark, mr.ext1, mr.ext2, mr.ext3, mr.create_time createTime,mr.update_time updateTime,
-                floor_id, floor, name, type_id, type_name, device, room_num, area, capacity_num, content, enable, room.ext1 roomExt1, room.ext2 roomExt2, room.ext3 roomExt3, room.remark roomRemark
+        floor_id, floor, name, type_id, type_name, device, room_num, area, capacity_num, content, enable, room.ext1 roomExt1, room.ext2 roomExt2, room.ext3 roomExt3, room.remark roomRemark
         from ics_meeting_reservation mr inner join ics_meeting_room room on mr.room_id=room.id
         <if test="role == 3">
-          inner join ics_meeting_waiter wa on mr.id=wa.rid
+            inner join ics_meeting_waiter wa on mr.id=wa.rid
         </if>
         where
-          mr.delete_flag=0 and room.delete_flag=0
+        mr.delete_flag=0 and room.delete_flag=0
         <if test="role == 3">
             and wa.delete_flag=0 and wa.user_id=#{userId}
         </if>
@@ -119,7 +119,12 @@
         <if test="device != null  and device != ''"> AND room.device LIKE CONCAT('%', #{device}, '%')</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>
+        <if test="startDate != null and startDate != '' and endDate != null and endDate != ''">
+            AND (start &gt;= CONCAT(#{startDate}, ' 00:00:00') AND start &lt;= CONCAT(#{endDate}, ' 23:59:59'))
+        </if>
+        <if test="filterDate != null and filterDate != '' and (startDate == null or startDate == '')">
+            AND start LIKE CONCAT(#{filterDate}, '%')
+        </if>
         <if test="ext1 != null and ext1 != ''"> AND mr.ext1 is null</if>
         <choose>
             <when test="sort != null and sort == 'create'"> order by mr.create_time desc,status</when>