From feccd265070dac40a4baa1640c5ca49532ce843f Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Thu, 6 Apr 2023 13:51:02 +0800 Subject: [PATCH] =?UTF-8?q?UAT=20=E9=97=AE=E9=A2=98=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=AC=AC9=E6=9D=A1=E3=80=82?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E8=B0=83=E5=8F=96=EF=BC=8C?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=B8=A6=E5=85=A5=E8=B4=A3=E4=BB=BB=E4=BA=BA?= =?UTF-8?q?=E3=80=81=E6=8E=A5=E5=8F=A3=E4=BA=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ctCertificationInventoryEOServiceImpl.java | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 8cb3bba76..1fa83a183 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -2823,6 +2823,11 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl authDummyInventoryInfoEOList = this.authDummyInventoryInfoEOService.list(authDummyInfoQueryWrap); if(CollectionUtils.isNotEmpty(authDummyInventoryInfoEOList)){ + // 获取该项目相关人员名单信息,用于根据责任领域配置数据 自动设置责任人、接口人。 + QueryWrapper prpQueryWrap = new QueryWrapper<>(); + prpQueryWrap.lambda().eq(ProjectRelatedPersonnel::getProjectId,projectLibraryId); + List prpEoList = this.projectRelatedPersonnelService.list(prpQueryWrap); + QueryWrapper lawsInventoryEOQueryWrap = new QueryWrapper<>(); lawsInventoryEOQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); List projectLawsInventoryEOList = this.projectLawsInventoryEOService.list(lawsInventoryEOQueryWrap); @@ -2849,6 +2854,42 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl prpEoListTemp = prpEoList.stream().filter(prpEo -> { + boolean flag = false; + if (StringUtils.equals(prpEo.getDutyTerritory(), dutyTerritory)) { + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(prpEoListTemp)){ + List engineeringInterfacePersonIdList = new ArrayList<>(); + ProjectRelatedPersonnel prpEo = prpEoListTemp.get(0); + if(StringUtils.isNotBlank(prpEo.getEngineeringInterfacePerson())){ + List engineeringInterfacePersonList = Arrays.asList(prpEo.getEngineeringInterfacePerson().split(",")); + engineeringInterfacePersonIdList.addAll(engineeringInterfacePersonList); + } + if(StringUtils.isNotBlank(prpEo.getEngineerAttSet())){ + List engineerAttSetList = Arrays.asList(prpEo.getEngineerAttSet().split(",")); + engineeringInterfacePersonIdList.addAll(engineerAttSetList); + } + if(StringUtils.isNotBlank(prpEo.getEngineerLawSet())){ + List engineerLawSetList = Arrays.asList(prpEo.getEngineerLawSet().split(",")); + engineeringInterfacePersonIdList.addAll(engineerLawSetList); + } + + engineeringInterfacePersonIdList = engineeringInterfacePersonIdList.stream().distinct().collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(engineeringInterfacePersonIdList) && engineeringInterfacePersonIdList.size() == 1){ + projectCertificationInventoryEOTemp.setSdt(engineeringInterfacePersonIdList.get(0)); + projectCertificationInventoryEOTemp.setDutyPerson(engineeringInterfacePersonIdList.get(0)); + } + } + } + } + projectCertificationInventoryEOTemp.setId(UUID.randomUUID().toString().replace("-", "")); projectCertificationInventoryEOTemp.setProjectLibraryId(projectLibraryId); projectCertificationInventoryEOTemp.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());