From 3a38c84a8d021600ad555ce8e2b0b03b69d274d5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 三月 2025 10:10:08 +0800
Subject: [PATCH] 最新版本541200007
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 14 +++++++++-----
1 files changed, 9 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 f353d3f..e784118 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
@@ -649,7 +649,7 @@
//鏌ヨ鏄惁鏈夋潈闄�
s.setHasRole(getHasRoleByParam(s,userInfo,adminList));
- /* //鏈嶅姟椤�
+ /* //鏈嶅姟椤�
MPJLambdaWrapper<ProjectRel> prquery = new MPJLambdaWrapper<>();
prquery.selectAll(ProjectRel.class);
prquery.eq(ProjectRel::getIsdeleted, MeetConstants.ZERO);
@@ -1091,7 +1091,8 @@
@Override
public MeetingDetailResponse getMeetingDetail(Integer id,Integer sysUserId) {
MeetingDetailResponse meetingDetailResponse = bookingsMapper.meetingDetail(id);
- if (Objects.isNull(meetingDetailResponse)) {
+ if (Objects.isNull(meetingDetailResponse)
+ || Constants.equalsInteger(meetingDetailResponse.getIsdeleted(),Constants.ONE) ) {
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鏈煡璇㈠埌浼氳璇︽儏");
}
//棰勭害浜�
@@ -1184,6 +1185,7 @@
public Integer reservationMeeting(BookingsRequest bookingsRequest) {
Bookings bookings = new Bookings();
BeanUtils.copyProperties(bookingsRequest, bookings);
+ bookings.setJoinNotice(bookingsRequest.getJoinNotice());
if (Objects.isNull(bookingsRequest.getId())) {
this.create(bookings);
return bookings.getId();
@@ -1355,7 +1357,7 @@
.ne(Bookings::getId,bookings.getId())
)>Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪鏈紑鍚細璁紝鏃犳硶寮�濮嬩細璁�");
- };
+ }
if(bookingsMapper.selectCount(new QueryWrapper<Bookings>()
.lambda()
@@ -1366,7 +1368,7 @@
.eq(Bookings::getRoomId,bookings.getRoomId())
)>Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠寮�鍚椂闂翠笌鍏朵粬浼氳瀛樺湪鍐茬獊锛屾棤娉曞紑濮嬩細璁�");
- };
+ }
}else{
if(bookings.getStartTime().getTime() > System.currentTimeMillis()){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈埌浼氳鐢宠寮�濮嬫椂闂达紝鏃犳硶寮�濮�");
@@ -1384,6 +1386,7 @@
.set(Bookings::getDoneInfo,"鍏朵粬浼氳寮�濮嬶紝鑷姩鍏抽棴")
.apply(" ( END_TIME < now() or ( END_TIME > now() and START_TIME < now() and START_TIME_REAL is null ) )")
.eq(Bookings::getStatus,Constants.ZERO)
+ .ne(Bookings::getId,bookings.getId())
.eq(Bookings::getRoomId,bookings.getRoomId())
);
@@ -1579,7 +1582,7 @@
.replace("{浼氳涓婚}",StringUtils.defaultString(bookings.getName(),""))
.replace("{浼氳瀹ゅ悕绉皚",StringUtils.defaultString(bookings.getRoomName(),""))
.replace("{浼氳鏃堕棿娈祡",StringUtils.defaultString(timeInfo,""))
- .replace("{浼氳澶囨敞}",StringUtils.defaultString(smsEmail.getRemark(),"")));
+ .replace("{浼氳澶囨敞}",StringUtils.defaultString(bookings.getRemark(),"鏃�")));
smsEmailList.add(smsEmail);
}
}
@@ -1605,6 +1608,7 @@
.replace("{鍙備細浜哄憳濮撳悕}",StringUtils.defaultString(systemUser.getRealname(),""))
.replace("{浼氳涓婚}",StringUtils.defaultString(bookings.getName(),""))
.replace("{浼氳瀹ゅ悕绉皚",StringUtils.defaultString(bookings.getRoomName(),""))
+ .replace("{浼氳澶囨敞}",StringUtils.defaultString(bookings.getRemark(),"鏃�"))
.replace("{浼氳鏃堕棿娈祡",StringUtils.defaultString(timeInfo,"")));
smsEmailList.add(smsEmail);
}
--
Gitblit v1.9.3