diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java index 2577bfab..ef596a62 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java @@ -431,22 +431,21 @@ public class PayDraftingGroupSubItemController extends JeroController listIds = listPayDraftingGroupSubItemContacts.stream().map(PayDraftingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); // 拿到所有联系人信息对应的详情信息 - List listPayContactsManagementTemporary = payContactsManagementTemporaryService.listByIds(listIds); for (int i = 0; i < listPayDraftingGroupSubItemContacts.size(); i++) { - PayDraftingGroupSubItemContacts payDraftingGroupSubItemContacts = listPayDraftingGroupSubItemContacts.get(i); + PayDraftingGroupSubItemContacts contacts = listPayDraftingGroupSubItemContacts.get(i); // 拿到该联系人的详情信息 - List temporary = listPayContactsManagementTemporary.stream().filter(s->Objects.equals(s.getId(),payDraftingGroupSubItemContacts.getContactsTemporaryId())).collect(Collectors.toList()); + PayContactsManagementTemporary temporary = payContactsManagementTemporaryService.getByAllTable(contacts.getContactsId(), contacts.getContactsTemporaryId()); String email = ""; String phone = ""; - String name = payDraftingGroupSubItemContacts.getContactsTemporaryName(); - String remark = payDraftingGroupSubItemContacts.getRemarks(); - if(!CollectionUtils.isEmpty(temporary)){ - email = temporary.get(0).getEmail(); + String name = contacts.getContactsTemporaryName(); + String remark = contacts.getRemarks(); + if(temporary != null){ + email = temporary.getEmail(); // 解密 if (StringUtils.isNotBlank(email)){ email = PasswordUtil.decrypt(email); } - phone = temporary.get(0).getPhone(); + phone = temporary.getPhone(); if (StringUtils.isNotBlank(phone)){ phone = PasswordUtil.decrypt(phone); } @@ -512,6 +511,57 @@ public class PayDraftingGroupSubItemController extends JeroController listContactsName11 = list.stream().map(PayDraftingGroupSubItem::getContactsName11).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName11)){ + listContactsName.addAll(listContactsName11); + } + // 获取excel中联系人12名称 + List listContactsName12 = list.stream().map(PayDraftingGroupSubItem::getContactsName12).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName12)){ + listContactsName.addAll(listContactsName12); + } + // 获取excel中联系人13名称 + List listContactsName13 = list.stream().map(PayDraftingGroupSubItem::getContactsName13).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName13)){ + listContactsName.addAll(listContactsName13); + } + // 获取excel中联系人14名称 + List listContactsName14 = list.stream().map(PayDraftingGroupSubItem::getContactsName14).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName14)){ + listContactsName.addAll(listContactsName14); + } + // 获取excel中联系人15名称 + List listContactsName15 = list.stream().map(PayDraftingGroupSubItem::getContactsName15).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName15)){ + listContactsName.addAll(listContactsName15); + } + // 获取excel中联系人16名称 + List listContactsName16 = list.stream().map(PayDraftingGroupSubItem::getContactsName16).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName16)){ + listContactsName.addAll(listContactsName16); + } + // 获取excel中联系人17名称 + List listContactsName17 = list.stream().map(PayDraftingGroupSubItem::getContactsName17).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName17)){ + listContactsName.addAll(listContactsName17); + } + // 获取excel中联系人18名称 + List listContactsName18 = list.stream().map(PayDraftingGroupSubItem::getContactsName18).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName18)){ + listContactsName.addAll(listContactsName18); + } + // 获取excel中联系人19名称 + List listContactsName19 = list.stream().map(PayDraftingGroupSubItem::getContactsName19).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName19)){ + listContactsName.addAll(listContactsName19); + } + // 获取excel中联系人20名称 + List listContactsName20 = list.stream().map(PayDraftingGroupSubItem::getContactsName20).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName20)){ + listContactsName.addAll(listContactsName20); + } // 获取excel联系人信息 LambdaQueryWrapper contactsWrapper = new LambdaQueryWrapper<>(); contactsWrapper.in(PayContactsManagement::getName,listContactsName); @@ -686,6 +737,16 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl listByIds (List contactsId); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayContactsManagementTemporaryServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayContactsManagementTemporaryServiceImpl.java index 94070164..8ad15004 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayContactsManagementTemporaryServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/temporary/service/impl/PayContactsManagementTemporaryServiceImpl.java @@ -101,4 +101,15 @@ public class PayContactsManagementTemporaryServiceImpl extends ServiceImpl listByIds(List contactsId) { + List temporaryList = super.listByIds(contactsId); + List payContactsManagements = payContactsManagementService.listByIds(contactsId); + for (PayContactsManagement contactsManagement : payContactsManagements) { + String str = JSONObject.toJSONString(contactsManagement); + temporaryList.add(JSON.parseObject(str, PayContactsManagementTemporary.class)); + } + return temporaryList; + } }