From 904319211bf9c9b1eafb0585e4c1efabd20785df Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 5 Jul 2024 09:22:21 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=8A=9F=E8=83=BD=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=20=E5=8F=91=E5=B8=83=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PayMeetingServiceImpl.java | 33 +++++++++++++++++++ .../jero/meeting/vo/PublishReminderVO.java | 2 ++ 2 files changed, 35 insertions(+) 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 618b0681..5917c61a 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 @@ -41,6 +41,10 @@ import com.jero.drafting.entity.PayDraftingGroup; import com.jero.drafting.entity.PayDraftingGroupSubItemContacts; import com.jero.drafting.service.IPayDraftingGroupService; import com.jero.drafting.service.IPayDraftingGroupSubItemContactsService; +import com.jero.functionalsafetycenter.entity.SafetyCenter; +import com.jero.functionalsafetycenter.entity.SafetyCenterSubitemContacts; +import com.jero.functionalsafetycenter.service.SafetyCenterService; +import com.jero.functionalsafetycenter.service.SafetyCenterSubitemContactsService; import com.jero.meeting.common.MeetingCommon; import com.jero.meeting.common.MeetingSubitemCommon; import com.jero.meeting.entity.*; @@ -149,6 +153,10 @@ public class PayMeetingServiceImpl extends ServiceImpl contactsIdList = new ArrayList<>(); String workingGroupId = null; String draftingGroupId = null; + String safetyCenterId = null; //工作组项目直接是人 if (Objects.equals(projectType, 1)) { //把单位会员中所有的联系人取出 @@ -784,6 +793,23 @@ public class PayMeetingServiceImpl extends ServiceImpl wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(SafetyCenterSubitemContacts::getProjectId, safetyCenterId); + wrapper1.in(SafetyCenterSubitemContacts::getContactsId,subitemIds); + List groupSubItemContactsList = safetyCenterSubitemContactsService.list(wrapper1); + for (SafetyCenterSubitemContacts payDraftingGroupSubItemContacts : groupSubItemContactsList) { + String subitemId = payDraftingGroupSubItemContacts.getSubitemId(); + String contactsId = payDraftingGroupSubItemContacts.getContactsId(); + contactsIdList.add(contactsId); + meetingRemindRecordList.add( + new PayMeetingRemindRecord() + .setSubitemId(subitemId) + .setContactId(contactsId) + ); + } } else { throw new JeroBootException("项目类型不正确"); } @@ -815,6 +841,13 @@ public class PayMeetingServiceImpl extends ServiceImpl