diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryServiceImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryServiceImpl.java index 9bffac17a38f20826f8965908be8427856ccc31a..0f3212ad7e3371e15fe342050719bfdc1246ebc1 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryServiceImpl.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectplan/ProjectPlanQueryServiceImpl.java @@ -2258,17 +2258,6 @@ public class ProjectPlanQueryServiceImpl extends AbstractService<ProjectPlanBook public List<ProjectTypeOut> queryProjectTypeByPlanType(ProjectTypeQry projectTypeQry) { //鑾峰彇褰撳墠鐧诲綍浜虹殑閮ㄩ棬淇℃伅 List<String> codeList = BaseDataUtil.makeCurrentUserDeptCodeList(); - QueryWrapper<ProjectPlanBookPo> bookPoQueryWrapper = new QueryWrapper<>(); - bookPoQueryWrapper.in("department_code",codeList) - .eq("year",projectTypeQry.getYear()) - .eq("plan_type",projectTypeQry.getPlanType()) - .eq("available","YES"); - List<ProjectPlanBookPo> projectPlanBookPos = projectPlanBookMapper.selectList(bookPoQueryWrapper); - log.info("褰撳墠鐧诲綍浜烘病鏈夊搴旂殑鐢虫姤涔�"); - if (ObjectUtils.isEmpty(projectPlanBookPos)) { - return new ArrayList<>(); - } - List<ProjectTypeOut> projectPlanBookGuiKouOuts = MapperUtils.INSTANCE.mapAsList(ProjectTypeOut.class, projectPlanBookPos); List<BudgetInfoPo> budgetInfoPos = budgetInfoMapper.qryBudgetInfoList(BudgetInfoQry.builder().year(projectTypeQry.getYear()).build()); //寰幆 budgetInfoPos 鍒ゆ柇鎵€鍦ㄩ儴闂╢unction_dept_json瀛楁 鏄惁鍦� codeList,鑻ュ湪鍒欎负 褰撳墠鐧诲綍浜哄彲鏌ョ湅鐨勯」鐩被鍨� //褰撳墠鐧诲綍浜哄彲鏌ョ湅椤圭洰绫诲瀷闆嗗悎 @@ -2288,8 +2277,16 @@ public class ProjectPlanQueryServiceImpl extends AbstractService<ProjectPlanBook } } } - log.debug("鐢虫姤涔︾殑椤圭洰绫诲瀷闆嗗悎涓�:{},鐧诲綍浜洪儴闂ㄧ殑鍙敤椤圭洰绫诲瀷涓�:{}",projectPlanBookGuiKouOuts,projectTypeList); - return projectPlanBookGuiKouOuts.stream().distinct().filter(item -> projectTypeList.contains(item.getProjectTypeId())).collect(Collectors.toList()); + QueryWrapper<ProjectPlanBookPo> bookPoQueryWrapper = new QueryWrapper<>(); + bookPoQueryWrapper.in("project_type_id",projectTypeList) + .eq("year",projectTypeQry.getYear()) + .eq("plan_type",projectTypeQry.getPlanType()) + .eq("plan_book_type",PlanBookTypeEnum.椤圭洰鐢虫姤涔�.val()) + .eq("available","YES"); + List<ProjectPlanBookPo> projectPlanBookPos = projectPlanBookMapper.selectList(bookPoQueryWrapper); + log.debug("鐢虫姤涔︾殑椤圭洰绫诲瀷闆嗗悎涓�:{},鐧诲綍浜洪儴闂ㄧ殑鍙敤椤圭洰绫诲瀷涓�:{}",projectPlanBookPos,projectTypeList); + List<ProjectTypeOut> projectPlanBookGuiKouOuts = MapperUtils.INSTANCE.mapAsList(ProjectTypeOut.class, projectPlanBookPos); + return projectPlanBookGuiKouOuts; } /**