From 6ccc9ae119037a5bb2814b45906d947f891397a0 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 21 Dec 2023 10:58:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86=EF=BC=88=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E6=8E=89=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81=E4=B8=BA?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=95=B0=E6=8D=AE=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/ParamsManifestEOMapper.xml | 3 ++- .../entity/ParamsManifestTodoCenterEO.java | 2 ++ .../ParamsManifestTodoCenterServiceImpl.java | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) 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 7c97b3e40..2eefd1f1e 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 @@ -169,7 +169,8 @@ pm.project_id as project_id, pm.create_time as create_time, pm.version as version, - concat(pni.project_name,'-',pyni.year_name,'-',plb.target_market,'-',pm.project_version) as project_name + concat(pni.project_name,'-',pyni.year_name,'-',plb.target_market,'-',pm.project_version) as project_name, + plb.project_status from params_manifest pm left join project_library_base as plb on plb.id = pm.project_id left join project_name_info as pni on plb.project_name_id = pni.id diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ParamsManifestTodoCenterEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ParamsManifestTodoCenterEO.java index 9be55c843..6f210c31a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ParamsManifestTodoCenterEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ParamsManifestTodoCenterEO.java @@ -47,4 +47,6 @@ public class ParamsManifestTodoCenterEO { //用于区分跳转所带的状态 private String flag; + //项目状态 + private String projectStatus; } 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 d4e729690..e12623894 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 @@ -4,6 +4,8 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.constant.enums.YesOrNoEnum; +import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; import com.jero.modules.cert.collect.enums.CollectManifestStateEnum; @@ -13,6 +15,8 @@ import com.jero.modules.cert.collect.mapper.ParamsManifestEOMapper; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.service.impl.ProjectLibraryBaseServiceImpl; import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.enums.DicCodeEnum; +import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.todoCenter.entity.ParamsManifestTodoCenterEO; import com.jero.modules.todoCenter.enums.FlagEnum; @@ -45,6 +49,8 @@ public class ParamsManifestTodoCenterServiceImpl implements IParamsManifestTodoC private ProjectLibraryBaseServiceImpl projectLibraryBaseService; @Autowired private ISysUserService sysUserService; + @Autowired + private ISysDictService sysDictService; @Override public IPage queryPage(ParamsManifestTodoCenterEOPage pageVO) { @@ -154,6 +160,17 @@ public class ParamsManifestTodoCenterServiceImpl implements IParamsManifestTodoC .filter(e->ObjectUtil.isNotNull(e.getWaitCollectNum()) || ObjectUtil.isNotNull(e.getWaitSdtNum()) || ObjectUtil.isNotNull(e.getWaitFillNum())) .sorted(Comparator.comparing(ParamsManifestTodoCenterEO::getCreateTime).reversed()) .collect(Collectors.toList()); + List projectStatus = sysDictService.queryDictItemsByCode(DicCodeEnum.PROJECT_STATUS.getCode()); + projectStatus = projectStatus.stream().filter(e-> YesOrNoEnum.CANCEL.getName().equals(e.getText())).collect(Collectors.toList()); + //过滤掉项目状态为取消的数据 + if(ObjectUtil.isNotEmpty(paramsManifestEOList)){ + List finalProjectStatus = projectStatus; + paramsManifestEOList = paramsManifestEOList.stream() + .filter(e->StringUtils.isNotBlank(e.getProjectStatus()) + && ObjectUtil.isNotEmpty(finalProjectStatus) + && !e.getProjectStatus().equals(finalProjectStatus.get(0).getValue())) + .collect(Collectors.toList()); + } List result = new ArrayList<>(); int subSize = pageVO.getPageSize(); // 每页记录数