From 9b96d2a32d6944d13506f5385b6ffd9cd81a4edb Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 9 Apr 2024 11:51:34 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=9A=E8=AE=AE=E6=B1=87=E6=80=BB?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8E=BB=E9=99=A4=E5=8F=82=E4=BC=9A=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayMeetingServiceImpl.java   | 64 +++++++++----------
 .../meeting/vo/excel/MeetingSummaryExcel.java |  4 +-
 2 files changed, 34 insertions(+), 34 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 c64d499b..7dfa7189 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
@@ -1217,30 +1217,30 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
             PayMeetingVO payMeetingVO = new PayMeetingVO();
             BeanUtils.copyProperties(payMeetingVO, payMeeting);
             String meetingId = meeting.getId();
-            List<PayMeetingSituation> payMeetingSituations;
-            if (meetingIdSituationMap.containsKey(meetingId)){
-                payMeetingSituations = meetingIdSituationMap.get(meetingId);
-            }else {
-                LambdaQueryWrapper<PayMeetingSituation> pmsWrapper = new LambdaQueryWrapper<>();
-                pmsWrapper.eq(PayMeetingSituation::getMeetingId, meetingId);
-                payMeetingSituations = payMeetingSituationService.list(pmsWrapper);
-            }
-            for (PayMeetingSituation meetingSituation : payMeetingSituations) {
-                String companyContactId = meetingSituation.getCompanyContactId();
-                PayContactsManagement contactsManagement = contactsManagementService.getById(companyContactId);
-                meetingSituation.setCompanyContactName(contactsManagement.getName());
-                meetingSituation.setPost(contactsManagement.getPost());
-                meetingSituation.setPhone(PasswordUtil.decrypt(contactsManagement.getPhone()));
-                meetingSituation.setEmail(PasswordUtil.decrypt(contactsManagement.getEmail()));
-                PayCompanyManagement companyManagement = companyManagementService.getById(contactsManagement.getCompanyId());
-                String checkFile = meetingSituation.getCheckFile();
-                meetingSituation.setCompanyName(companyManagement.getCompanyName());
-                if (StringUtils.isNotBlank(checkFile)) {
-                    OSSFile ossFile = iossFileService.getById(checkFile);
-                    meetingSituation.setCheckFile(ossFile.getUrl());
-                }
-            }
-            meeting.setSituationList(payMeetingSituations);
+            //List<PayMeetingSituation> payMeetingSituations;
+            //if (meetingIdSituationMap.containsKey(meetingId)){
+            //    payMeetingSituations = meetingIdSituationMap.get(meetingId);
+            //}else {
+            //    LambdaQueryWrapper<PayMeetingSituation> pmsWrapper = new LambdaQueryWrapper<>();
+            //    pmsWrapper.eq(PayMeetingSituation::getMeetingId, meetingId);
+            //    payMeetingSituations = payMeetingSituationService.list(pmsWrapper);
+            //}
+            //for (PayMeetingSituation meetingSituation : payMeetingSituations) {
+            //    String companyContactId = meetingSituation.getCompanyContactId();
+            //    PayContactsManagement contactsManagement = contactsManagementService.getById(companyContactId);
+            //    meetingSituation.setCompanyContactName(contactsManagement.getName());
+            //    meetingSituation.setPost(contactsManagement.getPost());
+            //    meetingSituation.setPhone(PasswordUtil.decrypt(contactsManagement.getPhone()));
+            //    meetingSituation.setEmail(PasswordUtil.decrypt(contactsManagement.getEmail()));
+            //    PayCompanyManagement companyManagement = companyManagementService.getById(contactsManagement.getCompanyId());
+            //    String checkFile = meetingSituation.getCheckFile();
+            //    meetingSituation.setCompanyName(companyManagement.getCompanyName());
+            //    if (StringUtils.isNotBlank(checkFile)) {
+            //        OSSFile ossFile = iossFileService.getById(checkFile);
+            //        meetingSituation.setCheckFile(ossFile.getUrl());
+            //    }
+            //}
+            //meeting.setSituationList(payMeetingSituations);
             //查询酒店联系人列表
             LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(PayMeetingHotelContacts::getMeetingId, meetingId);
@@ -1589,14 +1589,14 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
             //保存数据
             MeetingSummaryExcel meetingSummaryExcel = new MeetingSummaryExcel();
             BeanUtils.copyProperties(payMeetingVO, meetingSummaryExcel);
-            List<PayMeetingSituation> meetingSituationList = meeting.getSituationList();
-            List<SituationExcel> situationList = new ArrayList<>();
-            for (PayMeetingSituation payMeetingSituation : meetingSituationList) {
-                SituationExcel situationExcel = new SituationExcel();
-                BeanUtils.copyProperties(payMeetingSituation, situationExcel);
-                situationList.add(situationExcel);
-            }
-            meetingSummaryExcel.setSituationList(situationList);
+            //List<PayMeetingSituation> meetingSituationList = meeting.getSituationList();
+            //List<SituationExcel> situationList = new ArrayList<>();
+            //for (PayMeetingSituation payMeetingSituation : meetingSituationList) {
+            //    SituationExcel situationExcel = new SituationExcel();
+            //    BeanUtils.copyProperties(payMeetingSituation, situationExcel);
+            //    situationList.add(situationExcel);
+            //}
+            //meetingSummaryExcel.setSituationList(situationList);
             exportList.add(meetingSummaryExcel);
         }
         return exportList;
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/MeetingSummaryExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/MeetingSummaryExcel.java
index d0a0b033..0fb8e3aa 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/MeetingSummaryExcel.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/MeetingSummaryExcel.java
@@ -92,6 +92,6 @@ public class MeetingSummaryExcel {
     /**
      * 参会人列表
      */
-    @ExcelCollection(name = "参会人列表")
-    private List<SituationExcel> situationList;
+    //@ExcelCollection(name = "参会人列表")
+    //private List<SituationExcel> situationList;
 }