From d6756e5a274fc4562c9352d3ef82bf23cd78ef55 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 19 May 2022 10:35:31 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E4=BF=AE=E6=94=B9=E8=81=94=E7=B3=BB=E4=BA=BA=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E5=90=8E=E5=B7=A5=E4=BD=9C=E7=BB=84=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayMeetingServiceImpl.java   | 34 ++++++-------------
 .../impl/PayMeetingSituationServiceImpl.java  | 18 +++++-----
 2 files changed, 19 insertions(+), 33 deletions(-)

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 95dcf4d3..24cd6f81 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
@@ -52,7 +52,9 @@ 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;
@@ -125,6 +127,8 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
     private IPayMeetingContactsService meetingContactsService;
     @Resource
     private PayMeetingContactsMapper meetingContactsMapper;
+    @Resource
+    private IPayWorkingGroupSubItemContactsService workingGroupSubItemContactsService;
 
     /**
      * 新增会议
@@ -568,32 +572,16 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
             for (PayWorkingGroupSubItem payWorkingGroupSubItem : payWorkingGroupSubItems) {
                 workingGroupId = payWorkingGroupSubItem.getWorkingGroupId();
                 String groupSubItemId = payWorkingGroupSubItem.getId();
-                String contactsIdOne = payWorkingGroupSubItem.getContactsIdOne();
-                if (StringUtils.isNotBlank(contactsIdOne)) {
-                    contactsIdList.add(contactsIdOne);
+                LambdaQueryWrapper<PayWorkingGroupSubItemContacts> wrapper1 = new LambdaQueryWrapper<>();
+                wrapper1.eq(PayWorkingGroupSubItemContacts::getWorkingGroupSubId, groupSubItemId);
+                List<PayWorkingGroupSubItemContacts> groupSubItemContactsList = workingGroupSubItemContactsService.list(wrapper1);
+                for (PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts : groupSubItemContactsList) {
+                    String contactsId = payWorkingGroupSubItemContacts.getContactsId();
+                    contactsIdList.add(contactsId);
                     meetingRemindRecordList.add(
                             new PayMeetingRemindRecord()
                                     .setSubitemId(groupSubItemId)
-                                    .setContactId(contactsIdOne)
-                    );
-
-                }
-                String contactsIdTwo = payWorkingGroupSubItem.getContactsIdTwo();
-                if (StringUtils.isNotBlank(contactsIdTwo)) {
-                    contactsIdList.add(contactsIdTwo);
-                    meetingRemindRecordList.add(
-                            new PayMeetingRemindRecord()
-                                    .setSubitemId(groupSubItemId)
-                                    .setContactId(contactsIdTwo)
-                    );
-                }
-                String contactsIdThree = payWorkingGroupSubItem.getContactsIdThree();
-                if (StringUtils.isNotBlank(contactsIdThree)) {
-                    contactsIdList.add(contactsIdThree);
-                    meetingRemindRecordList.add(
-                            new PayMeetingRemindRecord()
-                                    .setSubitemId(groupSubItemId)
-                                    .setContactId(contactsIdThree)
+                                    .setContactId(contactsId)
                     );
                 }
             }
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 2685bb8a..a88edc81 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
@@ -62,6 +62,8 @@ import com.jero.payment.entity.PayPaymentRecord;
 import com.jero.payment.service.IPayPaymentRecordService;
 import com.jero.project.common.PayProjectCommon;
 import com.jero.project.entity.PayWorkingGroupSubItem;
+import com.jero.project.entity.PayWorkingGroupSubItemContacts;
+import com.jero.project.service.IPayWorkingGroupSubItemContactsService;
 import com.jero.project.service.IPayWorkingGroupSubItemService;
 import com.jero.standards.memberinfo.service.IMemberInfoService;
 import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
@@ -138,6 +140,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
     private IOSSFileService ossFileService;
     @Resource
     private IPayMeetingContactsService meetingContactsService;
+    @Resource
+    private IPayWorkingGroupSubItemContactsService workingGroupSubItemContactsService;
 
 
     private static final String[] CAN_MODIFY_LIST =
@@ -1215,16 +1219,10 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_1);
         //如果是工作组会议或者分标委会议或理事会会议，判断是否为成员
         if (meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING_INT)) {
-            LambdaQueryWrapper<PayWorkingGroupSubItem> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(PayWorkingGroupSubItem::getWorkingGroupId, payMeeting.getWorkingGroupId());
-            wrapper.eq(PayWorkingGroupSubItem::getChargeCompanyId, payMeetingSituation1.getCompanyId());
-            wrapper.and(i -> i.eq(PayWorkingGroupSubItem::getContactsIdOne, payMeetingSituation1.getCompanyContactId())
-                    .or()
-                    .eq(PayWorkingGroupSubItem::getContactsIdTwo, payMeetingSituation1.getCompanyContactId())
-                    .or()
-                    .eq(PayWorkingGroupSubItem::getContactsIdThree, payMeetingSituation1.getCompanyContactId())
-            );
-            int count = payWorkingGroupSubItemService.count(wrapper);
+            LambdaQueryWrapper<PayWorkingGroupSubItemContacts> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(PayWorkingGroupSubItemContacts::getWorkingGroupId, payMeeting.getWorkingGroupId());
+            wrapper.eq(PayWorkingGroupSubItemContacts::getContactsId, payMeetingSituation1.getCompanyContactId());
+            int count = workingGroupSubItemContactsService.count(wrapper);
             if (count <= 0) {
                 payMeetingSituation1.setRegisterCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
             }