分页结果增加pageIndex和pageSize

hsweb-commons/hsweb-commons-entity/src/main/java/org/hswebframework/web/commons/entity/PagerResult.java

@@ -21,51 +21,53 @@ package org.hswebframework.web.commons.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import org.hswebframework.web.commons.entity.param.QueryParamEntity;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @ApiModel(description = "分页结果")
+@Getter
+@Setter
 public class PagerResult<E> implements Entity {
     private static final long serialVersionUID = -6171751136953308027L;
 
-    public static <E> PagerResult<E> empty(){
+    public static <E> PagerResult<E> empty() {
         return new PagerResult<>(0, new ArrayList<>());
     }
 
-    public static <E> PagerResult<E> of(int total,List<E> list){
-        return new PagerResult<>(total,list);
+    public static <E> PagerResult<E> of(int total, List<E> list) {
+        return new PagerResult<>(total, list);
     }
-    private int total;
-
-    private List<E> data;
 
-    public PagerResult() {
+    public static <E> PagerResult<E> of(int total, List<E> list, QueryParamEntity entity) {
+        PagerResult pagerResult = new PagerResult<>(total, list);
+        pagerResult.setPageIndex(entity.getThinkPageIndex());
+        pagerResult.setPageSize(entity.getPageSize());
+        return pagerResult;
     }
 
-    public PagerResult(int total, List<E> data) {
-        this.total = total;
-        this.data = data;
-    }
 
-    @ApiModelProperty("数据总数量")
-    public int getTotal() {
-        return total;
-    }
+    @ApiModelProperty("当前页码")
+    private int pageIndex;
 
-    public PagerResult<E> setTotal(int total) {
-        this.total = total;
-        return this;
-    }
+    @ApiModelProperty("每页数据数量")
+    private int pageSize;
+
+    @ApiModelProperty("数据总数量")
+    private int total;
 
     @ApiModelProperty("查询结果")
-    public List<E> getData() {
-        return data;
+    private List<E> data;
+
+    public PagerResult() {
     }
 
-    public PagerResult<E> setData(List<E> data) {
+    public PagerResult(int total, List<E> data) {
+        this.total = total;
         this.data = data;
-        return this;
     }
 
 }

hsweb-system/hsweb-system-dynamic-form/hsweb-system-dynamic-form-local/src/main/java/org/hswebframework/web/service/form/simple/SimpleDynamicFormOperationService.java

@@ -82,7 +82,7 @@ public class SimpleDynamicFormOperationService implements DynamicFormOperationSe
         }
         paramEntity.rePaging(total);
         List<T> list = query.setParam(paramEntity).list(paramEntity.getPageIndex(), paramEntity.getPageSize());
-        return PagerResult.of(total, list);
+        return PagerResult.of(total, list, paramEntity);
     }
 
     @Override

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/util/QueryUtils.java

@@ -55,7 +55,7 @@ public class QueryUtils {
                 .map(mapping)
                 .filter(Objects::nonNull)
                 .collect(Collectors.toList());
-        return PagerResult.of(total, list);
+        return PagerResult.of(total, list, entity);
     }
 
     public static <U, T extends Query<?, U>> void applyQueryParam(T query, QueryParamEntity entity, BiConsumer<Term, T> notFound) {