|
@@ -8,6 +8,7 @@ import com.ningdatech.basic.util.CollUtils; |
|
|
import com.ningdatech.pmapi.meeting.constant.MeetingMsgTemplateConst; |
|
|
import com.ningdatech.pmapi.meeting.constant.MeetingMsgTemplateConst; |
|
|
import com.ningdatech.pmapi.meeting.entity.domain.Meeting; |
|
|
import com.ningdatech.pmapi.meeting.entity.domain.Meeting; |
|
|
import com.ningdatech.pmapi.meeting.entity.domain.MeetingExpert; |
|
|
import com.ningdatech.pmapi.meeting.entity.domain.MeetingExpert; |
|
|
|
|
|
import com.ningdatech.pmapi.meeting.entity.enumeration.MeetingReviewTypeEnum; |
|
|
import com.ningdatech.pmapi.organization.model.entity.DingEmployeeInfo; |
|
|
import com.ningdatech.pmapi.organization.model.entity.DingEmployeeInfo; |
|
|
import com.ningdatech.pmapi.organization.model.entity.DingOrganization; |
|
|
import com.ningdatech.pmapi.organization.model.entity.DingOrganization; |
|
|
import com.ningdatech.pmapi.organization.service.IDingEmployeeInfoService; |
|
|
import com.ningdatech.pmapi.organization.service.IDingEmployeeInfoService; |
|
@@ -29,6 +30,7 @@ import java.util.ArrayList; |
|
|
import java.util.HashMap; |
|
|
import java.util.HashMap; |
|
|
import java.util.List; |
|
|
import java.util.List; |
|
|
import java.util.Map; |
|
|
import java.util.Map; |
|
|
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* <p> |
|
|
* <p> |
|
@@ -103,7 +105,7 @@ public class MeetingMsgHelper { |
|
|
WorkNoticeInfo swn = getSendWorkNoticeInfo(info.getAccountId()); |
|
|
WorkNoticeInfo swn = getSendWorkNoticeInfo(info.getAccountId()); |
|
|
swn.setMsg(msgContent); |
|
|
swn.setMsg(msgContent); |
|
|
workNoticeStagingService.addByWorkNotice(swn, MsgTypeEnum.REVIEW_MEETING); |
|
|
workNoticeStagingService.addByWorkNotice(swn, MsgTypeEnum.REVIEW_MEETING); |
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
|
|
|
|
|
Map<String, Object> map = new HashMap<>(2); |
|
|
map.put("meetingId", meetingId); |
|
|
map.put("meetingId", meetingId); |
|
|
Notify notify = getNotify(userId, msgContent, MsgTypeEnum.REVIEW_MEETING, map); |
|
|
Notify notify = getNotify(userId, msgContent, MsgTypeEnum.REVIEW_MEETING, map); |
|
|
notifyService.save(notify); |
|
|
notifyService.save(notify); |
|
@@ -136,7 +138,7 @@ public class MeetingMsgHelper { |
|
|
WorkNoticeInfo swn = getSendWorkNoticeInfo(info.getAccountId()); |
|
|
WorkNoticeInfo swn = getSendWorkNoticeInfo(info.getAccountId()); |
|
|
swn.setMsg(msgContent); |
|
|
swn.setMsg(msgContent); |
|
|
workingNotices.add(swn); |
|
|
workingNotices.add(swn); |
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
|
|
|
|
|
Map<String, Object> map = new HashMap<>(2); |
|
|
map.put("meetingId", meeting.getId()); |
|
|
map.put("meetingId", meeting.getId()); |
|
|
Notify notify = getNotify(info.getId(), msgContent, MsgTypeEnum.EXPERT_REVIEW, map); |
|
|
Notify notify = getNotify(info.getId(), msgContent, MsgTypeEnum.EXPERT_REVIEW, map); |
|
|
notifies.add(notify); |
|
|
notifies.add(notify); |
|
@@ -148,4 +150,18 @@ public class MeetingMsgHelper { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void sendCancelMeetingMsg(List<MeetingExpert> experts, Meeting meeting) { |
|
|
|
|
|
String startTime = officialTime(meeting.getStartTime()); |
|
|
|
|
|
String meetingType = MeetingReviewTypeEnum.getValue(meeting.getType()); |
|
|
|
|
|
List<SendSmsContext> contexts = experts.stream().map(w -> { |
|
|
|
|
|
String content = String.format(MeetingMsgTemplateConst.MEETING_CANCEL, |
|
|
|
|
|
w.getExpertName(), startTime, meetingType, meeting.getContact()); |
|
|
|
|
|
SendSmsContext context = new SendSmsContext(); |
|
|
|
|
|
context.setReceiveNumber(w.getMobile()); |
|
|
|
|
|
context.setContent(content); |
|
|
|
|
|
return context; |
|
|
|
|
|
}).collect(Collectors.toList()); |
|
|
|
|
|
yxtCallOrSmsHelper.sendSms(contexts); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} |