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

fix 86923 功能安全中心--分发资料--批量分发没有收到邮件

Browse Source
This commit is contained in:
lijiarao
2024-07-08 14:37:09 +08:00
parent da49967d83
commit f316cc180b
1 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java
+25 -23
View File
@@ -139,9 +139,11 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
listFile.add(path + url); listFile.add(path + url);
List<PayContactsManagementTemporary> list = new ArrayList<>(); List<PayContactsManagementTemporary> list = new ArrayList<>();
String msg = ""; String msg = "";
String projectId = payWorkingGroupDistributionRecord.getProjectId();
Integer projectType = payWorkingGroupDistributionRecord.getProjectType();
List<PayWorkingGroupDistributionRecord> listPayWorkingGroupDistributionRecord = new ArrayList<>(); List<PayWorkingGroupDistributionRecord> listPayWorkingGroupDistributionRecord = new ArrayList<>();
if(Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE1)){ if(Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE1)){
PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupDistributionRecord.getProjectId()); PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(projectId);
if(Objects.isNull(payWorkingGroup)){ if(Objects.isNull(payWorkingGroup)){
throw new JeroBootException("工作组不存在!"); throw new JeroBootException("工作组不存在!");
} }
@@ -159,7 +161,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
list = listContacts; list = listContacts;
} }
msg = payWorkingGroup.getWorkingGroupProject(); msg = payWorkingGroup.getWorkingGroupProject();
}else if(Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE2)){ }else if(Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE2)){
LambdaQueryWrapper<PayContactsManagement> queryPayContactsManagement = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayContactsManagement> queryPayContactsManagement = new LambdaQueryWrapper<>();
queryPayContactsManagement.in(PayContactsManagement::getId, Arrays.asList(contactsIds.split(","))); queryPayContactsManagement.in(PayContactsManagement::getId, Arrays.asList(contactsIds.split(",")));
List<PayContactsManagement> listContacts = payContactsManagementService.list(queryPayContactsManagement); List<PayContactsManagement> listContacts = payContactsManagementService.list(queryPayContactsManagement);
@@ -169,15 +171,15 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
} }
// 查询分标委成员 // 查询分标委成员
LambdaQueryWrapper<PayCaseCommitteeSubitem> queryPayCaseCommitteeSubitem = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayCaseCommitteeSubitem> queryPayCaseCommitteeSubitem = new LambdaQueryWrapper<>();
queryPayCaseCommitteeSubitem.eq(PayCaseCommitteeSubitem::getCommitteeId,payWorkingGroupDistributionRecord.getProjectId()); queryPayCaseCommitteeSubitem.eq(PayCaseCommitteeSubitem::getCommitteeId, projectId);
queryPayCaseCommitteeSubitem.in(PayCaseCommitteeSubitem::getContactsId,Arrays.asList(s)); queryPayCaseCommitteeSubitem.in(PayCaseCommitteeSubitem::getContactsId,Arrays.asList(s));
List<PayCaseCommitteeSubitem> listPayCaseCommitteeSubitem = payCaseCommitteeSubitemService.list(queryPayCaseCommitteeSubitem); List<PayCaseCommitteeSubitem> listPayCaseCommitteeSubitem = payCaseCommitteeSubitemService.list(queryPayCaseCommitteeSubitem);
if(!CollectionUtils.isEmpty(listPayCaseCommitteeSubitem)){ if(!CollectionUtils.isEmpty(listPayCaseCommitteeSubitem)){
listPayCaseCommitteeSubitem.forEach(p->{ listPayCaseCommitteeSubitem.forEach(p->{
PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecordNew = new PayWorkingGroupDistributionRecord(); PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecordNew = new PayWorkingGroupDistributionRecord();
payWorkingGroupDistributionRecordNew.setDataId(payWorkingGroupDistributionRecord.getDataId()); payWorkingGroupDistributionRecordNew.setDataId(payWorkingGroupDistributionRecord.getDataId());
payWorkingGroupDistributionRecordNew.setProjectId(payWorkingGroupDistributionRecord.getProjectId()); payWorkingGroupDistributionRecordNew.setProjectId(projectId);
payWorkingGroupDistributionRecordNew.setProjectType(payWorkingGroupDistributionRecord.getProjectType()); payWorkingGroupDistributionRecordNew.setProjectType(projectType);
payWorkingGroupDistributionRecordNew.setFileId(byId.getId()); payWorkingGroupDistributionRecordNew.setFileId(byId.getId());
payWorkingGroupDistributionRecordNew.setSubId(p.getId()); payWorkingGroupDistributionRecordNew.setSubId(p.getId());
payWorkingGroupDistributionRecordNew.setContactsId(p.getContactsId()); payWorkingGroupDistributionRecordNew.setContactsId(p.getContactsId());
@@ -186,12 +188,12 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
}); });
} }
PayCaseCommittee payCaseCommittee = payCaseCommitteeService.getById(payWorkingGroupDistributionRecord.getProjectId()); PayCaseCommittee payCaseCommittee = payCaseCommitteeService.getById(projectId);
if(Objects.isNull(payCaseCommittee)){ if(Objects.isNull(payCaseCommittee)){
throw new JeroBootException("分标委不存在!"); throw new JeroBootException("分标委不存在!");
} }
msg = payCaseCommittee.getName(); msg = payCaseCommittee.getName();
}else if(Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE3)){ }else if(Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE3)){
LambdaQueryWrapper<PayContactsManagement> queryPayContactsManagement = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayContactsManagement> queryPayContactsManagement = new LambdaQueryWrapper<>();
queryPayContactsManagement.in(PayContactsManagement::getId, Arrays.asList(contactsIds.split(","))); queryPayContactsManagement.in(PayContactsManagement::getId, Arrays.asList(contactsIds.split(",")));
List<PayContactsManagement> listContacts = payContactsManagementService.list(queryPayContactsManagement); List<PayContactsManagement> listContacts = payContactsManagementService.list(queryPayContactsManagement);
@@ -201,15 +203,15 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
} }
// 查询分标委成员 // 查询分标委成员
LambdaQueryWrapper<PayCaseCouncilSubitem> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayCaseCouncilSubitem> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PayCaseCouncilSubitem::getCouncilId,payWorkingGroupDistributionRecord.getProjectId()); queryWrapper.eq(PayCaseCouncilSubitem::getCouncilId, projectId);
queryWrapper.in(PayCaseCouncilSubitem::getContactsId,Arrays.asList(s)); queryWrapper.in(PayCaseCouncilSubitem::getContactsId,Arrays.asList(s));
List<PayCaseCouncilSubitem> payCaseCouncilSubitems = payCaseCouncilSubitemService.list(queryWrapper); List<PayCaseCouncilSubitem> payCaseCouncilSubitems = payCaseCouncilSubitemService.list(queryWrapper);
if(!CollectionUtils.isEmpty(payCaseCouncilSubitems)){ if(!CollectionUtils.isEmpty(payCaseCouncilSubitems)){
payCaseCouncilSubitems.forEach(p->{ payCaseCouncilSubitems.forEach(p->{
PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecordNew = new PayWorkingGroupDistributionRecord(); PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecordNew = new PayWorkingGroupDistributionRecord();
payWorkingGroupDistributionRecordNew.setDataId(payWorkingGroupDistributionRecord.getDataId()); payWorkingGroupDistributionRecordNew.setDataId(payWorkingGroupDistributionRecord.getDataId());
payWorkingGroupDistributionRecordNew.setProjectId(payWorkingGroupDistributionRecord.getProjectId()); payWorkingGroupDistributionRecordNew.setProjectId(projectId);
payWorkingGroupDistributionRecordNew.setProjectType(payWorkingGroupDistributionRecord.getProjectType()); payWorkingGroupDistributionRecordNew.setProjectType(projectType);
payWorkingGroupDistributionRecordNew.setFileId(byId.getId()); payWorkingGroupDistributionRecordNew.setFileId(byId.getId());
payWorkingGroupDistributionRecordNew.setSubId(p.getId()); payWorkingGroupDistributionRecordNew.setSubId(p.getId());
payWorkingGroupDistributionRecordNew.setContactsId(p.getContactsId()); payWorkingGroupDistributionRecordNew.setContactsId(p.getContactsId());
@@ -217,13 +219,13 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
listPayWorkingGroupDistributionRecord.add(payWorkingGroupDistributionRecordNew); listPayWorkingGroupDistributionRecord.add(payWorkingGroupDistributionRecordNew);
}); });
} }
PayCaseCouncil payCaseCouncil = payCaseCouncilService.getById(payWorkingGroupDistributionRecord.getProjectId()); PayCaseCouncil payCaseCouncil = payCaseCouncilService.getById(projectId);
if(Objects.isNull(payCaseCouncil)){ if(Objects.isNull(payCaseCouncil)){
throw new JeroBootException("理事会不存在!"); throw new JeroBootException("理事会不存在!");
} }
msg = payCaseCouncil.getName(); msg = payCaseCouncil.getName();
}else if(Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE4)){ }else if(Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE4)){
PayDraftingGroup payDraftingGroup = payDraftingGroupService.getById(payWorkingGroupDistributionRecord.getProjectId()); PayDraftingGroup payDraftingGroup = payDraftingGroupService.getById(projectId);
if(Objects.isNull(payDraftingGroup)){ if(Objects.isNull(payDraftingGroup)){
throw new JeroBootException("起草组不存在!"); throw new JeroBootException("起草组不存在!");
} }
@@ -241,8 +243,8 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
list = listContacts; list = listContacts;
} }
msg = payDraftingGroup.getDraftingGroupProject(); msg = payDraftingGroup.getDraftingGroupProject();
}else if(Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE5)){ }else if(Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE5)){
SafetyCenter safetyCenter = safetyCenterService.getById(payWorkingGroupDistributionRecord.getProjectId()); SafetyCenter safetyCenter = safetyCenterService.getById(projectId);
if(Objects.isNull(safetyCenter)){ if(Objects.isNull(safetyCenter)){
throw new JeroBootException("功能安全中心项目不存在!"); throw new JeroBootException("功能安全中心项目不存在!");
} }
@@ -299,27 +301,27 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
sendMessageDTO.setListFile(listFile); sendMessageDTO.setListFile(listFile);
sendMessageDTO.setBusType("C_OPEN_TYPE12"); sendMessageDTO.setBusType("C_OPEN_TYPE12");
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
if(Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE1)){ if(Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE1)){
List<PayWorkingGroupDistributionRecord> listStr = listPayWorkingGroupDistributionRecord.stream().filter(item-> List<PayWorkingGroupDistributionRecord> listStr = listPayWorkingGroupDistributionRecord.stream().filter(item->
Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE1) ? Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE1) ?
Objects.equals(item.getTemporaryContactsId(),p.getId()) : Objects.equals(item.getTemporaryContactsId(),p.getId()) :
Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList()); Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList());
if(CollectionUtils.isEmpty(listStr)){ if(CollectionUtils.isEmpty(listStr)){
continue; continue;
} }
json.put("id",listStr.get(0).getSubId()); json.put("id",listStr.get(0).getSubId());
}else if(Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE2)){ }else if(Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE2)){
List<PayWorkingGroupDistributionRecord> listStr = listPayWorkingGroupDistributionRecord.stream().filter(item-> List<PayWorkingGroupDistributionRecord> listStr = listPayWorkingGroupDistributionRecord.stream().filter(item->
Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE2) ? Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE2) ?
Objects.equals(item.getTemporaryContactsId(),p.getId()) : Objects.equals(item.getTemporaryContactsId(),p.getId()) :
Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList()); Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList());
if(CollectionUtils.isEmpty(listStr)){ if(CollectionUtils.isEmpty(listStr)){
continue; continue;
} }
json.put("id",listStr.get(0).getProjectId()); json.put("id",listStr.get(0).getProjectId());
}else if(Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE4)){ }else if(Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE4)){
List<PayWorkingGroupDistributionRecord> listStr = listPayWorkingGroupDistributionRecord.stream().filter(item-> List<PayWorkingGroupDistributionRecord> listStr = listPayWorkingGroupDistributionRecord.stream().filter(item->
Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE4) ? Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE4) ?
Objects.equals(item.getTemporaryContactsId(),p.getId()) : Objects.equals(item.getTemporaryContactsId(),p.getId()) :
Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList()); Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList());
if(CollectionUtils.isEmpty(listStr)){ if(CollectionUtils.isEmpty(listStr)){
@@ -536,7 +538,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
String url = byId.getUrl(); String url = byId.getUrl();
listFile.add(path + url); listFile.add(path + url);
payWorkingGroupDistributionRecord.setDataId(p.getId()); payWorkingGroupDistributionRecord.setDataId(p.getId());
setRecordByDrafting( payWorkingGroupDistributionRecord,s,listPayWorkingGroupDistributionRecord, byId); setRecordBySafetyCenter( payWorkingGroupDistributionRecord,s,listPayWorkingGroupDistributionRecord, byId);
}); });
LambdaQueryWrapper<PayContactsManagement> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayContactsManagement> wrapper = new LambdaQueryWrapper<>();
wrapper.in(PayContactsManagement::getId, Arrays.asList(s)); wrapper.in(PayContactsManagement::getId, Arrays.asList(s));