Browse Source

分页处理

lvxianyun 3 năm trước cách đây
mục cha
commit
d4faf71ae9

+ 1 - 1
src/main/java/com/persagy/proxy/adm/request/AdmResponse.java

@@ -54,7 +54,7 @@ public class AdmResponse {
     public static AdmResponse success(List<?> content, AdmQueryCriteria request) {
         int pagesize = 50;
         if(request!= null && request.getPageNumber() != null && request.getPageNumber() > 0)
-            pagesize = request.getPageSize();
+            pagesize = request.getPageNumber();
         int pageNum = 1;
         if(request!= null && request.getPageSize() != null && request.getPageSize() > 0){
             pageNum = request.getPageSize();

+ 3 - 1
src/main/java/com/persagy/proxy/report/controller/AdmReportEquipController.java

@@ -122,7 +122,9 @@ public class AdmReportEquipController {
         }else{
             equipmentList = new ArrayList<>();
         }
-        return AdmResponse.success(equipmentList, request);
+        AdmResponse response = AdmResponse.success(equipmentList, request);
+        response.setTotal(admResponse.getTotal());
+        return response;
     }
 
     /**

+ 1 - 0
src/main/java/com/persagy/proxy/report/controller/AdmSpaceInfoController.java

@@ -173,6 +173,7 @@ public class AdmSpaceInfoController {
 			AdmResponse admResponse = AdmResponse.success(iSpaceList,request);
 			admResponse.setFloorId(request.getFloorId());
 			admResponse.setZoneType(objectType);
+			admResponse.setTotal(responseIspace.getTotal());
 			return admResponse;
 		}else{
 			responseIspace.setFloorId(request.getFloorId());