From 4cdff25609300b4613aa2539c8b04976df65bc33 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 05 六月 2024 18:28:33 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 6 ++----
1 files changed, 2 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 5c94572..021421e 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
@@ -125,7 +125,6 @@
@Transactional(rollbackFor = {BusinessException.class, Exception.class})
public Integer create(Bookings bookings) {
LoginUserInfo user = bookings.getLoginUserInfo();
- user.setId(bookings.getCreator());
isCreateParamValid(bookings, user);
bookings.setCreateDate(new Date());
bookings.setCreator(user.getId());
@@ -201,7 +200,6 @@
for (int i = 0; i < bookings.getBookingTimeList().size(); i++) {
BookingTime s = bookings.getBookingTimeList().get(i);
if (!Objects.isNull(bookList) && bookList.size() > MeetConstants.ZERO) {
-
List<Bookings> detailDataDtoStream =
bookList.stream().filter(a -> MeetConstants.equalsInteger(s.getTimeId(), a.getRoomTimeId())
).collect(Collectors.toList());
@@ -747,7 +745,7 @@
.apply(" id in ( select u.OBJ_ID from meeting_user_rel u where u.USER_ID = '" + userId + "' and u.ISDELETED = 0 and OBJ_TYPE = 1 ) ")
.eq("ISDELETED",MeetConstants.ZERO)
// .eq("STATUS",MeetConstants.ZERO)
- .apply(" ROOM_ID in ( select r.id from rooms r where r.ISDELETED = 0 and r.STATUS = 0 )")
+ .apply(" ROOM_ID in ( select r.id from meeting_rooms r where r.ISDELETED = 0 and r.STATUS = 0 )")
.like(StringUtils.isNotBlank(dateMsg), "START_TIME", dateMsg));
}
@@ -1145,7 +1143,7 @@
page.getRecords().forEach(j->{
j.setPrefixUrl(path);
if(bookingsMapper.selectCount(new QueryWrapper<Bookings>()
- .exists(" select 1 from meeting_user_rel u where u.OBJ_ID = bookings.id and u.USER_ID = '"+j.getId()+"' and u.OBJ_TYPE = 1 ")
+ .exists(" select 1 from meeting_user_rel u where u.OBJ_ID = meeting_book.id and u.USER_ID = '"+j.getId()+"' and u.OBJ_TYPE = 1 ")
.and(i -> i.between("START_TIME", pageWrap.getModel().getStartTime()+":00",pageWrap.getModel().getEndTime()+":00")
.or().between("END_TIME", pageWrap.getModel().getStartTime()+":00",pageWrap.getModel().getEndTime()+":00")
)
--
Gitblit v1.9.3