From f316cc180b06b0f3844e68b1d0d92d98dfc35829 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 8 Jul 2024 14:37:09 +0800 Subject: [PATCH] =?UTF-8?q?fix=2086923=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83--=E5=88=86=E5=8F=91=E8=B5=84?= =?UTF-8?q?=E6=96=99--=E6=89=B9=E9=87=8F=E5=88=86=E5=8F=91=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=94=B6=E5=88=B0=E9=82=AE=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ingGroupDistributionRecordServiceImpl.java | 48 ++++++++++--------- 1 file changed, 25 insertions(+), 23 deletions(-) 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 3a1d26b7..43bab30e 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 @@ -139,9 +139,11 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl list = new ArrayList<>(); String msg = ""; + String projectId = payWorkingGroupDistributionRecord.getProjectId(); + Integer projectType = payWorkingGroupDistributionRecord.getProjectType(); List listPayWorkingGroupDistributionRecord = new ArrayList<>(); - if(Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE1)){ - PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupDistributionRecord.getProjectId()); + if(Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE1)){ + PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(projectId); if(Objects.isNull(payWorkingGroup)){ throw new JeroBootException("工作组不存在!"); } @@ -159,7 +161,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl queryPayContactsManagement = new LambdaQueryWrapper<>(); queryPayContactsManagement.in(PayContactsManagement::getId, Arrays.asList(contactsIds.split(","))); List listContacts = payContactsManagementService.list(queryPayContactsManagement); @@ -169,15 +171,15 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl queryPayCaseCommitteeSubitem = new LambdaQueryWrapper<>(); - queryPayCaseCommitteeSubitem.eq(PayCaseCommitteeSubitem::getCommitteeId,payWorkingGroupDistributionRecord.getProjectId()); + queryPayCaseCommitteeSubitem.eq(PayCaseCommitteeSubitem::getCommitteeId, projectId); queryPayCaseCommitteeSubitem.in(PayCaseCommitteeSubitem::getContactsId,Arrays.asList(s)); List listPayCaseCommitteeSubitem = payCaseCommitteeSubitemService.list(queryPayCaseCommitteeSubitem); if(!CollectionUtils.isEmpty(listPayCaseCommitteeSubitem)){ listPayCaseCommitteeSubitem.forEach(p->{ PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecordNew = new PayWorkingGroupDistributionRecord(); payWorkingGroupDistributionRecordNew.setDataId(payWorkingGroupDistributionRecord.getDataId()); - payWorkingGroupDistributionRecordNew.setProjectId(payWorkingGroupDistributionRecord.getProjectId()); - payWorkingGroupDistributionRecordNew.setProjectType(payWorkingGroupDistributionRecord.getProjectType()); + payWorkingGroupDistributionRecordNew.setProjectId(projectId); + payWorkingGroupDistributionRecordNew.setProjectType(projectType); payWorkingGroupDistributionRecordNew.setFileId(byId.getId()); payWorkingGroupDistributionRecordNew.setSubId(p.getId()); payWorkingGroupDistributionRecordNew.setContactsId(p.getContactsId()); @@ -186,12 +188,12 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl queryPayContactsManagement = new LambdaQueryWrapper<>(); queryPayContactsManagement.in(PayContactsManagement::getId, Arrays.asList(contactsIds.split(","))); List listContacts = payContactsManagementService.list(queryPayContactsManagement); @@ -201,15 +203,15 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PayCaseCouncilSubitem::getCouncilId,payWorkingGroupDistributionRecord.getProjectId()); + queryWrapper.eq(PayCaseCouncilSubitem::getCouncilId, projectId); queryWrapper.in(PayCaseCouncilSubitem::getContactsId,Arrays.asList(s)); List payCaseCouncilSubitems = payCaseCouncilSubitemService.list(queryWrapper); if(!CollectionUtils.isEmpty(payCaseCouncilSubitems)){ payCaseCouncilSubitems.forEach(p->{ PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecordNew = new PayWorkingGroupDistributionRecord(); payWorkingGroupDistributionRecordNew.setDataId(payWorkingGroupDistributionRecord.getDataId()); - payWorkingGroupDistributionRecordNew.setProjectId(payWorkingGroupDistributionRecord.getProjectId()); - payWorkingGroupDistributionRecordNew.setProjectType(payWorkingGroupDistributionRecord.getProjectType()); + payWorkingGroupDistributionRecordNew.setProjectId(projectId); + payWorkingGroupDistributionRecordNew.setProjectType(projectType); payWorkingGroupDistributionRecordNew.setFileId(byId.getId()); payWorkingGroupDistributionRecordNew.setSubId(p.getId()); payWorkingGroupDistributionRecordNew.setContactsId(p.getContactsId()); @@ -217,13 +219,13 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl 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.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)){ + }else if(Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE2)){ List 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.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)){ + }else if(Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE4)){ List 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.getContactsId(),p.getId())).collect(Collectors.toList()); if(CollectionUtils.isEmpty(listStr)){ @@ -536,7 +538,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.in(PayContactsManagement::getId, Arrays.asList(s));