From 59979105fddeaf2e4464684620843d1b5fb565c7 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 16 十二月 2024 17:20:18 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-temp/src/main/java/com/dy/pipIrrTemp/changeSome/ChSomeIntakeAmountSv.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 d9c1c36..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
@@ -184,14 +184,14 @@
if(year < nowYear){
for(int month = 1 ; month <= 12 ; month ++){
startDt = DateTime.dateFrom_yyyy_MM_dd(year + "-" + month + "-01") ;
- endDt = DateTime.dateFrom_yyyy_MM_dd(year + "-" + month + endDayOfMonth(year, month)) ;
+ endDt = DateTime.dateFrom_yyyy_MM_dd(year + "-" + month + "-" + endDayOfMonth(year, month)) ;
list = dao.statisticAllIntakeAmountMonthFromAmountDay(startDt, endDt) ;
this.doStatisticsIntakeAmountMonth(year, month, list) ;
}
}else{
for(int month = 1 ; month <= nowMonth ; month ++){
startDt = DateTime.dateFrom_yyyy_MM_dd(year + "-" + month + "-01") ;
- endDt = DateTime.dateFrom_yyyy_MM_dd(year + "-" + month + endDayOfMonth(year, month)) ;
+ endDt = DateTime.dateFrom_yyyy_MM_dd(year + "-" + month + "-" + endDayOfMonth(year, month)) ;
list = dao.statisticAllIntakeAmountMonthFromAmountDay(startDt, endDt) ;
this.doStatisticsIntakeAmountMonth(year, month, list) ;
}
@@ -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