From 43a19a4424f67c379934ed0d70e0d1b3512cd769 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 27 三月 2025 09:31:44 +0800
Subject: [PATCH] 灌溉计划表中增加项目ID字段，计划列表返回值中增加项目名称，项目状态改为整数表示
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StChargeByIc.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StChargeByIc.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StChargeByIc.java
index bf30e7f..11d20f3 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StChargeByIc.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StChargeByIc.java
@@ -1,7 +1,6 @@
package com.dy.pipIrrStatistics.statistics;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -10,28 +9,38 @@
* @Date: 2024/12/23 14:53
* @Description
*/
+@Slf4j
@Component
public class StChargeByIc {
-
- private static Logger log = LogManager.getLogger(StChargeByIc.class.getName()) ;
@Autowired
protected StChargeByIcSv sv ;
private Integer statisticsYear;
private Integer statisticsMonth;
+ private Integer statisticsDay;
private Long statisticsStartId ;
private Long statisticsEndId ;
- protected void statistics(Integer statisticsYear,
- Integer statisticsMonth,
- Long statisticsStartId,
- Long statisticsEndId){
+ protected void statistics4Day(Integer statisticsYear,
+ Integer statisticsMonth,
+ Integer statisticsDay,
+ Long statisticsStartId,
+ Long statisticsEndId){
this.statisticsYear = statisticsYear ;
this.statisticsMonth = statisticsMonth ;
+ this.statisticsDay = statisticsDay ;
this.statisticsStartId = statisticsStartId ;
this.statisticsEndId = statisticsEndId ;
+ this.statisticsDay() ;
+ }
+
+
+ protected void statistics4MonthAndYear(Integer statisticsYear,
+ Integer statisticsMonth){
+ this.statisticsYear = statisticsYear ;
+ this.statisticsMonth = statisticsMonth ;
this.statisticsMonth() ;
this.statisticsYear() ;
}
@@ -39,8 +48,16 @@
/**
* 鏈堢粺璁�---IC鍗″厖鍊�
*/
+ private void statisticsDay(){
+ sv.statisticsDay(statisticsYear, statisticsMonth, statisticsDay, statisticsStartId, statisticsEndId);
+ }
+
+
+ /**
+ * 鏈堢粺璁�---IC鍗″厖鍊�
+ */
private void statisticsMonth(){
- sv.statisticsMonth(statisticsYear, statisticsMonth, statisticsStartId, statisticsEndId);
+ sv.statisticsMonth(statisticsYear, statisticsMonth);
}
/**
--
Gitblit v1.8.0