From 101c7a41530bf93fab088b7599933190a6ca3f75 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 17 Feb 2023 14:30:46 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=9A=E8=AE=AE=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=8F=91=E9=82=AE=E4=BB=B6=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommitteeMeetingController.java | 4 +-- .../controller/CouncilMeetingController.java | 4 +-- .../controller/InternalMeetingController.java | 4 +-- .../controller/OtherMeetingController.java | 4 +-- .../controller/PayMeetingController.java | 4 +-- .../StandardsMeetingController.java | 4 +-- .../WorkGroupMeetingController.java | 4 +-- .../meeting/service/IPayMeetingService.java | 2 +- .../service/impl/PayMeetingServiceImpl.java | 26 ++++++++++++++----- 9 files changed, 34 insertions(+), 22 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java index 9efe2c24..18724889 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java @@ -205,8 +205,8 @@ public class CommitteeMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.COMMITTEE_MEETING_INT); - return Result.OK("上传资料成功!"); + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.COMMITTEE_MEETING_INT); + return Result.OK("上传资料成功!",strings); } /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java index 03c8e88e..1783dd36 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java @@ -190,8 +190,8 @@ public class CouncilMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.COUNCIL_MEETING_INT); - return Result.OK("上传资料成功!"); + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.COUNCIL_MEETING_INT); + return Result.OK("上传资料成功!",strings); } /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java index 3723becb..d291cc4f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java @@ -203,9 +203,9 @@ public class InternalMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.INTERNATIONAL_MEETING_INT); + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.INTERNATIONAL_MEETING_INT); - return Result.OK("上传资料成功!"); + return Result.OK("上传资料成功!",strings); } /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java index f2a67bdf..f2f17688 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java @@ -203,8 +203,8 @@ public class OtherMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.OTHER_MEETING_INT); - return Result.OK("上传资料成功!"); + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.OTHER_MEETING_INT); + return Result.OK("上传资料成功!",strings); } /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java index 7cfff2c6..facecc16 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java @@ -467,8 +467,8 @@ public class PayMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.INTERNATIONAL_MEETING_INT); - return Result.OK("上传资料成功!"); + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.INTERNATIONAL_MEETING_INT); + return Result.OK("上传资料成功!",strings); } @ApiOperation(value = "生成base64") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java index e2c9867b..7ed1c63e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java @@ -274,8 +274,8 @@ public class StandardsMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.STANDARD_MEETING_INT); - return Result.OK("上传资料成功!"); + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.STANDARD_MEETING_INT); + return Result.OK("上传资料成功!",strings); } /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java index 600995d2..96358c43 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java @@ -225,8 +225,8 @@ public class WorkGroupMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.WORKING_GROUP_MEETING_INT); - return Result.OK("上传资料成功!"); + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.WORKING_GROUP_MEETING_INT); + return Result.OK("上传资料成功!",strings); } /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java index 5fee8461..ce0accca 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java @@ -73,7 +73,7 @@ public interface IPayMeetingService extends IService { IPage queryMeetingSummary(MeetingSummary meetingSummary, Integer pageNo, Integer pageSize, HttpServletRequest req); - void uploadFileSendMsg(UploadFileVO uploadFileVO, Integer meetingCommon); + List uploadFileSendMsg(UploadFileVO uploadFileVO, Integer meetingCommon); /** * 上传会议纪要 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index 25f67286..c4b209de 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -51,15 +51,12 @@ import com.jero.member.service.ITbMemberProjectService; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.project.entity.PayWorkingGroup; -import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.entity.PayWorkingGroupSubItemContacts; import com.jero.project.service.IPayWorkingGroupService; import com.jero.project.service.IPayWorkingGroupSubItemContactsService; import com.jero.project.service.IPayWorkingGroupSubItemService; import com.jero.standards.xuanguan.stablecrosstraining.entity.StableCrossTraining; import com.jero.standards.xuanguan.stablecrosstraining.service.IStableCrossTrainingService; -import org.apache.commons.beanutils.ConvertUtils; -import org.apache.commons.beanutils.ConvertUtilsBean; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.util.CollectionUtils; @@ -1092,7 +1089,8 @@ public class PayMeetingServiceImpl extends ServiceImpl uploadFileSendMsg(UploadFileVO uploadFileVO, Integer meetingCommon) { + List listMsg = new ArrayList<>(); String id = uploadFileVO.getId(); PayMeeting payMeeting = getOne( new LambdaQueryWrapper() @@ -1110,7 +1108,7 @@ public class PayMeetingServiceImpl extends ServiceImpl meetingFileIdList = Arrays.asList(fileIds.split(",")); //如果过滤后为空则不发邮件 if (meetingFileIdList.isEmpty()) { - return; + return listMsg; } //如果是标协会议就同步文件 if (meetingCommon.equals(MeetingCommon.STANDARD_MEETING_INT)) { @@ -1137,12 +1135,14 @@ public class PayMeetingServiceImpl extends ServiceImpl companyContactIdList = payMeetingSituations.stream().map(PayMeetingSituation::getCompanyContactId).collect(Collectors.toList()); + int success = companyContactIdList.size(); + int failed = 0; for (String contactId : companyContactIdList) { PayContactsManagement payContactsManagement = payContactsManagementService.getById(contactId); // 发送消息 @@ -1164,8 +1164,20 @@ public class PayMeetingServiceImpl extends ServiceImpl