From 41d489dd02235dcfc7a7efe8f3c3687837a03fa6 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 2 Nov 2021 16:54:15 +0800 Subject: [PATCH] =?UTF-8?q?fix=20bug=2041220=20=E8=AE=BE=E7=BD=AE=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5=E4=BA=BA=E5=90=8E=EF=BC=8C=E5=AF=B9=E6=8E=A5=E4=BA=BA?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=94=B6=E5=88=B0=E6=B6=88=E6=81=AF=E5=92=8C?= =?UTF-8?q?=E9=82=AE=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommitteeMeetingSituationController.java | 13 -------- .../OtherMeetingSituationController.java | 13 -------- .../StandardsMeetingSituationController.java | 13 -------- .../WorkGroupMeetingSituationController.java | 13 -------- .../impl/PayMeetingSituationServiceImpl.java | 30 ++++++++++++++++++- 5 files changed, 29 insertions(+), 53 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java index 60c37b62..566a1c8b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java @@ -198,19 +198,6 @@ public class CommitteeMeetingSituationController extends JeroController addDock(@RequestBody AddDockVO addDockVO) { - payMeetingSituationService.addDock(addDockVO); - return Result.OK("设置对接人成功!"); - } - /** * 审核付款凭证 */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java index 2c4ec397..42955027 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java @@ -183,19 +183,6 @@ public class OtherMeetingSituationController extends JeroController addDock(@RequestBody AddDockVO addDockVO) { - payMeetingSituationService.addDock(addDockVO); - return Result.OK("设置对接人成功!"); - } - /** * 审核付款凭证 */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java index 49a1b0f7..0750e03b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java @@ -183,19 +183,6 @@ public class StandardsMeetingSituationController extends JeroController addDock(@RequestBody AddDockVO addDockVO) { - payMeetingSituationService.addDock(addDockVO); - return Result.OK("设置对接人成功!"); - } - /** * 审核付款凭证 */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java index 167da37f..43ef566c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java @@ -183,19 +183,6 @@ public class WorkGroupMeetingSituationController extends JeroController addDock(@RequestBody AddDockVO addDockVO) { - payMeetingSituationService.addDock(addDockVO); - return Result.OK("设置对接人成功!"); - } - /** * 审核付款凭证 */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index b60d1cc1..fcbd6430 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -1200,12 +1200,16 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl 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 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); } /**