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/activeCard/ActiveCardSv.java | 33 +++++++++++---------------------- 1 files changed, 11 insertions(+), 22 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardSv.java index 3cf24b1..2d55567 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardSv.java @@ -11,7 +11,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; @@ -39,29 +38,12 @@ public QueryResultVo<List<VoActiveCard>> getActiveCards(QueryVo queryVo) { //瀹屽杽鏌ヨ寮�鍗¤褰曠殑璧锋鏃堕棿 - DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - - //LocalDateTime activeTimeStart = queryVo.activeTimeStart; - //LocalDateTime activeTimeStop = queryVo.activeTimeStop; - - //if(activeTimeStart != null) { - // activeTimeStart = LocalDateTime.parse(df.format(activeTimeStart) + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - // queryVo.setActiveTimeStart(activeTimeStart); - //} - - //if(activeTimeStop != null) { - // activeTimeStop = LocalDateTime.parse(df.format(activeTimeStop) + " 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - // queryVo.setActiveTimeStop(activeTimeStop); - //} - String activeTimeStart = queryVo.activeTimeStart; String activeTimeStop = queryVo.activeTimeStop; - if(activeTimeStart != null) { activeTimeStart = activeTimeStart + " 00:00:00"; queryVo.setActiveTimeStart(activeTimeStart); } - if(activeTimeStop != null) { activeTimeStop = activeTimeStop + " 23:59:59"; queryVo.setActiveTimeStop(activeTimeStop); @@ -72,11 +54,18 @@ Long itemTotal = seActiveCardMapper.getRecordCount(params); QueryResultVo<List<VoActiveCard>> 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 = seActiveCardMapper.getActiveCards(params); -- Gitblit v1.8.0