From 472c137cff6da0abbc78542c02a7cd4e79284060 Mon Sep 17 00:00:00 2001 From: luoyu Date: Thu, 22 May 2025 21:57:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E9=A2=84=E7=BA=A6=E8=AE=B0=E5=BD=95=E4=B8=AD=E7=9A=84=E6=8E=92?= =?UTF-8?q?=E5=BA=8F-20250522=E5=AE=9E=E7=8E=B0=EF=BC=9A=E2=91=A0=E3=80=80?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=8E=92=E5=BA=8F=E8=A7=84=E5=88=99=EF=BC=9A?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=BB=98=E8=AE=A4=E6=8C=89=E3=80=8C=E6=97=A5?= =?UTF-8?q?=E6=9C=9F+=20=E6=97=B6=E6=AE=B5=20+=20=E6=A5=BC=E5=B1=82?= =?UTF-8?q?=E3=80=8D=E9=A1=BA=E5=BA=8F=E6=8E=92=E5=88=97=EF=BC=8C=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B=E5=A6=82=E4=B8=8B=EF=BC=9A=E6=97=A5=E6=9C=9F=EF=BC=9A?= =?UTF-8?q?5=20=E6=9C=88=2015=20=E6=97=A5=EF=BC=88=E5=BD=93=E5=A4=A9?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=EF=BC=89;=E4=B8=8A=E5=8D=88=E6=97=B6?= =?UTF-8?q?=E6=AE=B5=EF=BC=9A=E6=8C=89=E6=A5=BC=E5=B1=82=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E6=8E=92=E5=88=97=EF=BC=88=E5=A6=82101=20=E4=BC=9A=E8=AE=AE?= =?UTF-8?q?=E5=AE=A4=E3=80=81102=20=E4=BC=9A=E8=AE=AE=E5=AE=A4=EF=BC=89;?= =?UTF-8?q?=E4=B8=8B=E5=8D=88=E6=97=B6=E6=AE=B5=EF=BC=9A=E5=BB=B6=E7=BB=AD?= =?UTF-8?q?=E6=A5=BC=E5=B1=82=E9=A1=BA=E5=BA=8F=E9=80=BB=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4=E6=8E=92=E5=88=97=E8=A7=84?= =?UTF-8?q?=E5=88=99=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/admin/MeetingReservationMapper.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 416b5db..014da97 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 @@ -123,7 +123,15 @@ AND mr.ext1 is null order by mr.create_time desc,status - order by start desc,status + + /* 按距离当前日期的接近程度排序，最接近的在前面 */ + order by ABS(DATEDIFF(DATE(start), CURDATE())), + /* 按时间段早晚排序，最早的排在前面 */ + TIME(start) ASC, + /* 按会议室编号排序 */ + room_num + 0 ASC, + status +