diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/ResiAroundPartyPointRankFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/ResiAroundPartyPointRankFormDTO.java index 8387992756..4fb40ab5c5 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/ResiAroundPartyPointRankFormDTO.java +++ b/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 userIds; } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/AroundPartyConstant.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/AroundPartyConstant.java new file mode 100644 index 0000000000..43a1a8498a --- /dev/null +++ b/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"; +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java index 535b717e0c..f610a25df6 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java +++ b/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(); } } - diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java index 6e7336d188..31906aa411 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java +++ b/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> * @Author zhangyong * @Date 16:17 2020-12-28 **/ @PostMapping("aroundparty") - public Result> aroundPartyPointRank(@LoginUser TokenDto tokenDto, @RequestBody ResiAroundPartyPointRankFormDTO formDTO){ - formDTO.setCustomerId(tokenDto.getCustomerId()); + public Result> aroundPartyPointRank( @RequestBody ResiAroundPartyPointRankFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO,ResiAroundPartyPointRankFormDTO.ResiAroundPartyPointRankGroup.class); List resultDTOS = userPointStatisticalDailyService.listAroundPartyPointRank(formDTO); return new Result>().ok(resultDTOS); diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java index b536a8b5e9..0ef7deae28 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointStatisticalDailyDao.java @@ -66,7 +66,7 @@ public interface UserPointStatisticalDailyDao extends BaseDao * @Author zhangyong @@ -82,25 +82,4 @@ public interface UserPointStatisticalDailyDao extends BaseDao selectListGridPartyRankPointByMonth(ResiAroundPartyPointRankFormDTO formDTO); - - /** - * 身边党员-积分排行 ：按社区(社区下的所有网格)统计，对党员累计可用积分 排序 - * @param formDTO - * @param grids 社区下的所有网格id - * @return java.util.List - * @Author zhangyong - * @Date 09:24 2020-12-29 - **/ - List selectListCommunityPartyRankByUsablePoint(ResiAroundPartyPointRankFormDTO formDTO, - @Param("grids")List grids); - - /** - * 身边党员-积分排行 ：按社区(社区下的所有网格)统计，对本月党员增加的积分 进行排序 - * @param formDTO - * @return java.util.List - * @Author zhangyong - * @Date 09:24 2020-12-29 - **/ - List selectListCommunityPartyRankPointByMonth(ResiAroundPartyPointRankFormDTO formDTO, - @Param("grids")List grids); } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java index ac5849d385..63ad8f5b6d 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java +++ b/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 page(Map params) { @@ -234,47 +239,70 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl listAroundPartyPointRank(ResiAroundPartyPointRankFormDTO formDTO) { //查询条件 - int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize(); - formDTO.setPageNo(pageIndex); + formDTO.setPageNo((formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize()); List resultDTOS = new ArrayList<>(); - // 获取党员信息 - - // 按网格统计 - if ("grid".equals(formDTO.getScope())){ - 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); - } + List gridList = new ArrayList<>(); + // 1-1、获取网格id + if (AroundPartyConstant.GRID.equals(formDTO.getScope())){ + gridList.add(formDTO.getGridId()); } - // 按社区统计 - if ("community".equals(formDTO.getScope())){ - // 根据网格id，获取社区下的所有网格id + // 1-2、获取社区(下的所有的网格) id + if (AroundPartyConstant.COMMUNITY.equals(formDTO.getScope())){ + // 1、根据网格id，获取社区下的所有网格id Result> gridInCommunity = govOrgOpenFeignClient.getGridIdsInCommunity(formDTO.getGridId()); - if (gridInCommunity.getData().size() <= NumConstant.ZERO){ - log.error("根据" + formDTO.getGridId() + "网格id, 查询不到同属于一个社区下的所有网格id"); + if (gridInCommunity.success() && gridInCommunity.getData().isEmpty()){ + log.warn("根据" + formDTO.getGridId() + "网格id, 查询不到同属于一个社区下的所有网格id"); return resultDTOS; } - if ("monthly".equals(formDTO.getType())){ - // 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()); - } + gridList = gridInCommunity.getData(); + } + + // 2.获取网格下的所有党员 + Result> partymemberInfo = resiPartyMemberOpenFeignClient.getPartymemberInfoByGridId(gridList); + if (partymemberInfo.success() && partymemberInfo.getData().isEmpty()){ + log.warn("根据" + formDTO.getGridId() + "网格id, 查询不到党员信息"); + return resultDTOS; + } + + // 2.1.获取认证通过的党员的 用户id + List 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 + * @Author zhangyong + * @Date 14:11 2020-12-29 + **/ + private List getUserIds(List partymemberInfo){ + List userIds = new ArrayList<>(); + for (PartymemberInfoDTO dto : partymemberInfo){ + userIds.add(dto.getUserId()); + } + return userIds; + } + /* - * 给排好序的 身边党员-积分排行， 赋值 【头像】 + * 给排好序的 身边党员-积分排行， 赋值 【头像、真实姓名】 * @param rankResultDTOS * @return java.util.List * @Author zhangyong @@ -296,6 +324,7 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl - - - - - - diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java index 2c2c8144b0..fe67bef009 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java +++ b/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> getGridIdsInCommunity(@PathVariable("gridId") String gridId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java index 26ccea082b..8aacd68bec 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java +++ b/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}") - public Result> getGridInCommunity(@PathVariable("gridId") String gridId) { - List resultDTOS = customerGridService.listGridInCommunity(gridId); + @GetMapping("getGridIdsInCommunity/{gridId}") + public Result> getGridIdsInCommunity(@PathVariable("gridId") String gridId) { + List resultDTOS = customerGridService.listGridIdsInCommunity(gridId); return new Result>().ok(resultDTOS); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java index 45afaf2874..2594d13182 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java @@ -254,5 +254,5 @@ public interface CustomerGridDao extends BaseDao { * @Description 根据 网格id，查询同属于一个社区下的所有网格id、网格name * @Date 2020/12/28 23:16 **/ - List selectListGridInCommunity(@Param("gridId") String gridId); + List selectListGridIdsInCommunity(@Param("gridId") String gridId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java index df10430dbf..95f0d63061 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java @@ -285,5 +285,5 @@ public interface CustomerGridService extends BaseService { * @Description 根据 网格id，查询同属于一个社区下的所有网格id、网格name * @Date 2020/12/28 23:16 **/ - List listGridInCommunity(String gridId); + List listGridIdsInCommunity(String gridId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index da31fd338a..8302b1252f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/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 listGridInCommunity(String gridId) { - return baseDao.selectListGridInCommunity(gridId); + public List listGridIdsInCommunity(String gridId) { + return baseDao.selectListGridIdsInCommunity(gridId); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index ecb4a27199..a503573b9f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -547,7 +547,7 @@ - SELECT ID FROM customer_grid diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java index bd54ec1604..f823096f15 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java +++ b/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> queryPartymemberInfoByUserId(@RequestBody List userIdList); + + /** + * @return com.epmet.commons.tools.utils.Result> + * @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> getPartymemberInfoByGridId(@RequestBody List gridIdList); } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java index df60a30abc..3f3ebb8c97 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java +++ b/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> getPartymemberInfoByGridId(List gridIdList) { + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "getPartymemberInfoByGridId", gridIdList); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberInfoController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberInfoController.java index 89b9d7c135..5d7d081e13 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberInfoController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberInfoController.java @@ -42,7 +42,7 @@ import java.util.Map; /** - * 党员认证信息表 + * 党员认证信息表 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-03-30 @@ -50,7 +50,7 @@ import java.util.Map; @RestController @RequestMapping("partymemberinfo") public class PartymemberInfoController { - + @Autowired private PartymemberInfoService partymemberInfoService; @@ -144,4 +144,17 @@ public class PartymemberInfoController { List list = partymemberInfoService.queryPartymemberInfoByUserId(userIdList); return new Result>().ok(list); } -} \ No newline at end of file + + /** + * @return com.epmet.commons.tools.utils.Result> + * @param gridIdList + * @author zy + * @description 根据网格id查询认证通过的党员信息 + * @Date 2020/7/22 12:14 + **/ + @PostMapping(value = "getPartymemberInfoByGridId") + Result> getPartymemberInfoByGridId(@RequestBody List gridIdList) { + List list = partymemberInfoService.listPartymemberInfoByGridId(gridIdList); + return new Result>().ok(list); + } +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberInfoDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberInfoDao.java index 660cbfa957..f395beac8b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberInfoDao.java +++ b/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 { * @Date 2020/12/25 14:02 **/ List selectCountAuditting(@Param("gridIdList") List gridIdList); -} \ No newline at end of file + + /** + * @return com.epmet.commons.tools.utils.Result> + * @param gridIdList + * @author zy + * @description 根据网格id查询认证通过的党员信息 + * @Date 2020/7/22 12:14 + **/ + List selectListPartymemberInfoByGridId(@Param("gridIdList") List gridIdList); +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java index b8b0b39694..3290cb084f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java @@ -31,7 +31,7 @@ import java.util.List; import java.util.Map; /** - * 党员认证信息表 + * 党员认证信息表 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-03-30 @@ -153,4 +153,13 @@ public interface PartymemberInfoService extends BaseService queryPartymemberInfoByUserId(List userIdList); -} \ No newline at end of file + + /** + * @return com.epmet.commons.tools.utils.Result> + * @param gridIdList + * @author zy + * @description 根据网格id查询认证通过的党员信息 + * @Date 2020/7/22 12:14 + **/ + List listPartymemberInfoByGridId(List gridIdList); +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java index ddc22a04b1..c6ce32113b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java +++ b/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 listPartymemberInfoByGridId(List gridIdList) { + List list = baseDao.selectListPartymemberInfoByGridId(gridIdList); + return list; + } +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml index e47b1a142d..876e1102f0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml @@ -135,4 +135,38 @@ group by pi.GRID_ID - \ No newline at end of file + + + +