From 5397dba686e99b8e5d53126f02b83cdfee245014 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 25 Dec 2020 16:47:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BB=84=E7=BB=87=E4=B8=8B?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/controller/GovOrgController.java | 2 +- .../dataaggre/service/govorg/GovOrgService.java | 12 +++++++++++- .../service/govorg/impl/GovOrgServiceImpl.java | 13 ++++++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java index b96c22263d..aebb23a8b5 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java @@ -25,7 +25,7 @@ public class GovOrgController { /** * @param tokenDTO * @Author sun - * @Description 党建声音-政府端-可选发布范围接口调用-根据人员角色查询对应的不同发布范围 + * @Description 组织、网格树结构 **/ @PostMapping("agencygridlist") public Result agencyGridList(@LoginUser TokenDto tokenDTO) { 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 6e3a6d0904..1908a1d9d9 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 @@ -1,6 +1,9 @@ package com.epmet.dataaggre.service.govorg; import com.epmet.dataaggre.dto.govorg.result.AgencyGridResultDTO; +import com.epmet.dataaggre.dto.govorg.result.GridInfoResultDTO; + +import java.util.List; /** * @Author zxc @@ -11,8 +14,15 @@ public interface GovOrgService { /** * @param staffId * @Author sun - * @Description 党建声音-政府端-可选发布范围接口调用-根据人员角色查询对应的不同发布范围 + * @Description 组织、网格树结构 **/ AgencyGridResultDTO agencyGridList(String staffId); + /** + * @param agencyId + * @Author sun + * @Description 根据组织Id查询网格列表 + **/ + List gridList(String agencyId); + } 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 ab8bf7ea61..d84054f6e0 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 @@ -41,7 +41,7 @@ public class GovOrgServiceImpl implements GovOrgService { /** * @param staffId * @Author sun - * @Description 党建声音-政府端-可选发布范围接口调用-根据人员角色查询对应的不同发布范围 + * @Description 组织、网格树结构 **/ @Override public AgencyGridResultDTO agencyGridList(String staffId) { @@ -87,4 +87,15 @@ public class GovOrgServiceImpl implements GovOrgService { return subAgencyList; } + /** + * @param agencyId + * @Author sun + * @Description 根据组织Id查询网格列表 + **/ + @Override + public List gridList(String agencyId) { + return customerGridDao.selectAgencyGridList(agencyId); + } + + }