LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 会议汇总导出去除参会人

Browse Source
This commit is contained in:
lijiarao
2024-04-09 11:51:34 +08:00
parent e441e9925e
commit 9b96d2a32d
2 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+32 -32
View File
@@ -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;
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/MeetingSummaryExcel.java
+2 -2
View File
@@ -92,6 +92,6 @@ public class MeetingSummaryExcel {
/**
* 参会人列表
*/
@ExcelCollection(name = "参会人列表")
private List<SituationExcel> situationList;
//@ExcelCollection(name = "参会人列表")
//private List<SituationExcel> situationList;
}