From 955873b451cadfbc71bf21f4f7f8717d8a10936a Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 19 十二月 2024 19:27:50 +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 | 50 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 44 insertions(+), 6 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 4f08d14..ee12e34 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
@@ -192,6 +192,10 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), ResponseStatus.BAD_REQUEST.getMessage());
}
+ if(Objects.nonNull(bookings.getId())){
+ return;
+ }
+
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd");
String gsDate = format1.format(bookings.getStartTime());
@@ -371,11 +375,18 @@
if(dbBookings.getStatus().equals(MeetConstants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鏈鎿嶄綔澶辫触,棰勭害鐘舵�佸凡娴佽浆");
}
+ Rooms rooms = roomsMapper.selectById(dbBookings.getRoomId());
+ if(rooms==null ){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇ヤ細璁鏆傛椂鏃犳硶棰勭害");
+ }
+ bookings.setRoomName(rooms.getName());
LoginUserInfo user = bookings.getLoginUserInfo();
isCreateParamValid(bookings, user);
bookings.setEditDate(new Date());
bookings.setEditor(user.getId());
bookingsMapper.updateById(bookings);
+ bookings.setManagerInfo(user.getRealname());
+ bookings.setCreator(dbBookings.getCreator());
//鏇存柊浼氳瀹ら瀹氭椂闂存
updateBookingTimes(bookings, user);
//娣诲姞绠＄悊浜哄憳
@@ -386,7 +397,7 @@
//鍙戦�佷細璁�氱煡
if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
this.sendNotice(bookings, MeetConstants.TWO);
- SystemUser systemUser = systemUserMapper.selectById(bookings.getUserId());
+ SystemUser systemUser = systemUserMapper.selectById(bookings.getCreator());
this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ZERO);
}
}
@@ -1054,12 +1065,13 @@
}
bookingsMapper.updateById(bookings);
//鍙栨秷浼氳 鍙戦�佸彇娑堥�氱煡
-// if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
+ if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
// this.sendNotice(bookings, 3);
-// }
- SystemUser systemUser = systemUserMapper.selectById(bookings.getCreator());
- bookings.setManagerInfo(systemUser.getRealname());
- this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ONE);
+ SystemUser systemUser = systemUserMapper.selectById(bookings.getCreator());
+ bookings.setManagerInfo(systemUser.getRealname());
+ this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ONE);
+
+ }
}
@@ -1378,6 +1390,32 @@
}
}
}
+ //缁欏垱寤轰汉鍙戦�佺煭淇′俊鎭�
+ SystemUser systemUser = systemUserMapper.selectById(bookings.getCreator());
+ if(Objects.nonNull(systemUser)){
+ if(userRelList.stream().filter(i->Constants.equalsInteger(i.getUserId(),systemUser.getId())).collect(Collectors.toList()).size()==Constants.ZERO){
+ if (smsConfig!=null && Constants.equalsInteger(smsConfig.getStatus(),Constants.ZERO)){
+ SmsEmail smsEmail = new SmsEmail();
+ //{鍙備細浜哄憳濮撳悕}锛屾偍濂斤紒鎮ㄦ湁涓�涓柊鐨勪細璁紝浼氳涓婚锛歿浼氳涓婚}锛屼細璁湴鐐癸細{浼氳瀹ゅ悕绉皚锛屼細璁椂闂达細{浼氳鏃堕棿娈祡锛岃鎸夋椂鍙傚姞
+ String timeInfo =DateUtil.getFomartDate( bookings.getStartTime(),"MM/dd HH:mm")+"-"
+ +DateUtil.getFomartDate( bookings.getEndTime(),"HH:mm");
+ smsEmail.setPhone(systemUser.getMobile());
+ smsEmail.setRemark("绛夊緟鍙戦��");
+ smsEmail.setStatus(Constants.TWO);//
+ smsEmail.setIsdeleted(Constants.ZERO);
+ smsEmail.setType(Constants.ZERO);
+ smsEmail.setObjId(bookings.getId());
+ smsEmail.setCreateDate(new Date());
+ smsEmail.setTitle("浼氳瀹ょ敵璇峰弬浼氶�氱煡");
+ smsEmail.setContent(StringUtils.defaultString(smsConfig.getContent(),"")
+ .replace("{鍙備細浜哄憳濮撳悕}",StringUtils.defaultString(systemUser.getRealname(),""))
+ .replace("{浼氳涓婚}",StringUtils.defaultString(bookings.getName(),""))
+ .replace("{浼氳瀹ゅ悕绉皚",StringUtils.defaultString(bookings.getRoomName(),""))
+ .replace("{浼氳鏃堕棿娈祡",StringUtils.defaultString(timeInfo,"")));
+ smsEmailList.add(smsEmail);
+ }
+ }
+ }
//缁欏弬浼氫汉鍛樻彃鍏�
Notices notices = new Notices(noticeObjectType,bookings.getId(),noticeObjectType.getInfo(),bookings.getCreator(), Constants.ZERO);
noticeList.add(notices);
--
Gitblit v1.9.3