From 2fb4296d1323766d3fd46c04e61ca03dec2af86a Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 28 Oct 2022 16:52:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0-=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml index 580843763..aeeed8bf0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml @@ -122,6 +122,7 @@ pm.state as state, pm.project_id as project_id, pm.create_time as create_time, + pm.project_version as project_version, concat(pni.project_name,'-',pyni.year_name,'-',plb.target_market,'-',pm.version) as project_name from params_manifest pm left join project_library_base as plb on plb.id = pm.project_id From 6372ba1f164274ff1544ac7ada36ae0c49b8bcbd Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 31 Oct 2022 09:29:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0-bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsManifestTodoCenterServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ParamsManifestTodoCenterServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ParamsManifestTodoCenterServiceImpl.java index 680615106..5566e8fb5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ParamsManifestTodoCenterServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ParamsManifestTodoCenterServiceImpl.java @@ -152,7 +152,8 @@ public class ParamsManifestTodoCenterServiceImpl implements IParamsManifestTodoC List pcmList = paramsManifestEOListMap.get(paramsManifestTodoCenterEO.getId()); int count = 0; - if (ObjectUtil.isNotEmpty(paramsManifestTodoCenterEO.getId()) && manifestUserTypeOfHomo.get(paramsManifestTodoCenterEO.getId())) { + if (ObjectUtil.isNotEmpty(paramsManifestTodoCenterEO.getId()) + && ObjectUtil.isNotEmpty(manifestUserTypeOfHomo.get(paramsManifestTodoCenterEO.getId()))) { // 统计待发起数量 包括状态：待发起收集,变更,工程接口人退回 count = (int) pcmList.stream().filter(e-> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState()) || CollectManifestStateEnum.SDT_BACK.getValue().equals(e.getState()) @@ -172,7 +173,8 @@ public class ParamsManifestTodoCenterServiceImpl implements IParamsManifestTodoC if (count > 0) { paramsManifestTodoCenterEO.setWaitFillNum(count); } - } else if (ObjectUtil.isNotEmpty(paramsManifestTodoCenterEO.getId()) && manifestUserTypeOfSdt.get(paramsManifestTodoCenterEO.getId())) { + } else if (ObjectUtil.isNotEmpty(paramsManifestTodoCenterEO.getId()) + && ObjectUtil.isNotEmpty(manifestUserTypeOfSdt.get(paramsManifestTodoCenterEO.getId()))) { // 统计待分配数量 包括状态：待工程接口人处理,填写人退回 count = (int) pcmList.stream().filter(e-> (CollectManifestStateEnum.WAIT_SDT.getValue().equals(e.getState()) || CollectManifestStateEnum.DRE_BACK.getValue().equals(e.getState())) @@ -187,7 +189,8 @@ public class ParamsManifestTodoCenterServiceImpl implements IParamsManifestTodoC paramsManifestTodoCenterEO.setWaitFillNum(count); } - } else if (ObjectUtil.isNotEmpty(paramsManifestTodoCenterEO.getId()) && manifestUserTypeOfDre.get(paramsManifestTodoCenterEO.getId())) { + } else if (ObjectUtil.isNotEmpty(paramsManifestTodoCenterEO.getId()) + && ObjectUtil.isNotEmpty(manifestUserTypeOfDre.get(paramsManifestTodoCenterEO.getId()))) { // 统计待填写数量 包括状态：待填写,认证工程师退回 count = (int) pcmList.stream().filter(e-> (CollectManifestStateEnum.WAIT_FILL.getValue().equals(e.getState()) || CollectManifestStateEnum.CERT_BACK.getValue().equals(e.getState()))