From 6b735eebca23affe2fd0cbfb9eb2d4456ed142fe Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 5 Nov 2021 13:57:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E9=98=9F=E4=BC=8D=E5=88=86?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/GridMemberCategoryController.java | 12 ++++++++++++ .../elink/esua/epdc/dao/GridMemberCategoryDao.java | 10 ++++++++++ .../esua/epdc/service/GridMemberCategoryService.java | 9 +++++++++ .../service/impl/GridMemberCategoryServiceImpl.java | 7 +++++++ .../main/resources/mapper/GridMemberCategoryDao.xml | 6 ++++++ .../src/main/resources/mapper/GridMemberDao.xml | 1 + 6 files changed, 45 insertions(+) diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/GridMemberCategoryController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/GridMemberCategoryController.java index c2070ec..f516b47 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/GridMemberCategoryController.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/GridMemberCategoryController.java @@ -103,4 +103,16 @@ public class GridMemberCategoryController { return gridMemberCategoryService.getGridCategoryList(); } + /** + * @describe: 获取社区列表 + * @author wangtong + * @date 2021/11/5 10:24 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("getCommunityDeptList") + public Result getCommunityDeptList() { + return gridMemberCategoryService.getCommunityDeptList(); + } + } \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/GridMemberCategoryDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/GridMemberCategoryDao.java index 3834f04..f35200c 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/GridMemberCategoryDao.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/GridMemberCategoryDao.java @@ -19,6 +19,7 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.entity.GridMemberCategoryEntity; +import com.elink.esua.epdc.entity.SysDeptEntity; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -40,4 +41,13 @@ public interface GridMemberCategoryDao extends BaseDao * @return com.elink.esua.epdc.commons.tools.utils.Result */ List getGridCategoryList(); + + /** + * @describe: 获取社区列表 + * @author wangtong + * @date 2021/11/5 10:24 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + List getCommunityDeptList(); } \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/GridMemberCategoryService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/GridMemberCategoryService.java index f09063f..584a5a4 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/GridMemberCategoryService.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/GridMemberCategoryService.java @@ -102,4 +102,13 @@ public interface GridMemberCategoryService extends BaseService result = baseDao.getCommunityDeptList(); + return new Result().ok(result); + } + } \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/resources/mapper/GridMemberCategoryDao.xml b/epdc-cloud-admin/src/main/resources/mapper/GridMemberCategoryDao.xml index bd5d4e5..0664950 100644 --- a/epdc-cloud-admin/src/main/resources/mapper/GridMemberCategoryDao.xml +++ b/epdc-cloud-admin/src/main/resources/mapper/GridMemberCategoryDao.xml @@ -22,6 +22,12 @@ and banner_flag='0' order by sort asc + \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/resources/mapper/GridMemberDao.xml b/epdc-cloud-admin/src/main/resources/mapper/GridMemberDao.xml index 852179b..76f830c 100644 --- a/epdc-cloud-admin/src/main/resources/mapper/GridMemberDao.xml +++ b/epdc-cloud-admin/src/main/resources/mapper/GridMemberDao.xml @@ -52,6 +52,7 @@ from epdc_grid_member where del_flag='0' and FIND_IN_SET(#{deptId},ALL_DEPT_IDS) + and CATEGORY_CODE=#{categoryCode} order by CREATED_TIME desc LIMIT #{pageIndex},#{pageSize}