admin端获取用户网格所在的社区街道信息

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/GridForLeaderRegisterDTO.java

@@ -1,5 +1,6 @@
 package com.elink.esua.epdc.dto.epdc;
 
+import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -12,22 +13,13 @@ import java.util.Date;
  * @date 2019/10/22 16:09
  */
 @Data
-public class GridForLeaderRegisterDTO implements Serializable {
+public class GridForLeaderRegisterDTO extends CompleteDeptDTO implements Serializable {
 
     private static final long serialVersionUID = -8416239971314737504L;
 
-    /**
-     * 网格名
-     */
-    private String grid;
-
-    /**
-     * 网格id
-     */
-    private Long gridId;
-
     /**
      * 网格创建时间，第一次查询后作为'最后切换此网格的时间'插入到esua_epdc_user.epdc_user_grid_relation
      */
     private Date switchedTime;
+
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java

@@ -11,6 +11,7 @@ package com.elink.esua.epdc.dao;
 import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.dto.SysSimpleDeptDTO;
+import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO;
 import com.elink.esua.epdc.entity.SysDeptEntity;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import org.apache.ibatis.annotations.Mapper;
@@ -76,10 +77,21 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
 
     /**
      * 通过街道ID获取项目可流转部门
+     *
      * @Params: [deptId]
      * @Return: java.util.List<com.elink.esua.epdc.dto.SysDeptDTO>
      * @Author: liuchuang
      * @Date: 2019/9/16 16:54
      */
     List<SysDeptDTO> selectListOfItemCirculationDept(@Param("deptId") Long deptId);
+
+    /**
+     * 通过网格id集合，获取网格长管理的所有网格
+     *
+     * @param gridIdList
+     * @return java.util.List<com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO>
+     * @author work@yujt.net.cn
+     * @date 2019/10/24 15:27
+     */
+    List<GridForLeaderRegisterDTO> selectListGridForLeader(@Param("gridIdList") List<String> gridIdList);
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java

@@ -47,5 +47,5 @@ public interface SysUserDao extends BaseDao<SysUserEntity> {
      * @author work@yujt.net.cn
      * @date 2019/10/22 16:27
      */
-    List<GridForLeaderRegisterDTO> selectListLeaderGrid(@Param("mobile") String mobile);
+    List<String> selectListLeaderGridId(@Param("mobile") String mobile);
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java

@@ -11,6 +11,7 @@ package com.elink.esua.epdc.service;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.dto.SysSimpleDeptDTO;
+import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO;
 import com.elink.esua.epdc.entity.SysDeptEntity;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.dto.SysDeptDTO;
@@ -57,7 +58,7 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
      * 获取所有下属网格ID集合
      *
      * @param pid 部门ID
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List       <       java.lang.Long>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < java.lang.Long>>
      * @author yujintao
      * @date 2019/9/5 13:45
      */
@@ -87,7 +88,7 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
     /***
      * 通过编码得到党委编码
      * @param partyCode
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.Map   <   java.lang.String   ,   java.lang.String>>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.Map < java.lang.String, java.lang.String>>
      * @author qushutong
      * @date 2019/9/20 19:57
      */
@@ -101,4 +102,14 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
      * @date 2019/9/21 14:14
      */
     Integer getCodeCount(SysDeptDTO dto);
+
+    /**
+     * 通过网格id集合，获取网格长管理的所有网格
+     *
+     * @param gridIdList
+     * @return java.util.List<com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO>
+     * @author work@yujt.net.cn
+     * @date 2019/10/24 15:26
+     */
+    List<GridForLeaderRegisterDTO> selectListGridForLeader(List<String> gridIdList);
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@@ -24,6 +24,7 @@ import com.elink.esua.epdc.dao.SysDeptDao;
 import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.dto.SysSimpleDeptDTO;
+import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO;
 import com.elink.esua.epdc.entity.SysDeptEntity;
 import com.elink.esua.epdc.service.SysDeptService;
 import com.elink.esua.epdc.service.SysUserService;
@@ -214,6 +215,11 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         return new Result().ok(completeDept);
     }
 
+    @Override
+    public List<GridForLeaderRegisterDTO> selectListGridForLeader(List<String> gridIdList) {
+        return this.baseDao.selectListGridForLeader(gridIdList);
+    }
+
     @Override
     public List<SysDeptDTO> listOfItemCirculationDept(Long deptId) {
         return baseDao.selectListOfItemCirculationDept(deptId);

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java

@@ -183,14 +183,16 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
         SysUserEntity sysUserEntity = baseDao.selectOne(wrapper);
         SysUserDTO dto = ConvertUtils.sourceToTarget(sysUserEntity, SysUserDTO.class);
 
-        List<GridForLeaderRegisterDTO> list = this.baseDao.selectListLeaderGrid(mobile);
-        if (CollUtil.isEmpty(list)) {
+        List<String> gridIdList = this.baseDao.selectListLeaderGridId(mobile);
+        if (CollUtil.isEmpty(gridIdList)) {
             return new Result().error("校验网格长数据权限失败");
         }
 
+        List<GridForLeaderRegisterDTO> gridForLeaderList = sysDeptService.selectListGridForLeader(gridIdList);
+
         GridLeaderRegisterDTO result = new GridLeaderRegisterDTO();
         result.setSysUser(dto);
-        result.setLeaderGridList(list);
+        result.setLeaderGridList(gridForLeaderList);
         return new Result<GridLeaderRegisterDTO>().ok(result);
     }
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml

@@ -88,4 +88,28 @@
             AND type_key = 'district_dept'
     </select>
 
+
+    <select id="selectListGridForLeader" resultType="com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO">
+        SELECT
+            dis.`name` district,
+            dis.id districtId,
+            str.`name` street,
+            str.id streetId,
+            com.`name` community,
+            com.id communityId,
+            gri.`name` grid,
+            gri.id gridId,
+            gri.created_time switchedTime
+        FROM
+            sys_dept gri
+            LEFT JOIN sys_dept com ON gri.pid = com.id
+            LEFT JOIN sys_dept str ON com.pid = str.id
+            LEFT JOIN sys_dept dis ON str.pid = dis.id
+        WHERE
+            gri.ID in
+            <foreach collection="gridIdList" item="gridId" open="(" separator="," close=")">#{gridId}</foreach>
+            AND gri.del_flag = '0'
+            AND dis.id IS NOT NULL
+    </select>
+
 </mapper>

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml

@@ -59,11 +59,9 @@
     </select>
 
 
-    <select id="selectListLeaderGrid" resultType="com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO">
+    <select id="selectListLeaderGridId" resultType="java.lang.String">
         SELECT
-            d.id gridId,
-            d.`name` grid,
-            d.create_date switchedTime
+            d.id gridId
         FROM
             sys_user u
             LEFT JOIN sys_role_user ru ON u.id = ru.user_id
@@ -72,7 +70,7 @@
             LEFT JOIN sys_dept d ON d.id = rds.dept_id
         WHERE
             d.type_key = 'grid_party'
-            AND r.`code` = 'role_test'
+            AND r.`code` = 'gridLeader'
             AND u.mobile = #{mobile}
         ORDER BY
             d.create_date DESC