From 0b0f9b307df93b1d9876b866f1c6712e660e46b3 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 14 Sep 2021 10:03:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=8E=92=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/GroupPointFormDTO.java | 3 ++- .../main/java/com/epmet/controller/ResiPointController.java | 4 ++-- .../service/impl/UserPointStatisticalDailyServiceImpl.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) 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 b727bb5d1b..a90e01a1de 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 @@ -17,8 +17,9 @@ public class GroupPointFormDTO implements Serializable { public interface GroupPoint extends CustomerClientShowGroup {} public interface GridRank extends CustomerClientShowGroup {} + public interface PointRank extends CustomerClientShowGroup {} @NotBlank(message = "小组Id不能为空", groups = {GroupPoint.class, GridRank.class}) private String groupId; - @NotBlank(message = "网格Id不能为空", groups = {GridRank.class}) + @NotBlank(message = "网格Id不能为空", groups = {GridRank.class, PointRank.class}) private String gridId; } 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; }