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/reversal/ReversalSv.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalSv.java index 42d00be..bf4b96d 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalSv.java @@ -9,7 +9,6 @@ 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; @@ -31,15 +30,15 @@ //瀹屽杽鏌ヨ娉ㄩ攢璁板綍鐨勮捣姝㈡椂闂� DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - LocalDateTime reversalTimeStart = queryVo.reversalTimeStart; - LocalDateTime reversalTimeStop = queryVo.reversalTimeStop; + String reversalTimeStart = queryVo.reversalTimeStart; + String reversalTimeStop = queryVo.reversalTimeStop; if(reversalTimeStart != null) { - reversalTimeStart = LocalDateTime.parse(df.format(reversalTimeStart) + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + reversalTimeStart = reversalTimeStart + " 00:00:00"; queryVo.setReversalTimeStart (reversalTimeStart); } if(reversalTimeStop != null) { - reversalTimeStop = LocalDateTime.parse(df.format(reversalTimeStop) + " 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + reversalTimeStop = reversalTimeStop + " 23:59:59"; queryVo.setReversalTimeStop(reversalTimeStop); } @@ -50,6 +49,7 @@ QueryResultVo<List<VoReversal>> rsVo = new QueryResultVo<>() ; rsVo.pageSize = queryVo.pageSize ; rsVo.pageCurr = queryVo.pageCurr ; + rsVo.calculateAndSet(itemTotal, params); rsVo.obj = seReversalMapper.getReversals(params); return rsVo ; -- Gitblit v1.8.0