From c7aab1af5656fd4409d5b5b1c0556fc64fb6617e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 21 四月 2025 11:54:06 +0800
Subject: [PATCH] 代码初始化
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
index bd6110b..709ae96 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
@@ -1323,7 +1323,7 @@
.eq(Bookings::getIsdeleted,Constants.ZERO)
.eq(Bookings::getStatus,Constants.ZERO)
.eq(Bookings::getRoomId,rooms.getId())
- .apply(" now() > START_TIME and now < END_TIME ")
+ .apply(" now() > START_TIME and now() < END_TIME ")
.isNull(Bookings::getStartTimeReal)
.orderByAsc(Bookings::getStartTime)
.last(" limit 1 ")
@@ -1466,7 +1466,10 @@
.eq(Bookings::getIsdeleted, MeetConstants.ZERO)
.eq(Bookings::getStatus, MeetConstants.ZERO)
.eq(Rooms::getId, rooms.getId())
- .apply("to_days(t.start_time) = to_days(now()) and t.end_time > now()")//瀛愭煡璇㈠綋澶╃殑
+ .apply(" ( " +
+ " to_days(t.start_time) = to_days(now()) " +
+ " and ( t.START_TIME_REAL is not null or ( t.end_time > now() and t.START_TIME_REAL is null ) ) " +
+ " ) ")//瀛愭煡璇㈠綋澶╃殑
.orderByAsc(Bookings::getStartTime);
Integer minute =getNearStartMinut();
List<Bookings> meetingList =bookingsMapper.selectJoinList(Bookings.class,queryWrapper);
--
Gitblit v1.9.3