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(); PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(payMeetingVO, payMeeting); BeanUtils.copyProperties(payMeetingVO, payMeeting);
String meetingId = meeting.getId(); String meetingId = meeting.getId();
List<PayMeetingSituation> payMeetingSituations; //List<PayMeetingSituation> payMeetingSituations;
if (meetingIdSituationMap.containsKey(meetingId)){ //if (meetingIdSituationMap.containsKey(meetingId)){
payMeetingSituations = meetingIdSituationMap.get(meetingId); // payMeetingSituations = meetingIdSituationMap.get(meetingId);
}else { //}else {
LambdaQueryWrapper<PayMeetingSituation> pmsWrapper = new LambdaQueryWrapper<>(); // LambdaQueryWrapper<PayMeetingSituation> pmsWrapper = new LambdaQueryWrapper<>();
pmsWrapper.eq(PayMeetingSituation::getMeetingId, meetingId); // pmsWrapper.eq(PayMeetingSituation::getMeetingId, meetingId);
payMeetingSituations = payMeetingSituationService.list(pmsWrapper); // payMeetingSituations = payMeetingSituationService.list(pmsWrapper);
} //}
for (PayMeetingSituation meetingSituation : payMeetingSituations) { //for (PayMeetingSituation meetingSituation : payMeetingSituations) {
String companyContactId = meetingSituation.getCompanyContactId(); // String companyContactId = meetingSituation.getCompanyContactId();
PayContactsManagement contactsManagement = contactsManagementService.getById(companyContactId); // PayContactsManagement contactsManagement = contactsManagementService.getById(companyContactId);
meetingSituation.setCompanyContactName(contactsManagement.getName()); // meetingSituation.setCompanyContactName(contactsManagement.getName());
meetingSituation.setPost(contactsManagement.getPost()); // meetingSituation.setPost(contactsManagement.getPost());
meetingSituation.setPhone(PasswordUtil.decrypt(contactsManagement.getPhone())); // meetingSituation.setPhone(PasswordUtil.decrypt(contactsManagement.getPhone()));
meetingSituation.setEmail(PasswordUtil.decrypt(contactsManagement.getEmail())); // meetingSituation.setEmail(PasswordUtil.decrypt(contactsManagement.getEmail()));
PayCompanyManagement companyManagement = companyManagementService.getById(contactsManagement.getCompanyId()); // PayCompanyManagement companyManagement = companyManagementService.getById(contactsManagement.getCompanyId());
String checkFile = meetingSituation.getCheckFile(); // String checkFile = meetingSituation.getCheckFile();
meetingSituation.setCompanyName(companyManagement.getCompanyName()); // meetingSituation.setCompanyName(companyManagement.getCompanyName());
if (StringUtils.isNotBlank(checkFile)) { // if (StringUtils.isNotBlank(checkFile)) {
OSSFile ossFile = iossFileService.getById(checkFile); // OSSFile ossFile = iossFileService.getById(checkFile);
meetingSituation.setCheckFile(ossFile.getUrl()); // meetingSituation.setCheckFile(ossFile.getUrl());
} // }
} //}
meeting.setSituationList(payMeetingSituations); //meeting.setSituationList(payMeetingSituations);
//查询酒店联系人列表 //查询酒店联系人列表
LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PayMeetingHotelContacts::getMeetingId, meetingId); wrapper.eq(PayMeetingHotelContacts::getMeetingId, meetingId);
@@ -1589,14 +1589,14 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
//保存数据 //保存数据
MeetingSummaryExcel meetingSummaryExcel = new MeetingSummaryExcel(); MeetingSummaryExcel meetingSummaryExcel = new MeetingSummaryExcel();
BeanUtils.copyProperties(payMeetingVO, meetingSummaryExcel); BeanUtils.copyProperties(payMeetingVO, meetingSummaryExcel);
List<PayMeetingSituation> meetingSituationList = meeting.getSituationList(); //List<PayMeetingSituation> meetingSituationList = meeting.getSituationList();
List<SituationExcel> situationList = new ArrayList<>(); //List<SituationExcel> situationList = new ArrayList<>();
for (PayMeetingSituation payMeetingSituation : meetingSituationList) { //for (PayMeetingSituation payMeetingSituation : meetingSituationList) {
SituationExcel situationExcel = new SituationExcel(); // SituationExcel situationExcel = new SituationExcel();
BeanUtils.copyProperties(payMeetingSituation, situationExcel); // BeanUtils.copyProperties(payMeetingSituation, situationExcel);
situationList.add(situationExcel); // situationList.add(situationExcel);
} //}
meetingSummaryExcel.setSituationList(situationList); //meetingSummaryExcel.setSituationList(situationList);
exportList.add(meetingSummaryExcel); exportList.add(meetingSummaryExcel);
} }
return exportList; 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 = "参会人列表") //@ExcelCollection(name = "参会人列表")
private List<SituationExcel> situationList; //private List<SituationExcel> situationList;
} }