From 96a2b1c68aa545abbf8245b0b2859b342fa6e63d Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 19 十二月 2024 10:18:19 +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 | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 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 6bc33be..4726292 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
@@ -142,6 +142,7 @@
bookings.setIsdeleted(MeetConstants.ZERO);
bookings.setStatus(MeetConstants.ZERO);
bookingsMapper.insert(bookings);
+ bookings.setManagerInfo(user.getRealname());
//鏇存柊浼氳瀹ら瀹氭椂闂存
updateBookingTimes(bookings, user);
//娣诲姞绠＄悊浜哄憳
@@ -153,7 +154,7 @@
if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
this.sendNotice(bookings, MeetConstants.TWO);
}
- SystemUser systemUser = systemUserMapper.selectById(bookings.getUserId());
+ SystemUser systemUser = systemUserMapper.selectById(user.getId());
this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ZERO);
return bookings.getId();
@@ -451,11 +452,13 @@
bookings.setEditDate(new Date());
bookings.setEditor(user.getId());
bookingsMapper.updateById(bookings);
+ SystemUser systemUser = systemUserMapper.selectById(bookings.getCreator());
+
+ bookings.setManagerInfo(systemUser.getRealname());
//鍙栨秷浼氳 鍙戦�佸彇娑堥�氱煡
if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
this.sendNotice(bookings, 3);
}
- SystemUser systemUser = systemUserMapper.selectById(bookings.getUserId());
this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ONE);
}
@@ -1046,14 +1049,18 @@
bookings.setStatus(MeetConstants.ONE);
bookings.setEditDate(new Date());
bookings.setEditor(businessOverDTO.getUserId());
+ Rooms rooms = roomsMapper.selectById(bookings.getRoomId());
+ if(Objects.nonNull(rooms)){
+ bookings.setRoomName(rooms.getName());
+ }
bookingsMapper.updateById(bookings);
//鍙栨秷浼氳 鍙戦�佸彇娑堥�氱煡
- if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
- this.sendNotice(bookings, 3);
- }
- SystemUser systemUser = systemUserMapper.selectById(bookings.getUserId());
+// 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);
-
}
@@ -1265,12 +1272,14 @@
public void dealMeetingStatus(List<MeetingListResponse> meetingResponseList){
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(meetingResponseList)){
String path = systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.PROJECTS).getCode();
- String configMinute = systemDictDataBiz.queryByCode(MeetConstants.SYSTEM, MeetConstants.SOON_START).getCode();
+ String configMinute = systemDictDataBiz.queryByCode(MeetConstants.SYSTEM, MeetConstants.EARLY_START).getCode();
Integer minute = StringUtils.isNotBlank(configMinute) ? Integer.valueOf(configMinute) : 120;
for (MeetingListResponse m:meetingResponseList) {
if(Constants.equalsInteger(m.getStatus(),Constants.ZERO)&&Constants.equalsInteger(m.getMeetingStatus(),Constants.ONE)){
//寮�濮嬪墠120鍒嗛挓 澶т簬褰撳墠鏃堕棿 鍒欐樉绀哄嵆灏嗗紑濮�
- if(DateUtil.afterMinutesDate(m.getStartTime(),-minute).getTime()>System.currentTimeMillis()){
+ if(
+ DateUtil.afterMinutesDate(m.getStartTime(),-minute).getTime()<=System.currentTimeMillis()
+ ){
m.setMeetingStatus(4);
}
}
@@ -1333,6 +1342,10 @@
Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.MEETING_START;
if (sendType.equals(MeetConstants.THREE)){
noticeObjectType = Constants.NoticeObjectType.MEETING_CACEL;
+ smsConfig = smsConfigMapper.selectOne(new QueryWrapper<SmsConfig>().lambda().eq(SmsConfig::getCode,
+ SmsConstants.meetingContent.meetingBookCancel)
+ .eq(SmsConfig::getIsdeleted,Constants.ZERO)
+ .last(" limit 1 "));
}else if (sendType.equals(MeetConstants.TWO)){
noticeObjectType = Constants.NoticeObjectType.MEETING_BOOK_SUCCESS;
smsConfig = smsConfigMapper.selectOne(new QueryWrapper<SmsConfig>().lambda().eq(SmsConfig::getCode,
@@ -1393,18 +1406,18 @@
.isNotNull(SystemUser::getOpenid)
);
List<String> openIdList = userRelList.stream().map(i->i.getOpenid()).collect(Collectors.toList());
- if(StringUtils.isNotBlank(openid)){
- openIdList.add(openid);
+ openIdList.add(openid);
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(openIdList)){
+ return;
}
Set<String> openIds = new HashSet<String>(openIdList);
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(openIds)){
WxPlatNotice wxPlatNotice = new WxPlatNotice();
if(Constants.equalsInteger(sendType,Constants.ZERO)){
- wxPlatNotice.sendMeetingBookTemplateNotice(bookings,"CuoDoxOl6SFwi4NhNgOQgKSJVjDD4VCIaPYlnbv_zdY",
+ wxPlatNotice.sendMeetingBookTemplateNotice(systemDictDataBiz,bookings,"CuoDoxOl6SFwi4NhNgOQgKSJVjDD4VCIaPYlnbv_zdY",
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),openIds);
}else{
-
- wxPlatNotice.sendMeetingBookCancelTemplateNotice(bookings,"CiB6vCT2InovAoQfudY-lvzLSV0-3lfz3a5GsSFCzd8",
+ wxPlatNotice.sendMeetingBookCancelTemplateNotice(systemDictDataBiz,bookings,"CiB6vCT2InovAoQfudY-lvzLSV0-3lfz3a5GsSFCzd8",
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),openIds);
}
}
@@ -1526,6 +1539,7 @@
)
.eq("c.DELETED",0)
.eq("c.status",0)
+ .eq("m.WORK_STATUS",0)
.orderByAsc("c.id")
);
String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
--
Gitblit v1.9.3