From ea0698e0384aa60d3e2bad7da5efd7ea4fb8cf71 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 08 五月 2025 15:39:42 +0800
Subject: [PATCH] 最新版本541200007
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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..1eb2bb7 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
@@ -1312,18 +1312,22 @@
*/
@Override
public void autoStart(){
- List<Rooms> roomList = roomsMapper.selectList(new QueryWrapper<Rooms>().lambda().eq(Rooms::getIsdeleted,Constants.ZERO).eq(Rooms::getStatus,Constants.ZERO));
+ List<Rooms> roomList = roomsMapper.selectList(new QueryWrapper<Rooms>()
+ .lambda().eq(Rooms::getIsdeleted,Constants.ZERO).eq(Rooms::getStatus,Constants.ZERO));
for (Rooms rooms:roomList) {
//鏌ヨ褰撳墠浼氳瀹ゆ槸鍚﹀瓨鍦ㄨ繘琛屼腑鐨勪細璁�
- if(bookingsMapper.selectCount(new QueryWrapper<Bookings>().lambda().eq(Bookings::getIsdeleted,Constants.ZERO)
- .eq(Bookings::getStatus,Constants.ZERO).isNotNull(Bookings::getStartTimeReal)
+ if(bookingsMapper.selectCount(new QueryWrapper<Bookings>().lambda()
+ .eq(Bookings::getIsdeleted,Constants.ZERO)
+ .eq(Bookings::getStatus,Constants.ZERO)
+ .isNotNull(Bookings::getStartTimeReal)
+ .apply(" DATE_FORMAT(NOW(), '%Y-%m-%d') = DATE_FORMAT(START_TIME, '%Y-%m-%d') ")
)<=Constants.ZERO){
//鏍规嵁浼氳瀹よ幏鍙栧彲浠ュ紑鍚殑浼氳璁板綍锛堢涓�鏉¤褰曪級
Bookings bookings = bookingsMapper.selectOne(new QueryWrapper<Bookings>().lambda()
.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 +1470,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