pageData增加pages, listresi和houselist接口返回。用于报表联调

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/page/PageData.java

@@ -29,6 +29,7 @@ public class PageData<T> implements Serializable {
 
     private List<T> list;
 
+    private int pages;
     /**
      * 分页
      * @param list   列表数据
@@ -38,4 +39,10 @@ public class PageData<T> implements Serializable {
         this.list = list;
         this.total = (int)total;
     }
+
+    public PageData(List<T> list, long total,int pageSize) {
+        this.list = list;
+        this.total = (int)total;
+        this.pages = (int) Math.ceil((double)total / pageSize);
+    }
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@@ -385,7 +385,9 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
             item.setPurpose(HousePurposeEnums.getTypeValue(item.getPurposeKey()));
         });
 
-
+        if (formDTO.getIsPage()) {
+            return new PageData<>(records == null ? new ArrayList<>() : records, pageInfo.getTotal(), formDTO.getPageSize());
+        }
         return new PageData<>(records == null ? new ArrayList<>() : records, pageInfo.getTotal());
     }
 

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -960,6 +960,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             }
         }
         pageInfo.setList(list);
+        if (formDTO.getIsPage()) {
+            return new PageData<>(pageInfo.getList(), pageInfo.getTotal(), formDTO.getPageSize());
+        }
         return new PageData<>(pageInfo.getList(), pageInfo.getTotal());
     }