From 2444b6f87ae636bfe056aa7153099512ef3563c4 Mon Sep 17 00:00:00 2001 From: syc Date: Wed, 17 Aug 2022 10:49:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B9=B3=E9=98=B4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=97=E8=A1=A8=E8=B0=83=E6=95=B4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=BB=84=E7=BB=87=E3=80=81=E7=BD=91=E6=A0=BC=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datastats/impl/DataStatsServiceImpl.java | 9 +++++++-- .../service/govorg/GovOrgService.java | 2 +- .../service/govorg/impl/GovOrgServiceImpl.java | 18 +++++++++++++++--- .../mapper/govorg/CustomerGridDao.xml | 1 + 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index fd2a4e5f85..86fb3b0f56 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -2011,10 +2011,15 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve } //2.查询组织信息，判断查询下级组织还是网格数据 - ScreenAgencyOrGridListDTO agencyGrid = indexService.getSubAgencyOrGridList(formDTO.getAgencyId(), formDTO.isExport()); + //2022.8.17 屏蔽查询组织、网格逻辑，直接以org库的组织网格为准 + ScreenAgencyOrGridListDTO agencyGrid = govOrgService.getSubAgencyOrGridList(formDTO.getCustomerId(), formDTO.getAgencyId(), formDTO.isExport()); if (null == agencyGrid) { return new CustomerDataManageResultDTO(); } + /*ScreenAgencyOrGridListDTO agencyGrid = indexService.getSubAgencyOrGridList(formDTO.getAgencyId(), formDTO.isExport()); + if (null == agencyGrid) { + return new CustomerDataManageResultDTO(); + }*/ //组织或网格Id集合 List idList = agencyGrid.getAgencyGridList().stream().map(ScreenAgencyOrGridListDTO.AgencyGrid::getOrgId).collect(Collectors.toList()); formDTO.setDataType(!OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel()) ? OrgTypeEnum.AGENCY.getCode() : OrgTypeEnum.GRID.getCode()); @@ -2329,7 +2334,7 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve } //2.查询组织信息，判断要查询下级是组织还是网格数据 - ScreenAgencyOrGridListDTO agencyGrid = govOrgService.getSubAgencyOrGridList(formDTO.getCustomerId(), formDTO.getAgencyId()); + ScreenAgencyOrGridListDTO agencyGrid = govOrgService.getSubAgencyOrGridList(formDTO.getCustomerId(), formDTO.getAgencyId(), false); if (null == agencyGrid) { return new ArrayList<>(); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java index 6a55f59e53..8c92a4004e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java @@ -290,6 +290,6 @@ public interface GovOrgService { List getEnterpriseInfos(CoverageHomeSearchFormDTO formDTO); Integer getEnterpriseInfosCount(CoverageHomeSearchFormDTO formDTO); - ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String customerId, String agencyId); + ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String customerId, String agencyId, Boolean isGetSubAllGrid); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 96099374f8..a07ebf0a7c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -1473,7 +1473,7 @@ public class GovOrgServiceImpl implements GovOrgService { } @Override - public ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String customerId, String agencyId) { + public ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String customerId, String agencyId, Boolean isGetSubAllGrid) { ScreenAgencyOrGridListDTO resultDTO = new ScreenAgencyOrGridListDTO(); List agencyGridList = new ArrayList<>(); //1.查询组织信息 @@ -1485,10 +1485,22 @@ public class GovOrgServiceImpl implements GovOrgService { //2.根据组织级别判断查询直属组织或网格列表 List agencyList = new ArrayList<>(); List gridList = new ArrayList<>(); + //组织级别为街道的查询下级所有网格 + if (isGetSubAllGrid && (OrgLevelEnum.STREET.getCode().equals(dto.getLevel()))) { + gridList = customerGridDao.getSubGridList(customerId, agencyId); + List allGridList = new ArrayList<>(); + gridList.forEach(gr -> { + ScreenAgencyOrGridListDTO.AgencyGrid org = new ScreenAgencyOrGridListDTO.AgencyGrid(); + org.setOrgId(gr.getGridId()); + org.setOrgName(gr.getGridName()); + allGridList.add(org); + }); + resultDTO.setAllGridList(allGridList); + } if (!"community".equals(dto.getLevel())) { //2-1.直属下级组织列表 agencyList = customerAgencyDao.getSubAgencyListByAgency(customerId, agencyId); - agencyList.forEach(gr->{ + agencyList.forEach(gr -> { ScreenAgencyOrGridListDTO.AgencyGrid org = new ScreenAgencyOrGridListDTO.AgencyGrid(); org.setOrgId(gr.getAgencyId()); org.setOrgName(gr.getAgencyName()); @@ -1497,7 +1509,7 @@ public class GovOrgServiceImpl implements GovOrgService { } else { //2-2.直属下级网格列表 gridList = customerGridDao.getSubGridList(customerId, agencyId); - gridList.forEach(gr->{ + gridList.forEach(gr -> { ScreenAgencyOrGridListDTO.AgencyGrid org = new ScreenAgencyOrGridListDTO.AgencyGrid(); org.setOrgId(gr.getGridId()); org.setOrgName(gr.getGridName()); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml index 2457f87733..cb90d827d3 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml @@ -194,6 +194,7 @@ del_flag = '0' AND customer_id = #{customerId} AND pid = #{agencyId} + ORDER BY pid, grid_name From d216530497a4cfe3dbd849b855fde1fe84cfe816 Mon Sep 17 00:00:00 2001 From: syc Date: Wed, 17 Aug 2022 14:44:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B9=B3=E9=98=B4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=97=E8=A1=A8=E8=B0=83=E6=95=B4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=BB=84=E7=BB=87=E3=80=81=E7=BD=91=E6=A0=BC=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/dao/govorg/CustomerGridDao.java | 1 + .../service/govorg/impl/GovOrgServiceImpl.java | 2 +- .../resources/mapper/govorg/CustomerGridDao.xml | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java index 10721a9f7a..9b8ba8580b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java @@ -86,4 +86,5 @@ public interface CustomerGridDao extends BaseDao { CustomerGridDTO getGridInfo(@Param("gridId") String gridId); List getSubGridList(@Param("customerId") String customerId, @Param("agencyId") String agencyId); + List getAllSubGridList(@Param("customerId") String customerId, @Param("agencyId") String agencyId); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index a07ebf0a7c..d2ee934888 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -1487,7 +1487,7 @@ public class GovOrgServiceImpl implements GovOrgService { List gridList = new ArrayList<>(); //组织级别为街道的查询下级所有网格 if (isGetSubAllGrid && (OrgLevelEnum.STREET.getCode().equals(dto.getLevel()))) { - gridList = customerGridDao.getSubGridList(customerId, agencyId); + gridList = customerGridDao.getAllSubGridList(customerId, agencyId); List allGridList = new ArrayList<>(); gridList.forEach(gr -> { ScreenAgencyOrGridListDTO.AgencyGrid org = new ScreenAgencyOrGridListDTO.AgencyGrid(); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml index cb90d827d3..13f296b87b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml @@ -197,4 +197,20 @@ ORDER BY pid, grid_name + +