Merge branch 'dev_guidance' into develop

# Conflicts:
#	epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java

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

@@ -21,9 +21,10 @@ public class GroupPointFormDTO implements Serializable {
 	public interface GridScopeRank {}
 	public interface CustomerScopeRank {}
 	public interface MyGroupRank {}
+	public interface PointRank extends CustomerClientShowGroup {}
 	@NotBlank(message = "小组Id不能为空", groups = {GroupPoint.class, GridRank.class})
 	private String groupId;
-	@NotBlank(message = "网格Id不能为空", groups = {GridRank.class, GridScopeRank.class, MyGroupRank.class})
+	@NotBlank(message = "网格Id不能为空", groups = {GridRank.class, GridScopeRank.class, MyGroupRank.class, PointRank.class})
 	private String gridId;
 	@NotBlank(message = "客户Id不能为空", groups = {CustomerScopeRank.class})
 	private String customerId;

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

@@ -201,7 +201,7 @@ public class ResiPointController {
      */
     @PostMapping("mypointrank")
     public Result<MyPointRankResultDTO> myPointRank(@LoginUser TokenDto tokenDto, @RequestBody GroupPointFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO, GroupPointFormDTO.GridRank.class);
+        ValidatorUtils.validateEntity(formDTO, GroupPointFormDTO.PointRank.class);
         return new Result<MyPointRankResultDTO>().ok(userPointStatisticalDailyService.myPointRank(tokenDto, formDTO));
     }
 
@@ -215,7 +215,7 @@ public class ResiPointController {
      */
     @PostMapping("gridpointrank")
     public Result<GridPointRankResultDTO> gridPointRank(@LoginUser TokenDto tokenDto, @RequestBody GroupPointFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO, GroupPointFormDTO.GridRank.class);
+        ValidatorUtils.validateEntity(formDTO, GroupPointFormDTO.PointRank.class);
         return new Result<GridPointRankResultDTO>().ok(userPointStatisticalDailyService.gridPointRank(tokenDto, formDTO));
     }
 

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

@@ -356,7 +356,7 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
         result.setCustomerRank(getRank(list, tokenDto.getUserId()));
         //获取网格用户积分
         List<BizPointUserTotalDetailDTO> gridRankList = getUserPointList(tokenDto.getCustomerId(), null, formDTO.getGridId());
-        result.setCustomerRank(getRank(gridRankList, tokenDto.getUserId()));
+        result.setGridRank(getRank(gridRankList, tokenDto.getUserId()));
         return result;
     }