From e88d34fd4cbe3a0cc57ecfdc1710d66bc88e26b5 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 10 六月 2025 14:07:53 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java
index ceaa58f..0f9e27e 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java
@@ -53,6 +53,16 @@
@JSONField(serialize = false)
public Integer queryCount ;
+ public void copyTo(QueryResultVo to){
+ to.pageSize = this.pageSize ;
+ to.itemTotal = this.itemTotal ;
+ to.pageCurr = this.pageCurr ;
+ to.pageTotal = this.pageTotal ;
+ to.obj = this.obj ;
+ to.queryStart = this.queryStart ;
+ to.queryCount = this.queryCount ;
+ }
+
public void calculateAndSet(Long itemTotal, Map<String, Object> params) {
this.itemTotal = itemTotal ;
@@ -61,10 +71,15 @@
}
if(this.itemTotal == 0){
- this.pageSize = 1 ;
+ this.pageSize = 10 ;
}
if(this.pageSize == null || this.pageSize <= 0){
- this.pageSize = 1 ;//渚涗笅闈綔涓洪櫎鏁�
+ /**
+ * 鏈卞疂姘� 2024-01-30 淇敼
+ * 鏈紶鍏ュ垎椤靛弬鏁版椂锛屽彇鍏ㄩ儴璁板綍
+ */
+ //this.pageSize = 1 ;//渚涗笅闈綔涓洪櫎鏁�
+ this.pageSize = 10 ;//渚涗笅闈綔涓洪櫎鏁�
}
pageTotal = (int)Math.ceil((itemTotal==null?0.0D:itemTotal.doubleValue())/pageSize);
@@ -83,8 +98,10 @@
this.queryStart = (this.pageCurr - 1) * this.pageSize ;
this.queryCount = this.pageSize ;
- params.put("start", this.queryStart) ;
- params.put("count", this.queryCount) ;
+ if(params != null){
+ params.put("start", this.queryStart) ;
+ params.put("count", this.queryCount) ;
+ }
}
}
--
Gitblit v1.8.0