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

fix bug 41188 管理端消息#1-合同负责人建立会议项目后，消息中的用户名显示成了null，邮件也有同样的问题

Browse Source
This commit is contained in:
lijiarao
2021-10-21 16:42:23 +08:00
parent 49af43c50d
commit aeaef6cab3
1 changed files with 5 additions and 5 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/PayMeetingSituationServiceImpl.java
+4 -4
View File
@@ -122,7 +122,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
@Override @Override
public void add(PayMeetingSituation payMeetingSituation) { public void add(PayMeetingSituation payMeetingSituation) {
payMeetingSituation.setStatus(MeetingSubitemCommon.STATUS_3); payMeetingSituation.setStatus(MeetingSubitemCommon.STATUS_3);
payMeetingSituation.setNeedInvoice(PayProjectCommon.NO); //payMeetingSituation.setNeedInvoice(PayProjectCommon.NO);
payMeetingSituation.setAmountReceivable(new BigDecimal("0")); payMeetingSituation.setAmountReceivable(new BigDecimal("0"));
//处理校验参会人信息 //处理校验参会人信息
PayMeetingSituation payMeetingSituation1 = getPayMeetingSituation(payMeetingSituation); PayMeetingSituation payMeetingSituation1 = getPayMeetingSituation(payMeetingSituation);
@@ -132,12 +132,12 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
// 收入合同创建项目发送消息到项目负责人 // 收入合同创建项目发送消息到项目负责人
if (Objects.equals(ProjectCommon.FLAG, payMeetingSituation.getFlag())) { if (Objects.equals(ProjectCommon.FLAG, payMeetingSituation.getFlag())) {
PayMeeting payMeeting = meetingService.getById(payMeetingSituation.getMeetingId()); PayMeeting payMeeting = meetingService.getById(payMeetingSituation.getMeetingId());
contractCreateProjectSendMessageService.ContractCreateProjectSendMessageService(payMeeting.getMeetingName() + "的" + payMeetingSituation.getCompanyName(), payMeetingSituation.getId(), payMeeting.getDirectorId()); contractCreateProjectSendMessageService.ContractCreateProjectSendMessageService(payMeeting.getMeetingName() + "的" + payMeetingSituation1.getCompanyContactName(), payMeetingSituation1.getId(), payMeeting.getDirectorId());
} }
String meetingId = payMeetingSituation1.getMeetingId(); String meetingId = payMeetingSituation1.getMeetingId();
PayMeeting payMeeting = meetingService.getById(meetingId); PayMeeting payMeeting = meetingService.getById(meetingId);
//上传付款凭证发送邮件提醒审批 //上传付款凭证发送邮件提醒审批
SendPaymentRecordMessage(payMeetingSituation1, payMeeting); //SendPaymentRecordMessage(payMeetingSituation1, payMeeting);
//如果合同id存在则关联参会人到合同 //如果合同id存在则关联参会人到合同
String contractId = payMeetingSituation.getContractId(); String contractId = payMeetingSituation.getContractId();
@@ -167,7 +167,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
//处理打包情况 //处理打包情况
//handlePack(payMeetingSituation1); //handlePack(payMeetingSituation1);
//如果关联合同就不发消息 //如果关联合同就不发消息
if (StringUtils.isBlank(payMeetingSituation1.getContractId())) { if (!Objects.equals(ProjectCommon.FLAG, payMeetingSituation.getFlag())) {
signUpSendMessage(payMeetingSituation, payMeeting, payMeetingSituation1); signUpSendMessage(payMeetingSituation, payMeeting, payMeetingSituation1);
} }
} }