导出居民信息 获取数据提出2

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;
+
 }
 

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("");