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 payMeetingSituations; - if (meetingIdSituationMap.containsKey(meetingId)){ - payMeetingSituations = meetingIdSituationMap.get(meetingId); - }else { - LambdaQueryWrapper 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 payMeetingSituations; + //if (meetingIdSituationMap.containsKey(meetingId)){ + // payMeetingSituations = meetingIdSituationMap.get(meetingId); + //}else { + // LambdaQueryWrapper 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 wrapper = new LambdaQueryWrapper<>(); wrapper.eq(PayMeetingHotelContacts::getMeetingId, meetingId); @@ -1589,14 +1589,14 @@ public class PayMeetingServiceImpl extends ServiceImpl meetingSituationList = meeting.getSituationList(); - List situationList = new ArrayList<>(); - for (PayMeetingSituation payMeetingSituation : meetingSituationList) { - SituationExcel situationExcel = new SituationExcel(); - BeanUtils.copyProperties(payMeetingSituation, situationExcel); - situationList.add(situationExcel); - } - meetingSummaryExcel.setSituationList(situationList); + //List meetingSituationList = meeting.getSituationList(); + //List 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 situationList; + //@ExcelCollection(name = "参会人列表") + //private List situationList; }