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 5da2f2b5..9a0d3ffb 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 @@ -266,9 +266,11 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl queryPayWorkingGroupSubItem = new LambdaQueryWrapper<>(); - queryPayWorkingGroupSubItem.in(PayWorkingGroupSubItem::getContactsTemporaryIdOne,Arrays.asList(s)); - List listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(queryPayWorkingGroupSubItem); + // 查询分标委成员 + LambdaQueryWrapper queryPayCaseCommitteeSubitem = new LambdaQueryWrapper<>(); + queryPayCaseCommitteeSubitem.eq(PayCaseCommitteeSubitem::getCommitteeId,payWorkingGroupDistributionRecord.getProjectId()); + queryPayCaseCommitteeSubitem.in(PayCaseCommitteeSubitem::getContactsId,Arrays.asList(s)); + List listPayCaseCommitteeSubitem = payCaseCommitteeSubitemService.list(queryPayCaseCommitteeSubitem); listPayWorkingGroupDataFile.forEach(p->{ OSSFile byId = iossFileService.getById(p.getFileId()); if(Objects.isNull(byId)){ @@ -278,16 +280,16 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl{ + if(!CollectionUtils.isEmpty(listPayCaseCommitteeSubitem)){ + listPayCaseCommitteeSubitem.forEach(p1->{ PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecordNew = new PayWorkingGroupDistributionRecord(); payWorkingGroupDistributionRecordNew.setDataId(p.getId()); payWorkingGroupDistributionRecordNew.setProjectId(payWorkingGroupDistributionRecord.getProjectId()); payWorkingGroupDistributionRecordNew.setProjectType(payWorkingGroupDistributionRecord.getProjectType()); payWorkingGroupDistributionRecordNew.setFileId(byId.getId()); payWorkingGroupDistributionRecordNew.setSubId(p1.getId()); - payWorkingGroupDistributionRecordNew.setContactsId(p1.getContactsIdOne()); - payWorkingGroupDistributionRecordNew.setContactsName(p1.getContactsTemporaryNameOne()); + payWorkingGroupDistributionRecordNew.setContactsId(p1.getContactsId()); + payWorkingGroupDistributionRecordNew.setContactsName(p1.getContactsName()); listPayWorkingGroupDistributionRecord.add(payWorkingGroupDistributionRecordNew); }); }