diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java index d2901df068..82c21cefcc 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/GroupPointController.java @@ -127,14 +127,14 @@ public class GroupPointController { * @date 2021.09.07 13:35:45 */ @PostMapping("grouppointranking/gridscope") - public Result> listGroupPointRandingInGridScope(@RequestBody GroupPointFormDTO formDTO) { + public Result> listGroupPointRandingInGridScope(@RequestBody GroupPointFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, GroupPointFormDTO.GridScopeRank.class); String gridId = formDTO.getGridId(); Integer pageNo = formDTO.getPageNo(); Integer pageSize = formDTO.getPageSize(); - PageData page = bizPointTotalDetailService.listGroupPointRandingInPercificScope(SearchScopeTypeEnum.GRID, gridId,pageNo, pageSize); - return new Result>().ok(page); + List page = bizPointTotalDetailService.listGroupPointRandingInPercificScope(SearchScopeTypeEnum.GRID, gridId,pageNo, pageSize); + return new Result>().ok(page); } /** @@ -146,14 +146,14 @@ public class GroupPointController { * @date 2021.09.08 09:18:37 */ @PostMapping("grouppointranking/customerscope") - public Result> listGroupPointRandingInCustomerScope(@RequestBody GroupPointFormDTO formDTO) { + public Result> listGroupPointRandingInCustomerScope(@RequestBody GroupPointFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, GroupPointFormDTO.CustomerScopeRank.class); String customerId = formDTO.getCustomerId(); Integer pageNo = formDTO.getPageNo(); Integer pageSize = formDTO.getPageSize(); - PageData page = bizPointTotalDetailService.listGroupPointRandingInPercificScope(SearchScopeTypeEnum.CUSTOMER, customerId, pageNo, pageSize); - return new Result>().ok(page); + List page = bizPointTotalDetailService.listGroupPointRandingInPercificScope(SearchScopeTypeEnum.CUSTOMER, customerId, pageNo, pageSize); + return new Result>().ok(page); } /** diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java index 94204eb3ed..b15043255a 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/BizPointTotalDetailService.java @@ -148,7 +148,7 @@ public interface BizPointTotalDetailService extends BaseService listGroupPointRandingInPercificScope(SearchScopeTypeEnum searchScopeType, String searchScopeId, Integer pageNo, Integer pageSize); + List listGroupPointRandingInPercificScope(SearchScopeTypeEnum searchScopeType, String searchScopeId, Integer pageNo, Integer pageSize); /** * @description 【小组排名】- 列出我所在的小组的积分排名 diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java index 037779147b..49732c9d88 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java @@ -263,7 +263,7 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl listGroupPointRandingInPercificScope(SearchScopeTypeEnum searchScopeType, String searchScopeId, Integer pageNo, Integer pageSize) { + public List listGroupPointRandingInPercificScope(SearchScopeTypeEnum searchScopeType, String searchScopeId, Integer pageNo, Integer pageSize) { // 1.查询有积分的小组得分排名 PageInfo entityPageInfo = PageHelper.startPage(pageNo, pageSize).doSelectPageInfo(() -> { @@ -324,8 +324,7 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl pageData = new PageData<>(rankingInfoDTOs, entityPageInfo.getTotal()); - return pageData; + return rankingInfoDTOs; } /**