From 082521657e487fc10e7c3cfc078ca8cca7501084 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Fri, 31 Mar 2023 13:43:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E7=94=A8=E6=88=B7=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E8=AE=BE=E7=BD=AE=E4=BA=86=E5=B7=A5=E7=A8=8B=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BA=BA,=E5=A6=82=E6=9E=9C=E8=B4=A3=E4=BB=BB?= =?UTF-8?q?=E4=BA=BA=E6=98=AF=E7=A9=BA=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=B8=A6?= =?UTF-8?q?=E5=85=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/job/InventoryAffirmJob.java | 2 +- ...ctCertificationInventoryEOServiceImpl.java | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java index e326545a5..5868282ee 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java @@ -86,7 +86,7 @@ public class InventoryAffirmJob implements Job { queryWrapperInventory.and(queryWrapper -> { queryWrapper.lambda().eq(ProjectLawsInventoryEO::getDesignFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); queryWrapper.or(or -> { - or.lambda().eq(ProjectLawsInventoryEO::getDesignFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); + or.lambda().eq(ProjectLawsInventoryEO::getVerifyFlowStatus, ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue()); }); }); List projectLawsInventoryEOList = this.projectLawsInventoryEOMapper.selectList(queryWrapperInventory); 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 43a5b0a77..404055c17 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 @@ -373,11 +373,39 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl idList = Arrays.asList(ids.split(",")); + QueryWrapper pciQueryWrap = new QueryWrapper<>(); + pciQueryWrap.lambda().in(ProjectCertificationInventoryEO::getId,idList); + List pciEoList = this.list(pciQueryWrap); + List updateList = new ArrayList<>(); for (String id : idList) { ProjectCertificationInventoryEO updateProjectCertificationInventoryEO = new ProjectCertificationInventoryEO(); BeanUtils.copyProperties(projectCertificationInventoryEO,updateProjectCertificationInventoryEO); updateProjectCertificationInventoryEO.setId(id); + + /** + * 2023-03-30 17.36新增该需求。 + * 如果用户批量设置了工程接口人字段 + * 那就需要判断所选数据中责任人是否为空 + * 如果责任人字段为空时 需要将工程接口人带入到所选数据的责任人字段中 + */ + if(StringUtils.isNotBlank(projectCertificationInventoryEO.getSdt())){ + List pciEoListTemp = pciEoList.stream().filter(pciEo -> { + boolean flag = false; + if (StringUtils.equals(pciEo.getId(), id)) { + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(pciEoListTemp)){ + ProjectCertificationInventoryEO pciEo = pciEoListTemp.get(0); + if(StringUtils.isEmpty(pciEo.getDutyPerson())){ + updateProjectCertificationInventoryEO.setDutyPerson(projectCertificationInventoryEO.getSdt()); + } + } + } + updateList.add(updateProjectCertificationInventoryEO); }