From cb46d99ac8c302334e8c39600de0d9a4ffbf5533 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 29 十月 2024 09:39:48 +0800
Subject: [PATCH] 1、删除global模块中Contant中的一些无用代码； 2、删除global模块中一些无用的备份； 3、一些有继承关系并注解有@Data的类中增加注解@EqualsAndHashCode(callSuper=false)，防止编译时警告
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossSv.java | 21 +--------------------
1 files changed, 1 insertions(+), 20 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 56daf31..edd844a 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
@@ -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;
@@ -27,21 +26,6 @@
private SeLossMapper seLossMapper;
public QueryResultVo<List<VoLoss>> getLosses(QueryVo queryVo) {
- //瀹屽杽鏌ヨ鎸傚け璁板綍鐨勮捣姝㈡椂闂�
- DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-
- //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) {
@@ -60,10 +44,7 @@
QueryResultVo<List<VoLoss>> 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());
- params.put("pageCurr", pageCurr);
- rsVo.pageCurr = pageCurr;
+ rsVo.pageCurr = queryVo.pageCurr ;
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = seLossMapper.getLosses(params);
--
Gitblit v1.8.0