From d59e2ff44b5c440dbc57d0e96ece8654f6021967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=87=91=E9=B9=8F?= <daofugui@163.com>
Date: Tue, 3 Sep 2019 17:06:41 +0800
Subject: [PATCH] no message

---
 .../epdc/controller/SysDictController.java    | 11 +++++++
 .../com/elink/esua/epdc/dao/SysDictDao.java   |  6 ++++
 .../esua/epdc/service/SysDictService.java     |  3 ++
 .../epdc/service/impl/SysDeptServiceImpl.java |  2 --
 .../epdc/service/impl/SysDictServiceImpl.java |  7 ++++
 .../src/main/resources/mapper/SysDictDao.xml  |  5 +++
 .../elink/esua/epdc/dto/PartyMembersDTO.java  |  4 +++
 .../controller/PartyMembersController.java    |  2 +-
 .../elink/esua/epdc/dao/PartyMembersDao.java  | 11 +++++--
 .../epdc/service/PartyMembersService.java     |  4 ++-
 .../service/impl/PartyMembersServiceImpl.java |  7 ++++
 .../main/resources/mapper/PartyMembersDao.xml | 33 ++++++++++++++++++-
 12 files changed, 88 insertions(+), 7 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDictController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDictController.java
index 075b9d134..9c3996f66 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDictController.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDictController.java
@@ -26,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -59,6 +60,16 @@ public class SysDictController {
         return new Result<PageData<SysDictDTO>>().ok(page);
     }
 
+
+    @GetMapping("sublist/{pid}")
+    @ApiOperation("子列表")
+    public Result<List<SysDictDTO>> sublist(@PathVariable("pid") String pid){
+        Map map = new HashMap();
+        map.put("pid",pid);
+        List<SysDictDTO> list = sysDictService.subList(map);
+        return new Result<List<SysDictDTO>>().ok(list);
+    }
+
     @GetMapping("list")
     @ApiOperation("字典分类数据")
     @ApiImplicitParams({
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDictDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDictDao.java
index 81de93402..e19c4e9b8 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDictDao.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDictDao.java
@@ -13,6 +13,9 @@ import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.entity.SysDictEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 数据字典
  *
@@ -22,4 +25,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface SysDictDao extends BaseDao<SysDictEntity> {
 
+    List<SysDictEntity> getSubList(Map<String, Object> params);
+
+
 }
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDictService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDictService.java
index e6585dde1..7554de7cc 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDictService.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDictService.java
@@ -35,4 +35,7 @@ public interface SysDictService extends BaseService<SysDictEntity> {
     void update(SysDictDTO dto);
 
     void delete(Long[] ids);
+
+    //根据pid获取下一级子列表
+    List<SysDictDTO> subList(Map<String, Object> params);
 }
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
index 6a016bea2..ef32e341d 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
@@ -51,7 +51,6 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
             params.put("deptIdList", getSubDeptIdList(user.getDeptId()));
         }
 
-        //查询部门列表
         List<SysDeptEntity> entityList = baseDao.getList(params);
 
         List<SysDeptDTO> dtoList = ConvertUtils.sourceToTarget(entityList, SysDeptDTO.class);
@@ -61,7 +60,6 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
 
     @Override
     public List<SysDeptDTO> subList(Map<String, Object> params) {
-        //查询部门列表
         List<SysDeptEntity> entityList = baseDao.getSubList(params);
         List<SysDeptDTO> dtoList = ConvertUtils.sourceToTarget(entityList, SysDeptDTO.class);
         return TreeUtils.build(dtoList);
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java
index bcab87744..edfb6f717 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java
@@ -15,6 +15,7 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.utils.TreeUtils;
 import com.elink.esua.epdc.dao.SysDictDao;
 import com.elink.esua.epdc.dto.SysDictDTO;
 import com.elink.esua.epdc.entity.SysDictEntity;
@@ -48,6 +49,12 @@ public class SysDictServiceImpl extends BaseServiceImpl<SysDictDao, SysDictEntit
         return getPageData(page, SysDictDTO.class);
     }
 
+    @Override
+    public List<SysDictDTO> subList(Map<String, Object> params) {
+        List<SysDictEntity> entityList = baseDao.getSubList(params);
+        return ConvertUtils.sourceToTarget(entityList, SysDictDTO.class);
+    }
+
     @Override
     public List<SysDictDTO> list(Map<String, Object> params) {
         List<SysDictEntity> entityList = baseDao.selectList(getWrapper(params));
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDictDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDictDao.xml
index 50732d02f..5dd4a6849 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDictDao.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDictDao.xml
@@ -3,4 +3,9 @@
 
 <mapper namespace="com.elink.esua.epdc.dao.SysDictDao">
 
+
+    <select id="getSubList" resultType="com.elink.esua.epdc.entity.SysDictEntity">
+        SELECT * FROM sys_dict WHERE pid = #{pid} and del_flag = '0'
+    </select>
+
 </mapper>
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java
index 01b6b591d..b7420d1e9 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/PartyMembersDTO.java
@@ -32,6 +32,10 @@ import lombok.Data;
 public class PartyMembersDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    private String tagName;
+
+    private String tagDesc;
+
 	private String id;
 
 	private String realName;
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
index d0703110e..73862ba15 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
@@ -50,7 +50,7 @@ public class PartyMembersController {
 
     @GetMapping("page")
     public Result<PageData<PartyMembersDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<PartyMembersDTO> page = partyMembersService.page(params);
+        PageData<PartyMembersDTO> page = partyMembersService.pageDIY(params);
 
         return new Result<PageData<PartyMembersDTO>>().ok(page);
     }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java
index 3ba707d83..63d7a8a47 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/PartyMembersDao.java
@@ -18,9 +18,13 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.PartyMembersDTO;
 import com.elink.esua.epdc.entity.PartyMembersEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 党员表
  *
@@ -29,5 +33,8 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface PartyMembersDao extends BaseDao<PartyMembersEntity> {
-	
-}
\ No newline at end of file
+
+    List<PartyMembersDTO> pageDIY(Map<String, Object> params);
+
+
+}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java
index 1a4967e1e..3c3969e5a 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java
@@ -35,6 +35,8 @@ public interface PartyMembersService extends BaseService<PartyMembersEntity> {
 
     PageData<PartyMembersDTO> page(Map<String, Object> params);
 
+    PageData<PartyMembersDTO> pageDIY(Map<String, Object> params);
+
     List<PartyMembersDTO> list(Map<String, Object> params);
 
     PartyMembersDTO get(String id);
@@ -44,4 +46,4 @@ public interface PartyMembersService extends BaseService<PartyMembersEntity> {
     void update(PartyMembersDTO dto);
 
     void delete(String[] ids);
-}
\ No newline at end of file
+}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
index c1252205d..771e82db9 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
@@ -60,6 +60,13 @@ public class PartyMembersServiceImpl extends BaseServiceImpl<PartyMembersDao, Pa
         return getPageData(page, PartyMembersDTO.class);
     }
 
+    @Override
+    public PageData<PartyMembersDTO> pageDIY(Map<String, Object> params) {
+        //IPage<PartyMembersDTO> page = getPage(params);
+
+        return null;
+    }
+
     @Override
     public List<PartyMembersDTO> list(Map<String, Object> params) {
         List<PartyMembersEntity> entityList = baseDao.selectList(getWrapper(params));
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
index de6d7bcee..eaac392ed 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
@@ -28,5 +28,36 @@
         <result property="delFlag" column="DEL_FLAG"/>
     </resultMap>
 
+    <resultMap type="com.elink.esua.epdc.dto.PartyMembersDTO" id="partyMembersDtoMap">
+        <result property="tagName" column="TAG_NAME"/>
+        <result property="tagDesc" column="TAG_DESC"/>
+        <result property="id" column="ID"/>
+        <result property="realName" column="REAL_NAME"/>
+        <result property="mobile" column="MOBILE"/>
+        <result property="identityNo" column="IDENTITY_NO"/>
+        <result property="post" column="POST"/>
+        <result property="postId" column="POST_ID"/>
+        <result property="cadreFlag" column="CADRE_FLAG"/>
+        <result property="registFlag" column="REGIST_FLAG"/>
+        <result property="registTime" column="REGIST_TIME"/>
+        <result property="streetName" column="STREET_NAME"/>
+        <result property="streetId" column="STREET_ID"/>
+        <result property="communityName" column="COMMUNITY_NAME"/>
+        <result property="communityId" column="COMMUNITY_ID"/>
+        <result property="gridName" column="GRID_NAME"/>
+        <result property="gridId" column="GRID_ID"/>
+        <result property="deptId" column="DEPT_ID"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+    </resultMap>
+
+    <select id="pageDIY" resultMap="partyMembersDtoMap">
+        SELECT pm.*,tag.TAG_NAME,tag.TAG_DESC FROM epdc_party_members as pm, epdc_user_tag as tag,epdc_party_tag_relation as partytag
+        WHERE pm.ID = partytag.PARTY_ID and tag.ID = partytag.TAG_ID AND pm.DEL_FLAG = '0'
+    </select>
 
-</mapper>
\ No newline at end of file
+</mapper>