From 6051d236a9be26a42ff2f6a42d35a2f4eced67b6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 九月 2024 17:43:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 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 a973cf6..30fc1ea 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
@@ -142,7 +142,7 @@
//鍙戦�佷細璁绾︽垚鍔熼�氱煡
this.sendNotice(bookings, MeetConstants.TWO);
//鍙戦�佸井淇¤闃呴�氱煡
- sendWxMessage.bookingsReservation(systemUserMapper.selectById(bookings.getCreator()), bookings, roomsMapper.selectById(bookings.getRoomId()));
+// sendWxMessage.bookingsReservation(systemUserMapper.selectById(bookings.getCreator()), bookings, roomsMapper.selectById(bookings.getRoomId()));
return bookings.getId();
}
@@ -1124,7 +1124,6 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼氳浠呭彲浠ユ彁鍓�"+beforeMinutes+"鍒嗛挓寮�濮�");
}
//鏌ヨ鏄惁瀛樺湪鍏朵粬鏈紑濮嬬殑浼氳 闃叉棰楃矑搴︿笌鎻愬墠寮�濮嬬殑闂
-
if(bookingsMapper.selectCount(new QueryWrapper<Bookings>()
.lambda()
.apply(" now() < START_TIME and END_TIME <= '" + DateUtil.DateToStr(bookings.getStartTime(),"yyyy-MM-dd HH:mm:ss") +"'" )
@@ -1139,7 +1138,7 @@
if(bookingsMapper.selectCount(new QueryWrapper<Bookings>()
.lambda()
- .apply(" END_TIME > now() and START_TIME < now() ")
+ .apply(" ( END_TIME > now() and START_TIME < now() ) or ( END_TIME > now() and START_TIME_REAL < now() ) ")
.isNotNull(Bookings::getStartTimeReal)
.isNull(Bookings::getDoneDate)
.eq(Bookings::getStatus,Constants.ZERO)
@@ -1254,7 +1253,7 @@
bookingsMapper.updateById(bookings);
this.sendNotice(bookings, MeetConstants.ONE);
//鍙戦�佸井淇￠�氱煡
- sendWxMessage.bookingsStart(systemUserMapper.selectById(bookings.getCreator()), bookings, roomsMapper.selectById(bookings.getRoomId()));
+// sendWxMessage.bookingsStart(systemUserMapper.selectById(bookings.getCreator()), bookings, roomsMapper.selectById(bookings.getRoomId()));
}
}
--
Gitblit v1.9.3