待办中心-认证参数收集（过滤掉项目状态为取消数据）

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

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;
 }

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<DictModel> 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<DictModel> 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<ParamsManifestTodoCenterEO> result = new ArrayList<>();
 
         int subSize = pageVO.getPageSize(); // 每页记录数