From 86719a90118b4b458ae593b53457f23c11ee8d44 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 25 七月 2024 15:27:52 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntake.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/listeners/StIntake.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntake.java
similarity index 66%
rename from pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/listeners/StIntake.java
rename to pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntake.java
index 1544c52..2d644bd 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/listeners/StIntake.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StIntake.java
@@ -1,4 +1,4 @@
-package com.dy.pipIrrStatistics.listeners;
+package com.dy.pipIrrStatistics.statistics;
import com.dy.pipIrrGlobal.daoRm.RmIntakeAmountDayMapper;
import org.apache.logging.log4j.LogManager;
@@ -17,16 +17,19 @@
private static Logger log = LogManager.getLogger(StIntake.class.getName()) ;
@Autowired
- protected RmIntakeAmountDayMapper rmIntakeAmountDayDao ;
+ protected StIntakeSv sv ;
- private String statisticsYyyy_mm;
+ private Integer statisticsYear;
+ private Integer statisticsMonth;
private Long statisticsStartId ;
private Long statisticsEndId ;
- protected void statistics(String statisticsYyyy_mm,
+ protected void statistics(Integer statisticsYear,
+ Integer statisticsMonth,
Long statisticsStartId,
Long statisticsEndId){
- this.statisticsYyyy_mm = statisticsYyyy_mm ;
+ this.statisticsYear = statisticsYear ;
+ this.statisticsMonth = statisticsMonth ;
this.statisticsStartId = statisticsStartId ;
this.statisticsEndId = statisticsEndId ;
this.statisticsMonth() ;
@@ -37,14 +40,13 @@
* 鏈堢粺璁�---鍙栨按鍙�
*/
private void statisticsMonth(){
- log.info(statisticsYyyy_mm + " " + statisticsStartId + " " + statisticsEndId);
- log.info(rmIntakeAmountDayDao.toString());
+ sv.statisticsMonth(statisticsYear, statisticsMonth, statisticsStartId, statisticsEndId);
}
/**
* 骞寸粺璁�---鍙栨按鍙�
*/
private void statisticsYear(){
-
+ sv.statisticsYear(statisticsYear);
}
}
--
Gitblit v1.8.0