From fade00186ed05044a32e7b3b1cc7b7bbcf25d8f8 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期二, 11 三月 2025 20:16:28 +0800 Subject: [PATCH] 代码初始化 --- server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 10 +++++++--- 1 files changed, 7 insertions(+), 3 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 c861c15..1ef9156 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(); @@ -1578,7 +1580,8 @@ .replace("{鍙備細浜哄憳濮撳悕}",StringUtils.defaultString(i.getRealName(),"")) .replace("{浼氳涓婚}",StringUtils.defaultString(bookings.getName(),"")) .replace("{浼氳瀹ゅ悕绉皚",StringUtils.defaultString(bookings.getRoomName(),"")) - .replace("{浼氳鏃堕棿娈祡",StringUtils.defaultString(timeInfo,""))); + .replace("{浼氳鏃堕棿娈祡",StringUtils.defaultString(timeInfo,"")) + .replace("{浼氳澶囨敞}",StringUtils.defaultString(bookings.getRemark(),""))); smsEmailList.add(smsEmail); } } @@ -1604,6 +1607,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