网格队伍

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/GridMemberController.java

@@ -23,8 +23,9 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
-import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.AppMemberListFromDTO;
 import com.elink.esua.epdc.dto.GridMemberDTO;
 import com.elink.esua.epdc.excel.GridMemberExcel;
 import com.elink.esua.epdc.service.GridMemberService;
@@ -91,4 +92,28 @@ public class GridMemberController {
         ExcelUtils.exportExcelToTarget(response, null, list, GridMemberExcel.class);
     }
 
+    /**
+    * @describe: 居民端-网格队伍-社区介绍
+    * @author wangtong
+    * @date 2021/9/14 16:25
+    * @params [userDetail]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping("getDeptInfo")
+    public Result getDeptInfo( AppMemberListFromDTO dto){
+        return gridMemberService.getDeptInfo(dto);
+    }
+
+    /**
+    * @describe: 居民端-网格队伍-网格员列表
+    * @author wangtong
+    * @date 2021/9/14 16:29
+    * @params [AppMemberListFromDTO]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @GetMapping("getMemberList")
+    public Result getMemberList( AppMemberListFromDTO dto){
+        return gridMemberService.getMemberList(dto);
+    }
+
 }

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/GridMemberDao.java

@@ -18,6 +18,8 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.AppMemberListFromDTO;
+import com.elink.esua.epdc.dto.AppMemberListResultDTO;
 import com.elink.esua.epdc.dto.GridMemberDTO;
 import com.elink.esua.epdc.entity.GridMemberEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -35,4 +37,13 @@ import java.util.Map;
 public interface GridMemberDao extends BaseDao<GridMemberEntity> {
 
     List<GridMemberDTO> getPageList(Map<String, Object> params);
+
+    /**
+    * @describe:  居民端-网格队伍-网格员列表
+    * @author wangtong
+    * @date 2021/9/14 16:52
+    * @params [communityId]
+    * @return com.elink.esua.epdc.dto.AppMemberListResultDTO
+    */
+    List<AppMemberListResultDTO> getMemberList(AppMemberListFromDTO dto);
 }

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptInfoDao.java

@@ -18,8 +18,10 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.AppDeptInfoResultDTO;
 import com.elink.esua.epdc.entity.SysDeptInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 部门信息表 组织信息表
@@ -29,5 +31,13 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface SysDeptInfoDao extends BaseDao<SysDeptInfoEntity> {
-	
+
+    /**
+    * @describe: 通过部门id查询
+    * @author wangtong
+    * @date 2021/9/14 16:41
+    * @params [id]
+    * @return com.elink.esua.epdc.dto.AppDeptInfoResultDTO
+    */
+    AppDeptInfoResultDTO selectByDeptId(@Param("deptId") Long deptId);
 }

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/GridMemberService.java

@@ -19,6 +19,8 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.AppMemberListFromDTO;
 import com.elink.esua.epdc.dto.GridMemberDTO;
 import com.elink.esua.epdc.entity.GridMemberEntity;
 
@@ -92,4 +94,22 @@ public interface GridMemberService extends BaseService<GridMemberEntity> {
      * @date 2021-09-14
      */
     void delete(String[] ids);
+
+    /**
+     * @describe: 居民端-网格队伍-社区介绍
+     * @author wangtong
+     * @date 2021/9/14 16:25
+     * @params [userDetail]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    Result getDeptInfo(AppMemberListFromDTO dto);
+
+    /**
+     * @describe: 居民端-网格队伍-网格员列表
+     * @author wangtong
+     * @date 2021/9/14 16:29
+     * @params [AppMemberListFromDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    Result getMemberList(AppMemberListFromDTO dto);
 }

epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/GridMemberServiceImpl.java

@@ -21,12 +21,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 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.Result;
 import com.elink.esua.epdc.dao.GridMemberDao;
-import com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO;
+import com.elink.esua.epdc.dao.SysDeptDao;
-import com.elink.esua.epdc.dto.GridMemberDTO;
+import com.elink.esua.epdc.dao.SysDeptInfoDao;
+import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.entity.GridMemberEntity;
+import com.elink.esua.epdc.entity.SysDeptEntity;
 import com.elink.esua.epdc.optimize.modules.deptlevel.service.OptSysDeptService;
 import com.elink.esua.epdc.redis.GridMemberRedis;
 import com.elink.esua.epdc.service.GridMemberService;
@@ -54,6 +58,12 @@ public class GridMemberServiceImpl extends BaseServiceImpl<GridMemberDao, GridMe
     @Autowired
     private OptSysDeptService optSysDeptService;
 
+    @Autowired
+    private SysDeptDao sysDeptDao;
+
+    @Autowired
+    private SysDeptInfoDao sysDeptInfoDao;
+
     @Override
     public PageData<GridMemberDTO> page(Map<String, Object> params) {
         IPage<GridMemberDTO> page = getPage(params);
@@ -117,4 +127,25 @@ public class GridMemberServiceImpl extends BaseServiceImpl<GridMemberDao, GridMe
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public Result getDeptInfo(AppMemberListFromDTO dto) {
+        SysDeptEntity entity = sysDeptDao.selectById(dto.getDeptId());
+        AppDeptInfoResultDTO result = sysDeptInfoDao.selectByDeptId(entity.getPid());
+        if(result == null){
+            return new Result().error("未查到相关社区的简介信息");
+        }
+        result.setDeptName(sysDeptDao.selectById(entity.getPid()).getName());
+        return new Result().ok(result);
+    }
+
+    @Override
+    public Result getMemberList(AppMemberListFromDTO dto) {
+        SysDeptEntity entity = sysDeptDao.selectById(dto.getDeptId());
+        dto.setDeptId(entity.getPid());
+        int pageIndex = (dto.getPageIndex() - NumConstant.ONE) * dto.getPageSize();
+        dto.setPageIndex(pageIndex);
+        List<AppMemberListResultDTO> result = baseDao.getMemberList(dto);
+        return new Result().ok(result);
+    }
+
 }

epdc-cloud-admin/src/main/resources/mapper/GridMemberDao.xml

@@ -40,6 +40,21 @@
         </if>
         order by CREATED_TIME desc
     </select>
+    <select id="getMemberList" resultType="com.elink.esua.epdc.dto.AppMemberListResultDTO">
+        select id,
+			 name,
+			 IMG_URL,
+			 motto,
+			 duty,
+			 party_flag,
+			 mobile,
+			 territory
+        from epdc_grid_member
+        where del_flag='0'
+			and FIND_IN_SET(#{deptId},ALL_DEPT_IDS)
+		order by CREATED_TIME desc
+		LIMIT #{pageIndex},#{pageSize}
+    </select>
 
 
 </mapper>

epdc-cloud-admin/src/main/resources/mapper/SysDeptInfoDao.xml

@@ -21,6 +21,12 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="selectByDeptId" resultType="com.elink.esua.epdc.dto.AppDeptInfoResultDTO">
+        SELECT INTRODUCTION as deptInfo
+        FROM `sys_dept_info`
+        where DEL_FLAG='0'
+              and DEPT_ID=#{deptId}
+    </select>
 
 
 </mapper>