WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature_dev_20221008_TODO' into feature_dev_20221008_TODO

Browse Source
This commit is contained in:
wangzhijiang
2022-10-31 16:51:58 +08:00
parent cbc536d071 6372ba1f16
commit f91db68e74
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml
+1
View File
@@ -122,6 +122,7 @@
pm.state as state, pm.state as state,
pm.project_id as project_id, pm.project_id as project_id,
pm.create_time as create_time, 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 concat(pni.project_name,'-',pyni.year_name,'-',plb.target_market,'-',pm.version) as project_name
from params_manifest pm from params_manifest pm
left join project_library_base as plb on plb.id = pm.project_id left join project_library_base as plb on plb.id = pm.project_id
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ParamsManifestTodoCenterServiceImpl.java
+6 -3
View File
@@ -152,7 +152,8 @@ public class ParamsManifestTodoCenterServiceImpl implements IParamsManifestTodoC
List<ParamsCollectManifestEO> pcmList = paramsManifestEOListMap.get(paramsManifestTodoCenterEO.getId()); List<ParamsCollectManifestEO> pcmList = paramsManifestEOListMap.get(paramsManifestTodoCenterEO.getId());
int count = 0; 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()) count = (int) pcmList.stream().filter(e-> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState())
|| CollectManifestStateEnum.SDT_BACK.getValue().equals(e.getState()) || CollectManifestStateEnum.SDT_BACK.getValue().equals(e.getState())
@@ -172,7 +173,8 @@ public class ParamsManifestTodoCenterServiceImpl implements IParamsManifestTodoC
if (count > 0) { if (count > 0) {
paramsManifestTodoCenterEO.setWaitFillNum(count); 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()) count = (int) pcmList.stream().filter(e-> (CollectManifestStateEnum.WAIT_SDT.getValue().equals(e.getState())
|| CollectManifestStateEnum.DRE_BACK.getValue().equals(e.getState())) || CollectManifestStateEnum.DRE_BACK.getValue().equals(e.getState()))
@@ -187,7 +189,8 @@ public class ParamsManifestTodoCenterServiceImpl implements IParamsManifestTodoC
paramsManifestTodoCenterEO.setWaitFillNum(count); 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()) count = (int) pcmList.stream().filter(e-> (CollectManifestStateEnum.WAIT_FILL.getValue().equals(e.getState())
|| CollectManifestStateEnum.CERT_BACK.getValue().equals(e.getState())) || CollectManifestStateEnum.CERT_BACK.getValue().equals(e.getState()))