From 17fe60cacd5c6f944cb0a5f3da3ae0a90832e3b4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 28 六月 2024 17:05:14 +0800
Subject: [PATCH] 代码初始化
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 14 ++++++++++----
1 files changed, 10 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 08a1744..d9f45e3 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
@@ -199,6 +199,14 @@
List<Bookings> bookList = bookingsJoinMapper.selectJoinList(Bookings.class, bookquery);
for (int i = 0; i < bookings.getBookingTimeList().size(); i++) {
BookingTime s = bookings.getBookingTimeList().get(i);
+ RoomTime roomTime = roomTimeJoinMapper.selectById(s.getTimeId());
+ if(Objects.isNull(roomTime)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀛樺湪鏈煡璇㈠埌鐨勯厤缃棩鏈燂紝璇峰埛鏂伴噸璇�");
+ }
+ String endRoomTime = gsDate + " " + roomTime.getEndTime()+":00";
+ if(DateUtil.StringToDate(endRoomTime, "yyyy-MM-dd HH:mm:ss").getTime()<=System.currentTimeMillis()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),endRoomTime + "宸茶秴杩囧綋鍓嶆椂闂达紝鏃犳硶杩涜棰勭害");
+ }
if (!Objects.isNull(bookList) && bookList.size() > MeetConstants.ZERO) {
List<Bookings> detailDataDtoStream =
bookList.stream().filter(a -> MeetConstants.equalsInteger(s.getTimeId(), a.getRoomTimeId())
@@ -213,7 +221,6 @@
.filter(a -> MeetConstants.equalsInteger(a.getRoomTimeId(), s.getTimeId()))
.collect(Collectors.toList());
if (chriList.size() > 0) {
- RoomTime roomTime = roomTimeJoinMapper.selectById(s.getTimeId());
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ細璁細" + roomTime.getStartTime() + "-" + roomTime.getEndTime() + "鏃堕棿娈靛唴宸茶浣跨敤");
}
} else {
@@ -223,7 +230,6 @@
.filter(a -> MeetConstants.equalsInteger(a.getRoomTimeId(), s.getTimeId()))
.collect(Collectors.toList());
if (chriList.size() > 0) {
- RoomTime roomTime = roomTimeJoinMapper.selectById(s.getTimeId());
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ細璁細" + roomTime.getStartTime() + "-" + roomTime.getEndTime() + "鏃堕棿娈靛唴宸茶浣跨敤");
}
}
@@ -745,7 +751,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));
}
@@ -1131,7 +1137,7 @@
public IPage<UserResponse> getUserPage(PageWrap<UserPageRequest> pageWrap) {
IPage<UserResponse> page = systemUserMapper.getUserPage(pageWrap.toPage(),new QueryWrapper<UserResponse>()
.and(StringUtils.isNotBlank(pageWrap.getModel().getKeyword()), i -> i.like("c.realName", pageWrap.getModel().getKeyword())
- .or().like("e.name", pageWrap.getModel().getKeyword())
+ .or().like("d.COMPANY_NAME_PATH", pageWrap.getModel().getKeyword())
)
.eq("c.DELETED",0)
.eq("c.status",0)
--
Gitblit v1.9.3