身边党员-积分排名(已测)

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/ResiAroundPartyPointRankFormDTO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description 身边党员 积分排行接口 入参
@@ -47,7 +48,7 @@ public class ResiAroundPartyPointRankFormDTO implements Serializable {
     private String gridId;
 
     /**
-     * 客户Id，不做校验，如果前端不传则使用userId查询相应的客户Id
+     * 通过网格id，获取到的 网格下的 认证成功的党员 的用户id
      * */
-    private String customerId;
+    private List<String> userIds;
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/AroundPartyConstant.java

@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.common.enu;
+
+import com.epmet.commons.tools.constant.Constant;
+
+/**
+ * 身边党员-积分排行 入参常量
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.1.0
+ */
+public interface AroundPartyConstant extends Constant {
+
+    String ALL = "all";
+
+    String MONTHLY = "monthly";
+
+    String GRID = "grid";
+
+    String COMMUNITY = "community";
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java

@@ -97,4 +97,3 @@ public class AdjustmentController {
         return new Result();
     }
 }
-

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java

@@ -146,15 +146,13 @@ public class ResiPointController {
      *          scope ： grid   &&   type ：all               表示：按网格统计，对党员累计可用积分   排序
      *          scope ： community   &&   type ：monthly      表示：按社区统计，对本月党员增加的积分 进行排序
      *          scope ： community   &&   type ：all          表示：按社区统计，对党员累计可用积分   排序
-     * @param tokenDto
      * @param formDTO
      * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.ResiAroundPartyPointRankResultDTO>>
      * @Author zhangyong
      * @Date 16:17 2020-12-28
      **/
     @PostMapping("aroundparty")
-    public Result<List<ResiAroundPartyPointRankResultDTO>> aroundPartyPointRank(@LoginUser TokenDto tokenDto, @RequestBody ResiAroundPartyPointRankFormDTO formDTO){
+    public Result<List<ResiAroundPartyPointRankResultDTO>> aroundPartyPointRank( @RequestBody ResiAroundPartyPointRankFormDTO formDTO){
-        formDTO.setCustomerId(tokenDto.getCustomerId());
         ValidatorUtils.validateEntity(formDTO,ResiAroundPartyPointRankFormDTO.ResiAroundPartyPointRankGroup.class);
         List<ResiAroundPartyPointRankResultDTO> resultDTOS = userPointStatisticalDailyService.listAroundPartyPointRank(formDTO);
         return new Result<List<ResiAroundPartyPointRankResultDTO>>().ok(resultDTOS);

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java

@@ -66,7 +66,7 @@ public interface UserPointStatisticalDailyDao extends BaseDao<UserPointStatistic
     void insertOrUpdate(UserPointStatisticalDailyEntity entity);
 
     /**
-     * 身边党员-积分排行 ：按网格统计，对党员累计可用积分   排序
+     * 身边党员-积分排行 ：按网格统计，获取党员累计可用积分   排序
      * @param formDTO
      * @return java.util.List<com.epmet.dto.result.ResiAroundPartyPointRankResultDTO>
      * @Author zhangyong
@@ -82,25 +82,4 @@ public interface UserPointStatisticalDailyDao extends BaseDao<UserPointStatistic
      * @Date 09:24 2020-12-29
      **/
     List<ResiAroundPartyPointRankResultDTO> selectListGridPartyRankPointByMonth(ResiAroundPartyPointRankFormDTO formDTO);
-
-    /**
-     * 身边党员-积分排行 ：按社区(社区下的所有网格)统计，对党员累计可用积分   排序
-     * @param formDTO
-     * @param grids     社区下的所有网格id
-     * @return java.util.List<com.epmet.dto.result.ResiAroundPartyPointRankResultDTO>
-     * @Author zhangyong
-     * @Date 09:24 2020-12-29
-     **/
-    List<ResiAroundPartyPointRankResultDTO> selectListCommunityPartyRankByUsablePoint(ResiAroundPartyPointRankFormDTO formDTO,
-                                                                                      @Param("grids")List<String> grids);
-
-    /**
-     * 身边党员-积分排行 ：按社区(社区下的所有网格)统计，对本月党员增加的积分 进行排序
-     * @param formDTO
-     * @return java.util.List<com.epmet.dto.result.ResiAroundPartyPointRankResultDTO>
-     * @Author zhangyong
-     * @Date 09:24 2020-12-29
-     **/
-    List<ResiAroundPartyPointRankResultDTO> selectListCommunityPartyRankPointByMonth(ResiAroundPartyPointRankFormDTO formDTO,
-                                                                                     @Param("grids")List<String> grids);
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java

@@ -19,6 +19,7 @@ package com.epmet.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.common.enu.AroundPartyConstant;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
@@ -33,6 +34,8 @@ import com.epmet.dto.result.*;
 import com.epmet.entity.UserPointStatisticalDailyEntity;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
+import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient;
 import com.epmet.service.UserPointStatisticalDailyService;
 import com.epmet.utils.DimIdGenerator;
 import com.epmet.utils.ModuleConstant;
@@ -60,6 +63,8 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
     @Autowired
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
+    @Autowired
+    private ResiPartyMemberOpenFeignClient resiPartyMemberOpenFeignClient;
 
     @Override
     public PageData<UserPointStatisticalDailyDTO> page(Map<String, Object> params) {
@@ -234,47 +239,70 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
     @Override
     public List<ResiAroundPartyPointRankResultDTO> listAroundPartyPointRank(ResiAroundPartyPointRankFormDTO formDTO) {
         //查询条件
-        int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
+        formDTO.setPageNo((formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize());
-        formDTO.setPageNo(pageIndex);
         List<ResiAroundPartyPointRankResultDTO> resultDTOS = new ArrayList<>();
 
-        // 获取党员信息
+        List<String> gridList = new ArrayList<>();
-
+        // 1-1、获取网格id
-        // 按网格统计
+        if (AroundPartyConstant.GRID.equals(formDTO.getScope())){
-        if ("grid".equals(formDTO.getScope())){
+            gridList.add(formDTO.getGridId());
-            if ("monthly".equals(formDTO.getType())){
-                // scope ： grid   &&   type ：monthly           表示：按网格统计，对本月党员增加的积分 进行排序
-                resultDTOS = baseDao.selectListGridPartyRankPointByMonth(formDTO);
-            } else if ("all".equals(formDTO.getType())){
-                // scope ： grid   &&   type ：all               表示：按网格统计，对党员累计可用积分   排序
-                resultDTOS = baseDao.selectListGridPartyRankByUsablePoint(formDTO);
-            }
         }
 
-        // 按社区统计
+        // 1-2、获取社区(下的所有的网格) id
-        if ("community".equals(formDTO.getScope())){
+        if (AroundPartyConstant.COMMUNITY.equals(formDTO.getScope())){
-            // 根据网格id，获取社区下的所有网格id
+            // 1、根据网格id，获取社区下的所有网格id
             Result<List<String>> gridInCommunity = govOrgOpenFeignClient.getGridIdsInCommunity(formDTO.getGridId());
-            if (gridInCommunity.getData().size() <= NumConstant.ZERO){
+            if (gridInCommunity.success() && gridInCommunity.getData().isEmpty()){
-                log.error("根据" + formDTO.getGridId() + "网格id, 查询不到同属于一个社区下的所有网格id");
+                log.warn("根据" + formDTO.getGridId() + "网格id, 查询不到同属于一个社区下的所有网格id");
                 return resultDTOS;
             }
-            if ("monthly".equals(formDTO.getType())){
+            gridList = gridInCommunity.getData();
-                // scope ： community   &&   type ：monthly      表示：按社区统计，对本月党员增加的积分 进行排序
-                resultDTOS = baseDao.selectListCommunityPartyRankPointByMonth(formDTO, gridInCommunity.getData());
-            } else if ("all".equals(formDTO.getType())){
-                // scope ： community   &&   type ：all          表示：按社区统计，对党员累计可用积分   排序
-                resultDTOS = baseDao.selectListCommunityPartyRankByUsablePoint(formDTO, gridInCommunity.getData());
         }
+
+        // 2.获取网格下的所有党员
+        Result<List<PartymemberInfoDTO>> partymemberInfo = resiPartyMemberOpenFeignClient.getPartymemberInfoByGridId(gridList);
+        if (partymemberInfo.success() && partymemberInfo.getData().isEmpty()){
+            log.warn("根据" + formDTO.getGridId() + "网格id, 查询不到党员信息");
+            return resultDTOS;
+        }
+
+        // 2.1.获取认证通过的党员的 用户id
+        List<String> userIds = getUserIds(partymemberInfo.getData());
+        formDTO.setUserIds(userIds);
+
+        // 3.根据用户id(所有)，查询积分信息，进行排名
+        if (AroundPartyConstant.ALL.equals(formDTO.getType())){
+            // scope ： community   &&   type ：all          表示：按网格(一个网格 或 社区下的所有网格)统计，对党员累计可用积分   排序
+            resultDTOS = baseDao.selectListGridPartyRankByUsablePoint(formDTO);
+
+        } else if (AroundPartyConstant.MONTHLY.equals(formDTO.getType())){
+            // scope ： community   &&   type ：monthly      表示：按网格(一个网格 或 社区下的所有网格)统计，对本月党员增加的积分 进行排序
+            resultDTOS = baseDao.selectListGridPartyRankPointByMonth(formDTO);
         }
 
-        // 给排好序的 身边党员-积分排行， 赋值 【头像】
+        // 给排好序的 身边党员-积分排行， 赋值 【头像、真实姓名】
         resultDTOS = getPartyBaseInfo(resultDTOS);
         return resultDTOS;
     }
 
+    /**
+     * 获取认证通过的党员的 用户id
+     *
+     * @param partymemberInfo
+     * @return java.util.List<java.lang.String>
+     * @Author zhangyong
+     * @Date 14:11 2020-12-29
+     **/
+    private List<String> getUserIds(List<PartymemberInfoDTO> partymemberInfo){
+        List<String> userIds = new ArrayList<>();
+        for (PartymemberInfoDTO dto : partymemberInfo){
+            userIds.add(dto.getUserId());
+        }
+        return userIds;
+    }
+
     /*
-     * 给排好序的 身边党员-积分排行， 赋值 【头像】
+     * 给排好序的 身边党员-积分排行， 赋值 【头像、真实姓名】
      * @param rankResultDTOS
      * @return java.util.List<com.epmet.dto.result.ResiAroundPartyPointRankResultDTO>
      * @Author zhangyong
@@ -296,6 +324,7 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
                 for (ResiAroundPartyPointRankResultDTO formDTO : rankResultDTOS){
                     if (formDTO.getUserId().equals(resiInfo.getUserId())){
                         formDTO.setUserHeadPhoto(resiInfo.getHeadImgUrl());
+                        formDTO.setRealName(resiInfo.getRealName());
                     }
                 }
             }

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml

@@ -133,154 +133,42 @@
     <!--  身边党员-积分排行 ：按网格统计，对党员累计可用积分   排序 -->
     <select id="selectListGridPartyRankByUsablePoint" resultType="com.epmet.dto.result.ResiAroundPartyPointRankResultDTO" >
         SELECT
-            @curRank := @curRank + 1 AS rank,
+            @curRank := @curRank + 1 AS ranking,
-            partyInfo.realName,
+            IFNULL(p.USABLE_POINT, 0) point,
-            partyInfo.USER_ID userId,
+			p.USER_ID userId
-            partyInfo.point
-        FROM(
-            SELECT
-                partys.realName,
-                partys.USER_ID,
-                partys.GRID_ID,
-                IFNULL(p.USABLE_POINT, 0) point
-            FROM(
-                SELECT
-                    CONCAT(SURNAME, `NAME`) realName,
-                    USER_ID,
-                    GRID_ID
         FROM
-                    epmet_resi_partymember.partymember_info
+		    user_point_total p, ( SELECT @curRank := #{pageNo} * #{pageSize} ) r
-                WHERE DEL_FLAG = 0 AND CONFIRM_RESULT IN ('auto_confirm_success', 'approved')
+        <if test="null != userIds and userIds.size() > 0">
-                AND CUSTOMER_ID = #{customerId} AND GRID_ID = #{gridId}
+            WHERE p.USER_ID IN
-            ) partys LEFT JOIN epmet_point.user_point_total p ON partys.USER_ID = p.USER_ID
+            <foreach collection="userIds" item="userId" open="(" separator="," close=" )">
-        ) partyInfo,
+                #{userId}
-        ( SELECT @curRank := 0 ) r
+            </foreach>
-        ORDER BY partyInfo.point DESC, convert(partyInfo.realName using gbk) ASC
+        </if>
+        ORDER BY IFNULL(p.USABLE_POINT, 0) DESC
         LIMIT #{pageNo}, #{pageSize}
     </select>
 
     <!--  身边党员-积分排行 ：按网格统计，对本月党员增加的积分 进行排序 -->
     <select id="selectListGridPartyRankPointByMonth" resultType="com.epmet.dto.result.ResiAroundPartyPointRankResultDTO" >
         SELECT
-            @curRank := @curRank + 1 AS rank,
+            @curRank := @curRank + 1 AS ranking,
-            partyInfo.realName,
+            P.userId,
-            partyInfo.USER_ID userId,
+            P.point
-            partyInfo.point
         FROM(
-
             SELECT
-                partys.realName,
+                pl.USER_ID userId,
-                partys.USER_ID,
+                SUM(PL.POINT) point
-                partys.GRID_ID,
+            FROM user_point_action_log pl
-                IFNULL(p.point, 0) point
-            FROM (
-                SELECT
-                    CONCAT(SURNAME, `NAME`) realName,
-                    USER_ID,
-                    GRID_ID
-                FROM
-                    epmet_resi_partymember.partymember_info
-                WHERE DEL_FLAG = 0 AND CONFIRM_RESULT IN ('auto_confirm_success', 'approved')
-                AND CUSTOMER_ID = #{customerId} AND GRID_ID = #{gridId}
-            ) partys
-            LEFT JOIN (
-                SELECT pl.USER_ID, SUM(PL.POINT) point
-                FROM epmet_point.user_point_action_log pl
             WHERE pl.DEL_FLAG = '0' AND DATE_FORMAT(pl.CREATED_TIME, '%Y%m')= DATE_FORMAT( CURDATE( ) , '%Y%m' ) AND pl.action_flag = 'plus'
             GROUP BY pl.USER_ID
-            ) p ON partys.USER_ID = p.USER_ID
+        ) P, ( SELECT @curRank := #{pageNo} * #{pageSize} ) r
-
+        <if test="null != userIds and userIds.size() > 0">
-        ) partyInfo,
+            WHERE userId IN
-        ( SELECT @curRank := 0 ) r
+            <foreach collection="userIds" item="userId" open="(" separator="," close=" )">
-        ORDER BY partyInfo.point DESC, convert(partyInfo.realName using gbk) ASC
+                #{userId}
-        LIMIT #{pageNo}, #{pageSize}
-    </select>
-
-    <!--  身边党员-积分排行 ：按社区(社区下的所有网格)统计，对党员累计可用积分   排序 -->
-    <select id="selectListCommunityPartyRankByUsablePoint" resultType="com.epmet.dto.result.ResiAroundPartyPointRankResultDTO" >
-          SELECT
-			@curRank := @curRank + 1 AS rank,
-			partyInfo.realName,
-			partyInfo.USER_ID userId,
-			partyInfo.point
-        FROM(
-            SELECT
-                partys.realName,
-                partys.USER_ID,
-                partys.GRID_ID,
-                IFNULL(p.USABLE_POINT, 0) point
-            FROM(
-                SELECT
-                    pg.realName,
-                    pg.USER_ID,
-                    pg.GRID_ID
-                FROM (
-                    SELECT
-                        CONCAT(SURNAME, `NAME`) realName,
-                        USER_ID,
-                        GRID_ID
-                    FROM
-                        epmet_resi_partymember.partymember_info
-                    WHERE DEL_FLAG = 0 AND CONFIRM_RESULT IN ('auto_confirm_success', 'approved')
-                    AND CUSTOMER_ID = #{customerId}
-                ) pg WHERE 1=1
-                <if test="null != grids and grids.size() > 0">
-                    WHERE pg.GRID_ID IN
-                    <foreach collection="grids" item="grid" open="AND (" separator=" OR " close=" )">
-                        #{grid}
-                    </foreach>
-                </if>
-            ) partys LEFT JOIN epmet_point.user_point_total p ON partys.USER_ID = p.USER_ID
-        ) partyInfo,
-        ( SELECT @curRank := 0 ) r
-        ORDER BY partyInfo.point DESC, convert(partyInfo.realName using gbk) ASC
-        LIMIT #{pageNo}, #{pageSize}
-    </select>
-
-    <!--  身边党员-积分排行 ：按网格统计，对本月党员增加的积分 进行排序 -->
-    <select id="selectListCommunityPartyRankPointByMonth" resultType="com.epmet.dto.result.ResiAroundPartyPointRankResultDTO" >
-        SELECT
-			@curRank := @curRank + 1 AS rank,
-			partyInfo.realName,
-			partyInfo.USER_ID userId,
-			partyInfo.point
-        FROM(
-		    SELECT
-				partys.realName,
-				partys.USER_ID,
-				partys.GRID_ID,
-				IFNULL(p.point, 0) point
-            FROM(
-                SELECT
-                    pg.realName,
-                    pg.USER_ID,
-                    pg.GRID_ID
-                FROM (
-                    SELECT
-                        CONCAT(SURNAME, `NAME`) realName,
-                        USER_ID,
-                        GRID_ID
-                    FROM
-                        epmet_resi_partymember.partymember_info
-                    WHERE DEL_FLAG = 0 AND CONFIRM_RESULT IN ('auto_confirm_success', 'approved')
-                    AND CUSTOMER_ID = '45687aa479955f9d06204d415238f7cc'
-                ) pg
-                <if test="null != grids and grids.size() > 0">
-                    WHERE pg.GRID_ID IN
-                    <foreach collection="grids" item="grid" open="AND (" separator=" OR " close=" )">
-                        #{grid}
             </foreach>
         </if>
-            ) partys
+        ORDER BY P.point DESC
-            LEFT JOIN (
-                    SELECT pl.USER_ID, SUM(PL.POINT) point
-                    FROM epmet_point.user_point_action_log pl
-                    WHERE pl.DEL_FLAG = '0' AND DATE_FORMAT(pl.CREATED_TIME, '%Y%m')= DATE_FORMAT( CURDATE( ) , '%Y%m' ) AND pl.action_flag = 'plus'
-                    GROUP BY pl.USER_ID
-            ) p ON partys.USER_ID = p.USER_ID
-
-        ) partyInfo, ( SELECT @curRank := 0 ) r
-		ORDER BY partyInfo.point DESC, convert(partyInfo.realName using gbk) ASC
         LIMIT #{pageNo}, #{pageSize}
     </select>
 </mapper>

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -322,6 +322,6 @@ public interface GovOrgOpenFeignClient {
      * @Author zhangyong
      * @Date 17:44 2020-12-28
      **/
-    @GetMapping("/gov/org/customergrid/getGridInCommunity/{gridId}")
+    @GetMapping("/gov/org/customergrid/getGridIdsInCommunity/{gridId}")
     Result<List<String>> getGridIdsInCommunity(@PathVariable("gridId") String gridId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java

@@ -235,9 +235,9 @@ public class CustomerGridController {
      * @Description 根据 网格id，查询同属于一个社区下的所有网格id、网格name
      * @Date 2020/12/28 23:16
      **/
-    @GetMapping("getGridInCommunity/{gridId}")
+    @GetMapping("getGridIdsInCommunity/{gridId}")
-    public Result<List<String>> getGridInCommunity(@PathVariable("gridId") String gridId) {
+    public Result<List<String>> getGridIdsInCommunity(@PathVariable("gridId") String gridId) {
-        List<String> resultDTOS = customerGridService.listGridInCommunity(gridId);
+        List<String> resultDTOS = customerGridService.listGridIdsInCommunity(gridId);
         return new Result<List<String>>().ok(resultDTOS);
     }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java

@@ -254,5 +254,5 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      * @Description 根据 网格id，查询同属于一个社区下的所有网格id、网格name
      * @Date 2020/12/28 23:16
      **/
-    List<String> selectListGridInCommunity(@Param("gridId") String gridId);
+    List<String> selectListGridIdsInCommunity(@Param("gridId") String gridId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java

@@ -285,5 +285,5 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
      * @Description 根据 网格id，查询同属于一个社区下的所有网格id、网格name
      * @Date 2020/12/28 23:16
      **/
-    List<String> listGridInCommunity(String gridId);
+    List<String> listGridIdsInCommunity(String gridId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@@ -693,7 +693,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     }
 
     @Override
-    public List<String> listGridInCommunity(String gridId) {
+    public List<String> listGridIdsInCommunity(String gridId) {
-        return baseDao.selectListGridInCommunity(gridId);
+        return baseDao.selectListGridIdsInCommunity(gridId);
     }
 }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@@ -547,7 +547,7 @@
     </select>
 
     <!--根据 网格id，查询同属于一个社区下的所有网格id-->
-    <select id="selectListGridInCommunity" resultType="java.lang.String">
+    <select id="selectListGridIdsInCommunity" resultType="java.lang.String">
         SELECT
             ID
         FROM customer_grid

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java

@@ -84,4 +84,14 @@ public interface ResiPartyMemberOpenFeignClient {
      **/
     @PostMapping(value = "/resi/partymember/partymemberinfo/queryPartymemberInfoByUserId", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
     Result<List<PartymemberInfoDTO>> queryPartymemberInfoByUserId(@RequestBody List<String> userIdList);
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO>>
+     * @param gridIdList
+     * @author zy
+     * @description 根据网格id查询认证通过的党员信息
+     * @Date 2020/7/22 12:14
+     **/
+    @PostMapping(value = "/resi/partymember/partymemberinfo/getPartymemberInfoByGridId", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    Result<List<PartymemberInfoDTO>> getPartymemberInfoByGridId(@RequestBody List<String> gridIdList);
 }

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java

@@ -60,5 +60,8 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp
         return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "queryPartymemberInfoByUserId", userIdList);
     }
 
-
+    @Override
+    public Result<List<PartymemberInfoDTO>> getPartymemberInfoByGridId(List<String> gridIdList) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "getPartymemberInfoByGridId", gridIdList);
+    }
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberInfoController.java

@@ -144,4 +144,17 @@ public class PartymemberInfoController {
         List<PartymemberInfoDTO> list = partymemberInfoService.queryPartymemberInfoByUserId(userIdList);
         return new Result<List<PartymemberInfoDTO>>().ok(list);
     }
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO>>
+     * @param gridIdList
+     * @author zy
+     * @description 根据网格id查询认证通过的党员信息
+     * @Date 2020/7/22 12:14
+     **/
+    @PostMapping(value = "getPartymemberInfoByGridId")
+    Result<List<PartymemberInfoDTO>> getPartymemberInfoByGridId(@RequestBody List<String> gridIdList) {
+        List<PartymemberInfoDTO> list = partymemberInfoService.listPartymemberInfoByGridId(gridIdList);
+        return new Result<List<PartymemberInfoDTO>>().ok(list);
+    }
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberInfoDao.java

@@ -86,4 +86,13 @@ public interface PartymemberInfoDao extends BaseDao<PartymemberInfoEntity> {
      * @Date 2020/12/25 14:02
      **/
     List<PartyAuthProcessingCountResultDTO> selectCountAuditting(@Param("gridIdList") List<String> gridIdList);
+
+	/**
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO>>
+	 * @param gridIdList
+	 * @author zy
+	 * @description 根据网格id查询认证通过的党员信息
+	 * @Date 2020/7/22 12:14
+	 **/
+	List<PartymemberInfoDTO> selectListPartymemberInfoByGridId(@Param("gridIdList") List<String> gridIdList);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java

@@ -153,4 +153,13 @@ public interface PartymemberInfoService extends BaseService<PartymemberInfoEntit
      * @Date 2020/7/22 12:18
      **/
     List<PartymemberInfoDTO> queryPartymemberInfoByUserId(List<String> userIdList);
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO>>
+     * @param gridIdList
+     * @author zy
+     * @description 根据网格id查询认证通过的党员信息
+     * @Date 2020/7/22 12:14
+     **/
+    List<PartymemberInfoDTO> listPartymemberInfoByGridId(List<String> gridIdList);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java

@@ -230,5 +230,9 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl<PartymemberInfoD
 		return list;
 	}
 
-
+	@Override
+	public List<PartymemberInfoDTO> listPartymemberInfoByGridId(List<String> gridIdList) {
+		List<PartymemberInfoDTO> list = baseDao.selectListPartymemberInfoByGridId(gridIdList);
+		return list;
+	}
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml

@@ -135,4 +135,38 @@
             </if>
             group by pi.GRID_ID
     </select>
+
+    <!--  根据网格id查询认证通过的党员信息  -->
+    <select id="selectListPartymemberInfoByGridId" resultType="com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO">
+        SELECT
+            ID,
+            CUSTOMER_ID,
+            USER_ID,
+            GRID_ID,
+            PARTYMEMBER_VISIT_ID,
+            CONFIRM_RESULT,
+            SURNAME,
+            NAME,
+            ID_CARD,
+            MOBILE,
+            STREET,
+            ESTATE,
+            BUILDING,
+            ORGANIZATION_TYPE,
+            EXTRA_ORGANIZATION,
+            EXTRA_CERTIFIER_NAME,
+            EXTRA_CERTIFIER_MOBILE,
+            CREATED_TIME
+        FROM
+            partymember_info
+        WHERE
+            DEL_FLAG = 0
+            AND ( CONFIRM_RESULT = 'auto_confirm_success' OR CONFIRM_RESULT = 'approved' )
+            <if test="gridIdList != null and gridIdList.size() != 0">
+                AND GRID_ID IN
+                <foreach collection="gridIdList" item="gridId" open="(" close=")" separator=",">
+                    #{gridId}
+                </foreach>
+            </if>
+    </select>
 </mapper>