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/loss/LossSv.java | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossSv.java
index ea00e34..df6dc20 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossSv.java
@@ -2,13 +2,13 @@
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoSe.SeLossMapper;
-import com.dy.pipIrrGlobal.pojoSe.VoLoss;
+import com.dy.pipIrrGlobal.pojoSe.SeLoss;
+import com.dy.pipIrrGlobal.voSe.VoLoss;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;
@@ -30,15 +30,27 @@
//瀹屽杽鏌ヨ鎸傚け璁板綍鐨勮捣姝㈡椂闂�
DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- LocalDateTime lossTimeStart = queryVo.lossTimeStart;
- LocalDateTime lossTimeStop = queryVo.lossTimeStop;
+ //LocalDateTime lossTimeStart = queryVo.lossTimeStart;
+ //LocalDateTime lossTimeStop = queryVo.lossTimeStop;
+ //if(lossTimeStart != null) {
+ // lossTimeStart = LocalDateTime.parse(df.format(lossTimeStart) + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ // queryVo.setLossTimeStart(lossTimeStart);
+ //}
+ //
+ //if(lossTimeStop != null) {
+ // lossTimeStop = LocalDateTime.parse(df.format(lossTimeStop) + " 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ // queryVo.setLossTimeStop(lossTimeStop);
+ //}
+
+ String lossTimeStart = queryVo.lossTimeStart;
+ String lossTimeStop = queryVo.lossTimeStop;
if(lossTimeStart != null) {
- lossTimeStart = LocalDateTime.parse(df.format(lossTimeStart) + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ lossTimeStart = lossTimeStart + " 00:00:00";
queryVo.setLossTimeStart(lossTimeStart);
}
if(lossTimeStop != null) {
- lossTimeStop = LocalDateTime.parse(df.format(lossTimeStop) + " 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ lossTimeStop = lossTimeStop + " 23:59:59";
queryVo.setLossTimeStop(lossTimeStop);
}
@@ -47,10 +59,32 @@
Long itemTotal = seLossMapper.getRecordCount(params);
QueryResultVo<List<VoLoss>> rsVo = new QueryResultVo<>() ;
- rsVo.pageSize = queryVo.pageSize ;
- rsVo.pageCurr = queryVo.pageCurr ;
+ 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);
+ params.put("pageSize", pageSize);
+
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = seLossMapper.getLosses(params);
return rsVo ;
}
+
+ /**
+ * 娣诲姞鎸傚け璁板綍
+ * @param po
+ * @return
+ */
+ public Long add(SeLoss po) {
+ seLossMapper.insert(po);
+ return po.getId();
+ }
+
}
--
Gitblit v1.8.0