From 6b90436a61338d46282bf724e445e90af80461e1 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 27 十二月 2023 10:34:25 +0800
Subject: [PATCH] 2023-12-27 朱宝民 增加了交易记录查询 使分页具有兼容性

---
 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelSv.java |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelSv.java
index 179dcc9..1c83f8a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelSv.java
@@ -9,7 +9,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Map;
 
@@ -28,15 +27,12 @@
 
     public QueryResultVo<List<VoCancel>> getCancels(QueryVo queryVo) {
         //瀹屽杽鏌ヨ娉ㄩ攢璁板綍鐨勮捣姝㈡椂闂�
-        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-
         String cancelTimeStart = queryVo.cancelTimeStart;
         String cancelTimeStop = queryVo.cancelTimeStop;
         if(cancelTimeStart != null) {
             cancelTimeStart = cancelTimeStart + " 00:00:00";
             queryVo.setCancelTimeStart(cancelTimeStart);
         }
-
         if(cancelTimeStop != null) {
             cancelTimeStop = cancelTimeStop + " 23:59:59";
             queryVo.setCancelTimeStop(cancelTimeStop);
@@ -47,11 +43,18 @@
         Long itemTotal = seCancelMapper.getRecordCount(params);
 
         QueryResultVo<List<VoCancel>> rsVo = new QueryResultVo<>() ;
-        rsVo.pageSize = queryVo.pageSize ;
-        //rsVo.pageCurr = queryVo.pageCurr ;
-        Integer pageCurr = (Integer.parseInt(params.get("pageCurr").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString());
+        Integer pageCurr = 0;
+        Integer pageSize = 10000;
+        rsVo.pageCurr = 1;
+        rsVo.pageSize = 10000;
+        if(queryVo.pageSize != null && queryVo.pageCurr != null) {
+            rsVo.pageSize = queryVo.pageSize ;
+            rsVo.pageCurr = queryVo.pageCurr;
+            pageSize = queryVo.pageSize ;
+            pageCurr = (Integer.parseInt(params.get("pageCurr").toString()) - 1) * Integer.parseInt(params.get("pageSize").toString());
+        }
         params.put("pageCurr", pageCurr);
-        rsVo.pageCurr = pageCurr;
+        params.put("pageSize", pageSize);
 
         rsVo.calculateAndSet(itemTotal, params);
         rsVo.obj = seCancelMapper.getCancels(params);

--
Gitblit v1.8.0