diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java index 56825c39ca..b62546ef20 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/GroupPointFormDTO.java +++ b/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; 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 dbef30e35f..795f557449 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 @@ -201,7 +201,7 @@ public class ResiPointController { */ @PostMapping("mypointrank") public Result myPointRank(@LoginUser TokenDto tokenDto, @RequestBody GroupPointFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO, GroupPointFormDTO.GridRank.class); + ValidatorUtils.validateEntity(formDTO, GroupPointFormDTO.PointRank.class); return new Result().ok(userPointStatisticalDailyService.myPointRank(tokenDto, formDTO)); } @@ -215,7 +215,7 @@ public class ResiPointController { */ @PostMapping("gridpointrank") public Result gridPointRank(@LoginUser TokenDto tokenDto, @RequestBody GroupPointFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO, GroupPointFormDTO.GridRank.class); + ValidatorUtils.validateEntity(formDTO, GroupPointFormDTO.PointRank.class); return new Result().ok(userPointStatisticalDailyService.gridPointRank(tokenDto, formDTO)); } 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 65f8916512..5842e34bf6 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 @@ -356,7 +356,7 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl gridRankList = getUserPointList(tokenDto.getCustomerId(), null, formDTO.getGridId()); - result.setCustomerRank(getRank(gridRankList, tokenDto.getUserId())); + result.setGridRank(getRank(gridRankList, tokenDto.getUserId())); return result; }