From e644205ca2c623cf13330c06188fe22e57ac90a6 Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 4 Jul 2022 11:07:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E9=A1=B9?= =?UTF-8?q?=E6=94=B6=E9=9B=86-=E5=B8=A6=E5=85=A5=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOController.java | 15 ++++++++ .../IParamsCollectManifestEOService.java | 3 ++ .../ParamsCollectManifestEOServiceImpl.java | 38 +++++++++++++++++++ .../controller/ParamsReportEOController.java | 2 +- .../mapper/xml/ParamsReportEOMapper.xml | 2 +- 5 files changed, 58 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java index 09e668c4a..d4c154ac0 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java @@ -479,6 +479,21 @@ public class ParamsCollectManifestEOController extends JeroController bringSdtInto(ParamsCollectManifestVO paramsCollectManifestVO) { + paramsCollectManifestEOService.bringSdtInto(paramsCollectManifestVO); + return Result.OK("带入工程接口人成功！"); + } + diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java index bdfb056a0..977b46f42 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java @@ -139,4 +139,7 @@ public interface IParamsCollectManifestEOService extends IService list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO); + // 过滤出 状态为：待发起收集，且工程接口人处为空的参数项 + list = list.stream().filter(e-> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState()) && StringUtils.isBlank(e.getSdt())).collect(Collectors.toList()); + + List updateCollectManifestEOList = new ArrayList<>(); + if (CollectionUtil.isNotEmpty(list)) { + list.forEach(collectManifestEO -> { + + // 根据负责领域处理工程接口人（零个，一个，多个）： 领域中仅有一个人时，添加该字段 + ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(projectId, collectManifestEO.getDutyTerritory()); + if (ObjectUtil.isNotEmpty(projectRelatedPersonnel)) { + String sdtId = projectRelatedPersonnel.getEngineeringInterfacePerson(); + if (org.apache.commons.lang.StringUtils.isNotBlank(sdtId) && !sdtId.contains(",")) { // 领域中仅有一个人时，添加该字段 + SysUser sysUser = sysUserService.getById(sdtId); + if (ObjectUtil.isNotEmpty(sysUser)) { + ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO(); + updateCollectManifestEO.setId(collectManifestEO.getId()); + updateCollectManifestEO.setSdt(sysUser.getUsername()); + + updateCollectManifestEOList.add(updateCollectManifestEO); + } + } + } + }); + + } + + return updateBatchById(updateCollectManifestEOList); + } + /** * 获取一个类和其父类的所有属性 * diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java index 11e698743..6e663cf50 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java @@ -58,7 +58,7 @@ public class ParamsReportEOController extends JeroController - AND title LIKE CONCAT(CONCAT('%',#{paramsReportEO.paramsManifestTitle}),'%') + AND title LIKE CONCAT(CONCAT('%',#{paramsReportEO.title}),'%') AND project_name LIKE CONCAT(CONCAT('%',#{paramsReportEO.projectName}),'%')