From f63d3a3be83fea258e7920efccd2567b6a511bb3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 16 一月 2025 16:52:46 +0800
Subject: [PATCH] 最新版本541200007
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 214 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 179 insertions(+), 35 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..abe4c42 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
@@ -7,9 +7,9 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.*;
import com.doumee.core.wx.MeetConstants;
import com.doumee.core.wx.SendWxMessage;
@@ -142,6 +142,7 @@
bookings.setIsdeleted(MeetConstants.ZERO);
bookings.setStatus(MeetConstants.ZERO);
bookingsMapper.insert(bookings);
+ bookings.setManagerInfo(user.getRealname());
//鏇存柊浼氳瀹ら瀹氭椂闂存
updateBookingTimes(bookings, user);
//娣诲姞绠＄悊浜哄憳
@@ -152,9 +153,15 @@
//鍙戦�佷細璁绾︽垚鍔熼�氱煡
if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
this.sendNotice(bookings, MeetConstants.TWO);
+ SystemUser systemUser = systemUserMapper.selectById(user.getId());
+ this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ZERO);
+ //鍒涘缓浼氳鍗冲皢鍒版湡涓庝細璁嵆灏嗙粨鏉熺殑閫氱煡
+ if(Objects.nonNull(systemUser)&&StringUtils.isNotBlank(systemUser.getOpenid())){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ wxPlatNotice.createBeginWxNotice(systemDictDataBiz,smsEmailMapper,bookings,systemUser.getOpenid());
+ wxPlatNotice.createEndWxNotice(systemDictDataBiz,smsEmailMapper,bookings,systemUser.getOpenid());
+ }
}
- SystemUser systemUser = systemUserMapper.selectById(bookings.getUserId());
- this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ZERO);
return bookings.getId();
}
@@ -189,6 +196,10 @@
/* ||org.apache.commons.collections4.CollectionUtils.isEmpty(bookings.getSysList())*/
) {
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");
@@ -370,11 +381,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);
//娣诲姞绠＄悊浜哄憳
@@ -385,9 +403,14 @@
//鍙戦�佷細璁�氱煡
if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
this.sendNotice(bookings, MeetConstants.TWO);
+ SystemUser systemUser = systemUserMapper.selectById(bookings.getCreator());
+ this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ZERO);
+ if(Objects.nonNull(systemUser)&&StringUtils.isNotBlank(systemUser.getOpenid())){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ wxPlatNotice.createBeginWxNotice(systemDictDataBiz,smsEmailMapper,bookings,systemUser.getOpenid());
+ wxPlatNotice.createEndWxNotice(systemDictDataBiz,smsEmailMapper,bookings,systemUser.getOpenid());
+ }
}
- SystemUser systemUser = systemUserMapper.selectById(bookings.getUserId());
- this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ZERO);
}
@Override
@@ -451,13 +474,14 @@
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);
+ this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ONE);
}
- SystemUser systemUser = systemUserMapper.selectById(bookings.getUserId());
- this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ONE);
-
}
@Override
@@ -550,7 +574,20 @@
SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm");
SimpleDateFormat format1 = new SimpleDateFormat("HH:mm");
IPage<Bookings> result = bookingsJoinMapper.selectJoinPage(page, Bookings.class, queryWrapper);
+
+ String configMinute = systemDictDataBiz.queryByCode(MeetConstants.SYSTEM, MeetConstants.EARLY_START).getCode();
+ Integer minute = StringUtils.isNotBlank(configMinute) ? Integer.valueOf(configMinute) : 120;
result.getRecords().stream().forEach(s -> {
+
+ if(Constants.equalsInteger(s.getStatus(),Constants.ZERO)&&Constants.equalsInteger(s.getMeetingStatus(),Constants.ONE)){
+ //寮�濮嬪墠120鍒嗛挓 澶т簬褰撳墠鏃堕棿 鍒欐樉绀哄嵆灏嗗紑濮�
+ if(
+ DateUtil.afterMinutesDate(s.getStartTime(),-minute).getTime()<=System.currentTimeMillis()
+ ){
+ s.setMeetingStatus(4);
+ }
+ }
+
if(s.getMeetingStatus().equals(Constants.ZERO)){
if(s.getMeetingStatus()==Constants.ONE){
@@ -817,15 +854,21 @@
* @return
*/
@Override
- public List<Bookings> getMyBookings(Integer userId, String dateMsg) {
- return bookingsMapper.selectList(new QueryWrapper<Bookings>()
- .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)
+ public List<Bookings> getMyBookings(Integer userId, String dateMsg,Integer queryType) {
+ if(queryType==null ){
+ queryType =1;
+ }
+ return bookingsMapper.selectJoinList(Bookings.class,new MPJLambdaWrapper<Bookings>()
+ .selectAll(Bookings.class)
+ .leftJoin(Rooms.class,Rooms::getId,Bookings::getRoomId)
+ .exists(queryType!=3,"( select u.OBJ_ID from meeting_user_rel u where u.OBJ_ID =t.id and u.USER_ID = '" + userId + "' and u.ISDELETED = 0 and OBJ_TYPE = 1 ) ")
+ .exists(queryType==3,"( select u.OBJ_ID from meeting_user_rel u where u.OBJ_ID =t1.id and u.USER_ID = '" + userId + "' and u.ISDELETED = 0 and OBJ_TYPE = 0 ) ")
+ .eq(Bookings::getIsdeleted,MeetConstants.ZERO)
+ .eq(Rooms::getIsdeleted,MeetConstants.ZERO)
+ .eq(Rooms::getStatus,MeetConstants.ZERO)
// .eq("STATUS",MeetConstants.ZERO)
- .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));
+ .like(StringUtils.isNotBlank(dateMsg), Bookings::getStartTime, dateMsg));
}
-
/**
* 鎴戠殑棰勭害/鎴戠殑浼氳
@@ -833,20 +876,81 @@
* @param pageWrap
* @return
*/
+ public IPage<Bookings> getMyMeetingPageNew(PageWrap<Bookings> pageWrap) {
+ IPage<Bookings> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<Bookings> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+
+ queryWrapper.selectAll(Bookings.class);
+ queryWrapper.selectAs(Rooms::getName, Bookings::getRoomName);
+ queryWrapper.selectAs(SystemUser::getRealname, Bookings::getRealName);
+ queryWrapper.selectAs(Company::getName, Bookings::getDepartmentName);
+ queryWrapper.select(" CASE WHEN t.START_TIME_REAL IS NULL AND t.`STATUS` = 0 THEN 1 WHEN ( ( t.END_TIME < now() AND t.`STATUS` = 0 ) or t.`STATUS` = 2 ) THEN 3 WHEN t.`STATUS` = 1 THEN 5 ELSE 2 END meetingStatus ");
+ queryWrapper.leftJoin(Rooms.class, Rooms::getId, Bookings::getRoomId);
+ queryWrapper.leftJoin(SystemUser.class, SystemUser::getId, Bookings::getCreator);
+ queryWrapper.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId);
+ queryWrapper.orderByDesc(Bookings::getCreateDate);
+ queryWrapper.eq(Bookings::getIsdeleted, MeetConstants.ZERO);
+ queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getRoomsName()),
+ j -> j.like(Bookings::getName,pageWrap.getModel().getRoomsName()).or().like(Rooms::getName, pageWrap.getModel().getRoomsName()))
+ .exists(pageWrap.getModel().getQueryType().equals(MeetConstants.ONE) && !Objects.isNull(pageWrap.getModel().getUserId()),
+ " select u.id from meeting_user_rel u where t.id = u.OBJ_ID and u.USER_ID = '" + pageWrap.getModel().getUserId() + "' and u.ISDELETED = 0 and u.OBJ_TYPE = 1 ")
+ .eq(pageWrap.getModel().getQueryType().equals(MeetConstants.TWO)
+ && !Objects.isNull(pageWrap.getModel().getUserId()), Bookings::getCreator, pageWrap.getModel().getUserId())
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getQueryDate()), Bookings::getStartTime, pageWrap.getModel().getQueryDate())
+ .eq(!Objects.isNull(pageWrap.getModel().getRoomsId()), Bookings::getRoomId, pageWrap.getModel().getRoomsId())
+ .apply(!Objects.isNull(pageWrap.getModel().getStatus()) && pageWrap.getModel().getStatus().equals(MeetConstants.ONE),
+ " now() < t.END_TIME and t.STATUS = 0 ")
+ .and(!Objects.isNull(pageWrap.getModel().getStatus()) && pageWrap.getModel().getStatus().equals(MeetConstants.TWO),
+ j -> j.apply("now() >= t.END_TIME ").or()
+ .eq(" t.STATUS", MeetConstants.ONE))
+ .eq(Rooms::getIsdeleted,MeetConstants.ZERO)
+ .eq(Rooms::getStatus,MeetConstants.ZERO)
+ .eq(Bookings::getIsdeleted,MeetConstants.ZERO)
+ .apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
+ &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.ONE),
+ " ( now() < t.START_TIME and t.status = 0 ) "
+ )
+ .apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
+ &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.TWO),
+ " ( now() >= t.START_TIME and t.END_TIME >= now() and t.status = 0 ) "
+ )
+ .apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
+ &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.THREE),
+ " ( ( now() >t.END_TIME and t.`STATUS` = 0 ) or t.`STATUS` = 2 ) "
+ )
+ .apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
+ &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.FOUR),
+ " now() < t.START_TIME AND SUBDATE( t.START_TIME, INTERVAL 120 MINUTE ) < NOW() "
+ )
+ .eq(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
+ &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.FIVE),
+ Bookings::getStatus,MeetConstants.ONE
+ )
+ .orderByDesc(Constants.equalsInteger(pageWrap.getModel().getQueryType(),MeetConstants.TWO),Bookings::getCreateDate)
+ .orderByAsc(Constants.equalsInteger(pageWrap.getModel().getQueryType(),MeetConstants.ONE),Bookings::getStartTime);
+
+ IPage<Bookings> result = bookingsJoinMapper.selectJoinPage(page, Bookings.class, queryWrapper);
+ return result;
+ }
@Override
public IPage<MeetingListResponse> getMyMeetingPage(PageWrap<MeetingPageRequest> pageWrap) {
QueryWrapper queryWrapper = new QueryWrapper<MeetingListResponse>()
.and(StringUtils.isNotBlank(pageWrap.getModel().getRoomsName()),
- j -> j.like("a.NAME",pageWrap.getModel().getRoomsName()).or()
- .like(" b.NAME", pageWrap.getModel().getRoomsName()))
+ j -> j.like("a.NAME",pageWrap.getModel().getRoomsName()).or().like(" b.NAME", pageWrap.getModel().getRoomsName()))
.exists(pageWrap.getModel().getQueryType().equals(MeetConstants.ONE) && !Objects.isNull(pageWrap.getModel().getUserId()),
- " select 1 from meeting_user_rel u where a.id = u.OBJ_ID and u.USER_ID = '" + pageWrap.getModel().getUserId() + "' and u.ISDELETED = 0 and OBJ_TYPE = 1 ")
+ " select 1 from meeting_user_rel u where a.id = u.OBJ_ID and u.USER_ID = '" + pageWrap.getModel().getUserId() + "' and u.ISDELETED = 0 and OBJ_TYPE = 1 ")
+ .exists(pageWrap.getModel().getQueryType().equals(MeetConstants.THREE) && !Objects.isNull(pageWrap.getModel().getUserId()),
+ " select 1 from meeting_user_rel u where b.id = u.OBJ_ID and u.USER_ID = '" + pageWrap.getModel().getUserId() + "' and u.ISDELETED = 0 and OBJ_TYPE = 0 ")//绠＄悊鍛樻煡鐪�
.eq(pageWrap.getModel().getQueryType().equals(MeetConstants.TWO) && !Objects.isNull(pageWrap.getModel().getUserId()), "a.CREATOR", pageWrap.getModel().getUserId())
.like(StringUtils.isNotBlank(pageWrap.getModel().getQueryDate()), "a.START_TIME", pageWrap.getModel().getQueryDate())
.eq(!Objects.isNull(pageWrap.getModel().getRoomsId()), "b.id", pageWrap.getModel().getRoomsId())
- .apply(!Objects.isNull(pageWrap.getModel().getStatus()) && pageWrap.getModel().getStatus().equals(MeetConstants.ONE), " now() < a.END_TIME and a.STATUS = 0 ")
- .and(!Objects.isNull(pageWrap.getModel().getStatus()) && pageWrap.getModel().getStatus().equals(MeetConstants.TWO),
+ .apply(!Objects.isNull(pageWrap.getModel().getStatus())
+ && pageWrap.getModel().getStatus().equals(MeetConstants.ONE),
+ " now() < a.END_TIME and a.STATUS = 0 ")
+ .and(!Objects.isNull(pageWrap.getModel().getStatus())
+ && pageWrap.getModel().getStatus().equals(MeetConstants.TWO),
j -> j.apply("now() >= a.END_TIME ").or()
.eq(" a.STATUS", MeetConstants.ONE))
.eq("b.ISDELETED",MeetConstants.ZERO)
@@ -875,7 +979,8 @@
// .orderByDesc(!Objects.isNull(pageWrap.getModel().getStatus())&&pageWrap.getModel().getStatus().equals(MeetConstants.TWO),"a.START_TIME")
// .orderByAsc(Objects.isNull(pageWrap.getModel().getStatus())||pageWrap.getModel().getStatus().equals(MeetConstants.ONE),"a.START_TIME")
.orderByDesc(Constants.equalsInteger(pageWrap.getModel().getQueryType(),MeetConstants.TWO),"a.CREATE_DATE")
- .orderByAsc(Constants.equalsInteger(pageWrap.getModel().getQueryType(),MeetConstants.ONE),"a.START_TIME");
+ .orderByAsc(Constants.equalsInteger(pageWrap.getModel().getQueryType(),MeetConstants.ONE)
+ || Constants.equalsInteger(pageWrap.getModel().getQueryType(),MeetConstants.THREE),"a.START_TIME");
IPage<MeetingListResponse> page = bookingsMapper.myMeetingPage(pageWrap.toPage(), queryWrapper);
this.dealMeetingStatus(page.getRecords());
@@ -1046,14 +1151,19 @@
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());
- this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ONE);
+// 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 +1375,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 +1445,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,
@@ -1354,11 +1470,38 @@
smsEmail.setStatus(Constants.TWO);//
smsEmail.setIsdeleted(Constants.ZERO);
smsEmail.setType(Constants.ZERO);
+ smsEmail.setObjType(Constants.FIVE.toString());
smsEmail.setObjId(bookings.getId());
smsEmail.setCreateDate(new Date());
smsEmail.setTitle("浼氳瀹ょ敵璇峰弬浼氶�氱煡");
smsEmail.setContent(StringUtils.defaultString(smsConfig.getContent(),"")
.replace("{鍙備細浜哄憳濮撳悕}",StringUtils.defaultString(i.getRealName(),""))
+ .replace("{浼氳涓婚}",StringUtils.defaultString(bookings.getName(),""))
+ .replace("{浼氳瀹ゅ悕绉皚",StringUtils.defaultString(bookings.getRoomName(),""))
+ .replace("{浼氳鏃堕棿娈祡",StringUtils.defaultString(timeInfo,"")));
+ smsEmailList.add(smsEmail);
+ }
+ }
+ }
+ //缁欏垱寤轰汉鍙戦�佺煭淇′俊鎭�
+ 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,"")));
@@ -1393,18 +1536,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",
+ }else if(Constants.equalsInteger(sendType,Constants.ONE)){
+ wxPlatNotice.sendMeetingBookCancelTemplateNotice(systemDictDataBiz,bookings,"CiB6vCT2InovAoQfudY-lvzLSV0-3lfz3a5GsSFCzd8",
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),openIds);
}
}
@@ -1526,6 +1669,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