From a0aff3425c47ace90b7d9cb4812fcf294095bc32 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 25 Jan 2022 10:53:34 +0800 Subject: [PATCH 1/2] again --- .../service/govproject/impl/GovProjectServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index 6ea7acf652..4e7ab796af 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -560,7 +560,7 @@ public class GovProjectServiceImpl implements GovProjectService { })).collect(Collectors.toList()); //4.根据userId集合和二级分类Code集合查询来源楼院小组的项目 - List groupList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), (CustomerIdConstant.SHI_BEI_CUSTOMER_ID.equals(formDTO.getCustomerId()) ? null : secondCodeList), userIds, "issue"); + List groupList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), (CustomerIdConstant.SHI_BEI_CUSTOMER_ID.equals(formDTO.getCustomerId()) ? formDTO.getCategoryCodeList() : secondCodeList), userIds, "issue"); //5.根据userId集合和二级分类Code集合查询来源事件上报的项目 List eventList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), secondCodeList, userIds, "resiEvent"); From ef9633c537c08c2495fd98acf3406c361b8b6de6 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 25 Jan 2022 10:56:56 +0800 Subject: [PATCH 2/2] again --- .../java/com/epmet/dataaggre/dao/govproject/ProjectDao.java | 1 + .../service/govproject/impl/GovProjectServiceImpl.java | 4 ++-- .../src/main/resources/mapper/govproject/ProjectDao.xml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java index 43ea091ab5..1532f33727 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java @@ -113,6 +113,7 @@ public interface ProjectDao extends BaseDao { * @author sun */ List getProjectCategoryList(@Param("customerId") String customerId, + @Param("categoryCodeList") List categoryCodeList, @Param("secondCodeList") List secondCodeList, @Param("userIds") List userIds, @Param("origin") String origin); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index 4e7ab796af..24820240d4 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -560,10 +560,10 @@ public class GovProjectServiceImpl implements GovProjectService { })).collect(Collectors.toList()); //4.根据userId集合和二级分类Code集合查询来源楼院小组的项目 - List groupList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), (CustomerIdConstant.SHI_BEI_CUSTOMER_ID.equals(formDTO.getCustomerId()) ? formDTO.getCategoryCodeList() : secondCodeList), userIds, "issue"); + List groupList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), formDTO.getCategoryCodeList(), (CustomerIdConstant.SHI_BEI_CUSTOMER_ID.equals(formDTO.getCustomerId()) ? null : secondCodeList), userIds, "issue"); //5.根据userId集合和二级分类Code集合查询来源事件上报的项目 - List eventList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), secondCodeList, userIds, "resiEvent"); + List eventList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), formDTO.getCategoryCodeList(), secondCodeList, userIds, "resiEvent"); //6.封装数据 //楼院小组下分类项目列表 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml index ea4c01f111..85111f3f8c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml @@ -370,7 +370,7 @@ - + pc.category_code LIKE CONCAT(#{code}, '%')