update 标协会议报名信息维护导出
This commit is contained in:
+12
-3
@@ -1,5 +1,6 @@
|
||||
package com.jero.meeting.service.impl;
|
||||
|
||||
import cn.hutool.core.collection.CollStreamUtil;
|
||||
import cn.hutool.core.date.DateField;
|
||||
import cn.hutool.core.date.DateTime;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
@@ -1791,16 +1792,24 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
|
||||
pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
|
||||
}
|
||||
List<Object> exportList = new ArrayList<>();
|
||||
LambdaQueryWrapper<PayCompanyManagement> wrapper = new LambdaQueryWrapper<>();
|
||||
wrapper.select(PayCompanyManagement::getId,PayCompanyManagement::getCompanyName);
|
||||
List<PayCompanyManagement> companyManagementList = companyManagementService.list(wrapper);
|
||||
Map<String, String> companyManagementMap = CollStreamUtil.toMap(companyManagementList, PayCompanyManagement::getId, PayCompanyManagement::getCompanyName);
|
||||
|
||||
LambdaQueryWrapper<PayContactsManagement> wrapper1 = new LambdaQueryWrapper<>();
|
||||
wrapper1.select(PayContactsManagement::getId,PayContactsManagement::getName,PayContactsManagement::getPost,PayContactsManagement::getPhone,PayContactsManagement::getEmail);
|
||||
List<PayContactsManagement> contactsManagementList = contactsManagementService.list(wrapper1);
|
||||
Map<String, PayContactsManagement> contactsManagementMap = CollStreamUtil.toIdentityMap(contactsManagementList, PayContactsManagement::getId);
|
||||
for (PayMeetingSituation meetingSituation : pageList) {
|
||||
|
||||
String companyContactId = meetingSituation.getCompanyContactId();
|
||||
PayContactsManagement contactsManagement = contactsManagementService.getById(companyContactId);
|
||||
PayContactsManagement contactsManagement = contactsManagementMap.get(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());
|
||||
meetingSituation.setCompanyName(companyManagement.getCompanyName());
|
||||
meetingSituation.setCompanyName(companyManagementMap.get(contactsManagement.getCompanyId()));
|
||||
String checkFile = meetingSituation.getCheckFile();
|
||||
if (StringUtils.isNotBlank(checkFile)) {
|
||||
OSSFile ossFile = ossFileService.getById(checkFile);
|
||||
|
||||
+13
-13
@@ -612,12 +612,12 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
||||
tbMemberProjectSubitemMapper.updateById(tbMember);
|
||||
|
||||
//拼装推到标协缴费的参数
|
||||
List<TbCheckVo> typr5List = new ArrayList<>();
|
||||
BeanUtils.copyProperties(payPaymentRecord,tbCheckVo);
|
||||
tbCheckVo.setId(tbMember.getTbPaymentId());
|
||||
tbCheckVo.setCheckMark(payPaymentRecord.getReviewInstructions());
|
||||
typr5List.add(tbCheckVo);
|
||||
payPaymentRecordService.pushToStandards(typr5List);
|
||||
//List<TbCheckVo> typr5List = new ArrayList<>();
|
||||
//BeanUtils.copyProperties(payPaymentRecord,tbCheckVo);
|
||||
//tbCheckVo.setId(tbMember.getTbPaymentId());
|
||||
//tbCheckVo.setCheckMark(payPaymentRecord.getReviewInstructions());
|
||||
//typr5List.add(tbCheckVo);
|
||||
//payPaymentRecordService.pushToStandards(typr5List);
|
||||
|
||||
break;
|
||||
//标协证书
|
||||
@@ -690,13 +690,13 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
|
||||
//更新主列表
|
||||
certificatePaymentMapper.updateById(tbMemberCertificate);
|
||||
|
||||
//拼装推到标协缴费的参数
|
||||
List<TbCheckVo> typr6List = new ArrayList<>();
|
||||
BeanUtils.copyProperties(payPaymentRecord,tbCheckCerVo);
|
||||
tbCheckCerVo.setId(tbMemberCertificate.getTbPaymentId());
|
||||
tbCheckCerVo.setCheckMark(payPaymentRecord.getReviewInstructions());
|
||||
typr6List.add(tbCheckCerVo);
|
||||
JSONObject jsonObject = AuthenticationUtils.postResult("/certificatePaymentInfo/incomingPaymentCheckCertificate", null, typr6List);
|
||||
////拼装推到标协缴费的参数
|
||||
//List<TbCheckVo> typr6List = new ArrayList<>();
|
||||
//BeanUtils.copyProperties(payPaymentRecord,tbCheckCerVo);
|
||||
//tbCheckCerVo.setId(tbMemberCertificate.getTbPaymentId());
|
||||
//tbCheckCerVo.setCheckMark(payPaymentRecord.getReviewInstructions());
|
||||
//typr6List.add(tbCheckCerVo);
|
||||
//JSONObject jsonObject = AuthenticationUtils.postResult("/certificatePaymentInfo/incomingPaymentCheckCertificate", null, typr6List);
|
||||
|
||||
break;
|
||||
default:break;
|
||||
|
||||
+12
-12
@@ -1176,18 +1176,18 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
|
||||
*/
|
||||
@Override
|
||||
public void pushToStandards(List<TbCheckVo> typr5List){
|
||||
JSONObject jsonObject = AuthenticationUtils.postResult("/paymentInfo/incomingPaymentCheckMember", null, typr5List);
|
||||
String memberNo = jsonObject.getString("memberNo");
|
||||
Integer memberType = jsonObject.getInteger("memberType");
|
||||
Integer memberStatus = jsonObject.getInteger("memberStatus");
|
||||
MemberInfo memberInfo = new MemberInfo();
|
||||
memberInfo.setMemberNo(memberNo);
|
||||
memberInfo.setMemberType(memberType);
|
||||
memberInfo.setMemberStatus(memberStatus);
|
||||
for (TbCheckVo tbCheckVo : typr5List) {
|
||||
String id = tbCheckVo.getId();
|
||||
updateStandards(id,memberInfo);
|
||||
}
|
||||
//JSONObject jsonObject = AuthenticationUtils.postResult("/paymentInfo/incomingPaymentCheckMember", null, typr5List);
|
||||
//String memberNo = jsonObject.getString("memberNo");
|
||||
//Integer memberType = jsonObject.getInteger("memberType");
|
||||
//Integer memberStatus = jsonObject.getInteger("memberStatus");
|
||||
//MemberInfo memberInfo = new MemberInfo();
|
||||
//memberInfo.setMemberNo(memberNo);
|
||||
//memberInfo.setMemberType(memberType);
|
||||
//memberInfo.setMemberStatus(memberStatus);
|
||||
//for (TbCheckVo tbCheckVo : typr5List) {
|
||||
// String id = tbCheckVo.getId();
|
||||
// updateStandards(id,memberInfo);
|
||||
//}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user