fix bug 41220 设置对接人后,对接人没有收到消息和邮件

This commit is contained in:
lijiarao
2021-11-02 16:54:25 +08:00
parent f15afeb3ca
commit 41d489dd02
5 changed files with 29 additions and 53 deletions
@@ -198,19 +198,6 @@ public class CommitteeMeetingSituationController extends JeroController<PayMeeti
return super.exportListXls(objects, aClass, "参会人员信息");
}
/**
* 设置对接人
*/
@RequiresPermissions("committeeMeetingSituation:batchSetDocker")
@AutoLog(value = "设置对接人")
@ApiOperation(value = "设置对接人", notes = "设置对接人")
@PostMapping(value = "/addDock")
public Result<?> addDock(@RequestBody AddDockVO addDockVO) {
payMeetingSituationService.addDock(addDockVO);
return Result.OK("设置对接人成功!");
}
/**
* 审核付款凭证
*/
@@ -183,19 +183,6 @@ public class OtherMeetingSituationController extends JeroController<PayMeetingSi
return super.exportListXls(objects, aClass, "参会人员信息");
}
/**
* 设置对接人
*/
@RequiresPermissions("otherMeetingSituation:batchSetDocker")
@AutoLog(value = "设置对接人")
@ApiOperation(value = "设置对接人", notes = "设置对接人")
@PostMapping(value = "/addDock")
public Result<?> addDock(@RequestBody AddDockVO addDockVO) {
payMeetingSituationService.addDock(addDockVO);
return Result.OK("设置对接人成功!");
}
/**
* 审核付款凭证
*/
@@ -183,19 +183,6 @@ public class StandardsMeetingSituationController extends JeroController<PayMeeti
return super.exportListXls(objects, aClass, "参会人员信息");
}
/**
* 设置对接人
*/
@RequiresPermissions("standardsMeetingSituation:batchSetDocker")
@AutoLog(value = "设置对接人")
@ApiOperation(value = "设置对接人", notes = "设置对接人")
@PostMapping(value = "/addDock")
public Result<?> addDock(@RequestBody AddDockVO addDockVO) {
payMeetingSituationService.addDock(addDockVO);
return Result.OK("设置对接人成功!");
}
/**
* 审核付款凭证
*/
@@ -183,19 +183,6 @@ public class WorkGroupMeetingSituationController extends JeroController<PayMeeti
return super.exportListXls(objects, aClass, "参会人员信息");
}
/**
* 设置对接人
*/
@RequiresPermissions("workGroupMeetingSituation:batchSetDocker")
@AutoLog(value = "设置对接人")
@ApiOperation(value = "设置对接人", notes = "设置对接人")
@PostMapping(value = "/addDock")
public Result<?> addDock(@RequestBody AddDockVO addDockVO) {
payMeetingSituationService.addDock(addDockVO);
return Result.OK("设置对接人成功!");
}
/**
* 审核付款凭证
*/
@@ -1200,12 +1200,16 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
}
String username = user.getUsername();
List<String> meetingSituationIds = addDockVO.getMeetingSituationIds();
if (meetingSituationIds.isEmpty()){
throw new JeroBootException("请选择参会人");
}
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String sysUserId = sysUser.getId();
PayMeeting payMeeting = null;
for (String meetingSituationId : meetingSituationIds) {
PayMeetingSituation payMeetingSituation = getById(meetingSituationId);
String meetingId = payMeetingSituation.getMeetingId();
PayMeeting payMeeting = meetingService.getById(meetingId);
payMeeting = meetingService.getById(meetingId);
Integer meetingType = payMeeting.getMeetingType();
//只有会议负责人可以设置对接人
if (!payMeeting.getDirectorId().equals(sysUserId)) {
@@ -1224,6 +1228,30 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
payMeetingSituation.setDockName(username);
saveOrUpdate(payMeetingSituation);
}
if (payMeeting == null){
throw new JeroBootException("会议不存在");
}
// 给对接人发送消息
SendMessageDTO sendMessageDTO = new SendMessageDTO();
if (!StringUtils.isBlank(user.getEmail())) {
sendMessageDTO.setEmail(PasswordUtil.decrypt(user.getEmail()));
}
if (!StringUtils.isBlank(user.getPhone())) {
sendMessageDTO.setToUser(user.getUsername());
sendMessageDTO.setPhone(PasswordUtil.decrypt(user.getPhone()));
}
HashMap<String, String> map = new HashMap<>();
map.put("meetingName", payMeeting.getMeetingName());
sendMessageDTO.setFromUser(sysUser.getUsername());
sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG10.getCode());
sendMessageDTO.setTemplateParam(map);
sendMessageDTO.setBusType("M_OPEN_TYPE10");
JSONObject jsonObject = new JSONObject();
jsonObject.put("id", payMeeting.getId());
jsonObject.put("meetingName", payMeeting.getMeetingName());
jsonObject.put("meetingType", MeetingCommon.INTERNATIONAL_MEETING_INT);
sendMessageDTO.setBusId(jsonObject.toJSONString());
sendMessageService.SendMessageService(sendMessageDTO);
}
/**