From cef8191af03fe0b811b08d88e3d05a80835944a2 Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang>
Date: Tue, 21 Jun 2022 15:57:16 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=905=E5=A4=A7=E5=9B=BE=E5=B1=82=E3=80=91?=
 =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96-=E6=95=B0=E6=8D=AE=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E5=BF=98=E4=BA=86=E5=8A=A0pageData=E5=B1=82?=
 =?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dataaggre/controller/CoverageController.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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<List<CoverageAnalisisDataListResultDTO>> dataList(@RequestBody CoverageAnalisisDataListFormDTO input) {
+    public Result<PageData<CoverageAnalisisDataListResultDTO>> dataList(@RequestBody CoverageAnalisisDataListFormDTO input) {
         List<String> coverageTypes = input.getCoverageTypes();
         List<String> categoryKeys = input.getCategoryKeys();
         if (CollectionUtils.isEmpty(coverageTypes)) {
@@ -37,7 +39,8 @@ public class CoverageController {
 
         List<CoverageAnalisisDataListResultDTO> l = coverageService.analysisDataList(coverageTypes, categoryKeys,
                 input.getSearch(), input.getPageNo(), input.getPageSize(), input.getIsPage());
-        return new Result<List<CoverageAnalisisDataListResultDTO>>().ok(l);
+        PageInfo<CoverageAnalisisDataListResultDTO> pageInfo = new PageInfo<>(l);
+        return new Result<PageData<CoverageAnalisisDataListResultDTO>>().ok(new PageData<>(l, pageInfo.getTotal()));
     }
 
 }