From bebea951bb2aa3f1101da97387c21f03650aa332 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 23 十二月 2024 15:27:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeAmountSv.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeAmountSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeAmountSv.java
index 47c63cf..a23eb3d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeAmountSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeAmountSv.java
@@ -235,8 +235,8 @@
List<StIntakeAmountYear> list ;
for(int year = DealStartYear; year <= nowYear; year ++){
list = null ;
- startDt = DateTime.dateFrom_MM_dd(year + "-01-01") ;
- endDt = DateTime.dateFrom_MM_dd(year + "-12-31") ;
+ startDt = DateTime.dateFrom_yyyy_MM_dd(year + "-01-01") ;
+ endDt = DateTime.dateFrom_yyyy_MM_dd(year + "-12-31") ;
list = dao.statisticAllIntakeAmountYearFromAmountDay(startDt, endDt) ;
this.doStatisticsIntakeAmountYear(year, list) ;
}
--
Gitblit v1.8.0