From 0889bec4abc655ae1da240f58b3f4eb1ff985887 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 25 Jan 2022 10:40:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=A0=94=E5=88=A4?= =?UTF-8?q?=E5=88=86=E6=9E=90=E6=8C=89=E5=88=86=E7=B1=BB=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=85=BC=E5=AE=B9=E5=B8=82=E5=8C=97=E5=A4=9A?= =?UTF-8?q?=E5=B1=82=E7=BA=A7=E5=88=86=E7=B1=BB=E4=BB=A5=E5=8F=8A=E4=B8=8D?= =?UTF-8?q?=E6=98=AF=E6=9D=A5=E6=BA=90=E8=AF=9D=E9=A2=98=E7=9A=84=E8=AE=AE?= =?UTF-8?q?=E9=A2=98=E8=A1=A5=E5=BD=95=E4=B8=80=E6=9D=A1=E5=85=B3=E4=BA=8E?= =?UTF-8?q?=E8=AF=9D=E9=A2=98=E6=95=B0=E6=8D=AE(project=5Frelated=5Fperson?= =?UTF-8?q?nel)=20=E8=AF=9D=E9=A2=98id=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../govproject/impl/GovProjectServiceImpl.java | 3 ++- .../resources/mapper/govproject/ProjectDao.xml | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) 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 a9f42eedd3..6ea7acf652 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 @@ -1,6 +1,7 @@ package com.epmet.dataaggre.service.govproject.impl; import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.commons.tools.constant.CustomerIdConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; @@ -559,7 +560,7 @@ public class GovProjectServiceImpl implements GovProjectService { })).collect(Collectors.toList()); //4.根据userId集合和二级分类Code集合查询来源楼院小组的项目 - List groupList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), secondCodeList, userIds, "issue"); + List groupList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), (CustomerIdConstant.SHI_BEI_CUSTOMER_ID.equals(formDTO.getCustomerId()) ? null : secondCodeList), userIds, "issue"); //5.根据userId集合和二级分类Code集合查询来源事件上报的项目 List eventList = projectDao.getProjectCategoryList(formDTO.getCustomerId(), secondCodeList, userIds, "resiEvent"); 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 599a5da471..ea4c01f111 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 @@ -363,9 +363,18 @@ p.del_flag = '0' AND p.customer_id = #{customerId} AND p.origin = #{origin} - - #{code} - + + + + #{code} + + + + + pc.category_code LIKE CONCAT(#{code}, '%') + + + #{userId} From a0aff3425c47ace90b7d9cb4812fcf294095bc32 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 25 Jan 2022 10:53:34 +0800 Subject: [PATCH 2/4] 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 3/4] 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}, '%') From cf5d16830b8a703307c7a6a70a99536a24be1f3c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 25 Jan 2022 11:11:48 +0800 Subject: [PATCH 4/4] again --- .../service/govproject/impl/GovProjectServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 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 24820240d4..6cd219c759 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 @@ -592,9 +592,14 @@ public class GovProjectServiceImpl implements GovProjectService { }); //当前分类下来源楼院小组的项目 groupList.forEach(gr -> { - if (secondCodeMap.containsKey(gr.getCategoryCode()) && !formDTO.getProjectId().equals(gr.getProjectId())) { + if (CustomerIdConstant.SHI_BEI_CUSTOMER_ID.equals(formDTO.getCustomerId()) && !formDTO.getProjectId().equals(gr.getProjectId())) { ProjectAnalysisResultDTO.Project project = ConvertUtils.sourceToTarget(gr, ProjectAnalysisResultDTO.Project.class); groupPrList.add(project); + } else { + if (secondCodeMap.containsKey(gr.getCategoryCode()) && !formDTO.getProjectId().equals(gr.getProjectId())) { + ProjectAnalysisResultDTO.Project project = ConvertUtils.sourceToTarget(gr, ProjectAnalysisResultDTO.Project.class); + groupPrList.add(project); + } } }); groupCa.setProjectList(groupPrList);