add 新增参会人时提醒,提醒内容修改

This commit is contained in:
lijiarao
2021-09-26 17:10:53 +08:00
parent c905e0b4da
commit bf633a3d40
@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.common.ProjectCommon; import com.jero.common.common.ProjectCommon;
@@ -127,6 +128,34 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
PayMeeting payMeeting = meetingService.getById(payMeetingSituation.getMeetingId()); PayMeeting payMeeting = meetingService.getById(payMeetingSituation.getMeetingId());
contractCreateProjectSendMessageService.ContractCreateProjectSendMessageService(payMeeting.getMeetingName() + "的" + payMeetingSituation.getCompanyName(), payMeetingSituation.getId()); contractCreateProjectSendMessageService.ContractCreateProjectSendMessageService(payMeeting.getMeetingName() + "的" + payMeetingSituation.getCompanyName(), payMeetingSituation.getId());
} }
String meetingId = payMeetingSituation1.getMeetingId();
PayMeeting payMeeting = meetingService.getById(meetingId);
SendPaymentRecordMessage(payMeetingSituation1, payMeeting);
}
private void SendPaymentRecordMessage(PayMeetingSituation payMeetingSituation, PayMeeting payMeeting) {
String paymentRecord = payMeetingSituation.getPaymentRecord();
//上传付款凭证发送邮件提醒审批
if (StringUtils.isNotBlank(paymentRecord)) {
String directorId = payMeeting.getDirectorId();
LoginUser director = iSysBaseApi.getUserById(directorId);
// 给负责人发送消息
SendMessageDTO sendMessageDTO = new SendMessageDTO();
if (!StringUtils.isBlank(director.getEmail())) {
sendMessageDTO.setEmail(PasswordUtil.decrypt(director.getEmail()));
}
if (!StringUtils.isBlank(director.getPhone())) {
sendMessageDTO.setToUser(director.getUsername());
//sendMessageDTO.setPhone(PasswordUtil.decrypt(director.getPhone()));
}
HashMap<String, String> map = new HashMap<>();
sendMessageDTO.setFromUser(director.getUsername());
sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG5.getCode());
sendMessageDTO.setTemplateParam(map);
sendMessageDTO.setBusType("M_OPEN_TYPE5");
sendMessageDTO.setBusId(payMeetingSituation.getId());
sendMessageService.SendMessageService(sendMessageDTO);
}
} }
/** /**
@@ -220,29 +249,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0); payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
} }
} }
String paymentRecord = payMeetingSituation1.getPaymentRecord(); SendPaymentRecordMessage(payMeetingSituation1, payMeeting);
Integer checkResult = payMeetingSituation1.getCheckResult();
//上传付款凭证并且审批结果不为通过发送邮件提醒审批
if (StringUtils.isNotBlank(paymentRecord) && !Objects.equals(checkResult, MeetingSubitemCommon.SIGNUP_STATUS_1)) {
String directorId = payMeeting.getDirectorId();
LoginUser director = iSysBaseApi.getUserById(directorId);
// 给负责人发送消息
SendMessageDTO sendMessageDTO = new SendMessageDTO();
if (!StringUtils.isBlank(director.getEmail())) {
sendMessageDTO.setEmail(PasswordUtil.decrypt(director.getEmail()));
}
if (!StringUtils.isBlank(director.getPhone())) {
sendMessageDTO.setToUser(director.getUsername());
//sendMessageDTO.setPhone(PasswordUtil.decrypt(director.getPhone()));
}
HashMap<String, String> map = new HashMap<>();
sendMessageDTO.setFromUser(director.getUsername());
sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG5.getCode());
sendMessageDTO.setTemplateParam(map);
sendMessageDTO.setBusType("M_OPEN_TYPE5");
sendMessageDTO.setBusId(payMeetingSituation1.getId());
sendMessageService.SendMessageService(sendMessageDTO);
}
} }
/** /**
@@ -302,7 +309,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
sendMessageDTO.setTemplateCode(companyMessageEnums.getCode()); sendMessageDTO.setTemplateCode(companyMessageEnums.getCode());
sendMessageDTO.setTemplateParam(map); sendMessageDTO.setTemplateParam(map);
sendMessageDTO.setBusType(busType); sendMessageDTO.setBusType(busType);
sendMessageDTO.setBusId(payMeetingSituation.getId()); JSONObject jsonObject = new JSONObject();
jsonObject.put("id",payMeetingSituation.getId());
sendMessageDTO.setBusId(jsonObject.toJSONString());
sendMessageService.SendMessageService(sendMessageDTO); sendMessageService.SendMessageService(sendMessageDTO);
} }