diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java index 80f73a64..691ba860 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java @@ -247,14 +247,6 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl listMsg = new ArrayList<>(); for (PayContactsManagementTemporary p : list) { try { - List listStr = listPayWorkingGroupDistributionRecord.stream().filter(item-> - (payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE4) ? - Objects.equals(item.getTemporaryContactsId(),p.getId()) : - Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList()); - if(CollectionUtils.isEmpty(listStr)){ - continue; - } - // 发送消息 SendMessageDTO sendMessageDTO = new SendMessageDTO(); Integer sendEmailFlag = payWorkingGroupDistributionRecord.getSendEmailFlag(); @@ -275,9 +267,32 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl listStr = listPayWorkingGroupDistributionRecord.stream().filter(item-> + Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE1) ? + Objects.equals(item.getTemporaryContactsId(),p.getId()) : + Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList()); + if(CollectionUtils.isEmpty(listStr)){ + continue; + } json.put("id",listStr.get(0).getSubId()); }else if(Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE2)){ + List listStr = listPayWorkingGroupDistributionRecord.stream().filter(item-> + Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE2) ? + Objects.equals(item.getTemporaryContactsId(),p.getId()) : + Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList()); + if(CollectionUtils.isEmpty(listStr)){ + continue; + } json.put("id",listStr.get(0).getProjectId()); + }else if(Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE4)){ + List listStr = listPayWorkingGroupDistributionRecord.stream().filter(item-> + Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE4) ? + Objects.equals(item.getTemporaryContactsId(),p.getId()) : + Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList()); + if(CollectionUtils.isEmpty(listStr)){ + continue; + } + json.put("id",listStr.get(0).getSubId()); } sendMessageDTO.setBusId(json.toJSONString()); sendMessageService.SendMessageService(sendMessageDTO);