diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java index 4e77d73bff..98c4885046 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java @@ -1,9 +1,11 @@ package com.epmet.dataaggre.controller; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListFormDTO; import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO; import com.epmet.dataaggre.service.CoverageService; +import com.github.pagehelper.PageInfo; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -28,7 +30,7 @@ public class CoverageController { * @return */ @RequestMapping("dataList") - public Result> dataList(@RequestBody CoverageAnalisisDataListFormDTO input) { + public Result> dataList(@RequestBody CoverageAnalisisDataListFormDTO input) { List coverageTypes = input.getCoverageTypes(); List categoryKeys = input.getCategoryKeys(); if (CollectionUtils.isEmpty(coverageTypes)) { @@ -37,7 +39,8 @@ public class CoverageController { List l = coverageService.analysisDataList(coverageTypes, categoryKeys, input.getSearch(), input.getPageNo(), input.getPageSize(), input.getIsPage()); - return new Result>().ok(l); + PageInfo pageInfo = new PageInfo<>(l); + return new Result>().ok(new PageData<>(l, pageInfo.getTotal())); } }