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/intake/qo/IntakeAmountQO.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/IntakeAmountQO.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/IntakeAmountQO.java
index eea4659..da40a5a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/IntakeAmountQO.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/IntakeAmountQO.java
@@ -2,6 +2,7 @@
 
 import com.dy.common.webUtil.QueryConditionVo;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * @author ZhuBaoMin
@@ -11,9 +12,15 @@
  */
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class IntakeAmountQO extends QueryConditionVo {
 
     /**
+     * 缁熻骞存湀
+     */
+    private String yearMonth;
+
+    /**
      * 骞�
      */
     private Integer year;

--
Gitblit v1.8.0