From ebee7ab4560e07f1b316f49bb78a29eb4de8aef4 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 16 Aug 2022 15:04:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=B1=85=E6=B0=91=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=20=20=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE=E6=8F=90?=
 =?UTF-8?q?=E5=87=BA2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/form/ExportResiUserFormDTO.java | 6 ++++++
 .../java/com/epmet/controller/IcResiUserController.java     | 5 ++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ExportResiUserFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ExportResiUserFormDTO.java
index 843ecd19d2..cb6f89eb76 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ExportResiUserFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ExportResiUserFormDTO.java
@@ -31,5 +31,11 @@ public class ExportResiUserFormDTO implements Serializable {
      */
     private IcExportTemplateSaveFormDTO exportConfig;
 
+    /**
+     * pageNo 报表用的
+     */
+    private Integer pageNo = 1;
+    private Integer pageSize = 1000;
+
 }
 
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
index d87eecde2c..10006a97b0 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
@@ -556,7 +556,6 @@ public class IcResiUserController implements ResultDataResolver {
     @NoRepeatSubmit
     @RequestMapping(value = "/exportExcelCustomData")
     public Map<String, Object> exportExcelCustomData(@LoginUser TokenDto tokenDto, @RequestParam("templateId") String templateId,
-                                                     @RequestParam("pageNo") Integer pageNo,@RequestParam("pageSize") Integer pageSize,
                                                      @RequestBody ExportResiUserFormDTO pageFormDTO) throws Exception {
         log.warn("templateId=【"+templateId+"】");
         log.warn("pageFormDTO入参【"+JSON.toJSONString(pageFormDTO)+"】");
@@ -566,8 +565,8 @@ public class IcResiUserController implements ResultDataResolver {
             searchForm.setFormCode("resi_base_info");
             searchForm.setCustomerId(tokenDto.getCustomerId());
             searchForm.setStaffId(tokenDto.getUserId());
-            searchForm.setPageNo(pageNo);
-            searchForm.setPageSize(pageSize);
+            searchForm.setPageNo(pageFormDTO.getPageNo());
+            searchForm.setPageSize(pageFormDTO.getPageSize());
             List<ResiUserQueryValueDTO> conditions=new ArrayList<>();
             // ResiUserQueryValueDTO temp=new ResiUserQueryValueDTO();
             // temp.setColumnName("");