LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug 41759 我的消息--工作组下有成员--新增完会议会收到消息

Browse Source
This commit is contained in:
lijiarao
2021-11-01 14:20:53 +08:00
parent b36fafdff9
commit 813b99b276
1 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+18 -21
View File
@@ -148,24 +148,6 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
}
pushStandardsFiles(fileIdList);
}
//工作组会议发送通知
if (Objects.equals(payMeeting.getMeetingType(), Integer.parseInt(MeetingCommon.WORKING_GROUP_MEETING))) {
String workingGroupId = payMeeting.getWorkingGroupId();
LambdaQueryWrapper<PayWorkingGroupSubItem> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PayWorkingGroupSubItem::getWorkingGroupId, workingGroupId);
List<PayWorkingGroupSubItem> groupSubItemList = payWorkingGroupSubItemService.list(wrapper);
for (PayWorkingGroupSubItem payWorkingGroupSubItem : groupSubItemList) {
String chargeCompanyId = payWorkingGroupSubItem.getChargeCompanyId();
//根据企业id查询所有联系人
List<PayContactsManagement> list = payContactsManagementService.list(
new LambdaQueryWrapper<PayContactsManagement>()
.eq(PayContactsManagement::getCompanyId, chargeCompanyId)
);
for (PayContactsManagement payContactsManagement : list) {
sendMessage(payMeeting, payContactsManagement);
}
}
}
}
/**
@@ -444,11 +426,13 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
//组装查询联系人条件
LambdaQueryWrapper<PayContactsManagement> wrapper = new LambdaQueryWrapper<>();
List<String> contactsIdList = new ArrayList<>();
String workingGroupId = null;
//工作组项目查询公司
if (Objects.equals(projectType, 1)) {
List<PayWorkingGroupSubItem> payWorkingGroupSubItems = payWorkingGroupSubItemService.listByIds(subitemIds);
//把单位会员中所有的联系人取出
for (PayWorkingGroupSubItem payWorkingGroupSubItem : payWorkingGroupSubItems) {
workingGroupId = payWorkingGroupSubItem.getWorkingGroupId();
String groupSubItemId = payWorkingGroupSubItem.getId();
String contactsIdOne = payWorkingGroupSubItem.getContactsIdOne();
if (StringUtils.isNotBlank(contactsIdOne)) {
@@ -458,6 +442,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
.setSubitemId(groupSubItemId)
.setContactId(contactsIdOne)
);
}
String contactsIdTwo = payWorkingGroupSubItem.getContactsIdTwo();
if (StringUtils.isNotBlank(contactsIdTwo)) {
@@ -504,10 +489,22 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
meetingIdList.add(meetingId);
payMeeting.setRemind(MeetingCommon.REMIND_1);
saveOrUpdate(payMeeting);
String fromUser = null;
//工作组项目用工作组负责人A发邮件
if (Objects.nonNull(workingGroupId)) {
PayWorkingGroup workingGroup = payWorkingGroupService.getById(workingGroupId);
String principalIdA = workingGroup.getPrincipalIdA();
LoginUser userById = sysBaseAPI.getUserById(principalIdA);
fromUser = userById.getUsername();
}
//发送消息
for (PayContactsManagement payContactsManagement : list) {
String directorId = payMeeting.getDirectorId();
LoginUser director = sysBaseAPI.getUserById(directorId);
if (Objects.isNull(fromUser)) {
String directorId = payMeeting.getDirectorId();
LoginUser director = sysBaseAPI.getUserById(directorId);
fromUser = director.getUsername();
}
// 给企业联系人发送消息
String email = payContactsManagement.getEmail();
String phone = payContactsManagement.getPhone();
@@ -522,7 +519,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
sendMessageDTO.setToUser(PasswordUtil.decrypt(phone));
sendMessageDTO.setPhone(PasswordUtil.decrypt(phone));
sendMessageDTO.setFromUser(director.getUsername());
sendMessageDTO.setFromUser(fromUser);
sendMessageDTO.setTemplateCode(companyMessageEnums.getCode());
sendMessageDTO.setTemplateParam(map);
sendMessageDTO.setBusType(busType);