From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 14:22:59 +0800
Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划，是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StChargeByClient.java | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StChargeByClient.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StChargeByClient.java
index 6d32ddc..841eae2 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StChargeByClient.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/statistics/StChargeByClient.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,39 @@
* @Date: 2024/12/23 14:55
* @Description
*/
+
+@Slf4j
@Component
public class StChargeByClient {
-
- private static Logger log = LogManager.getLogger(StChargeByClient.class.getName()) ;
@Autowired
protected StChargeByClientSv 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 +49,16 @@
/**
* 鏈堢粺璁�---鍐滄埛鍏呭��
*/
+ private void statisticsDay(){
+ sv.statisticsDay(statisticsYear, statisticsMonth, statisticsDay, statisticsStartId, statisticsEndId);
+ }
+
+
+ /**
+ * 鏈堢粺璁�---鍐滄埛鍏呭��
+ */
private void statisticsMonth(){
- sv.statisticsMonth(statisticsYear, statisticsMonth, statisticsStartId, statisticsEndId);
+ sv.statisticsMonth(statisticsYear, statisticsMonth);
}
/**
@@ -50,3 +68,4 @@
sv.statisticsYear(statisticsYear);
}
}
+
--
Gitblit v1.8.0