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-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoOpenCloseValve.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoOpenCloseValve.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoOpenCloseValve.java
index b846f7e..1395032 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoOpenCloseValve.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoOpenCloseValve.java
@@ -40,6 +40,11 @@
     private String clientName;
 
     /**
+     * 鍐滄埛濮撳悕
+     */
+    private String clientAddr;
+
+    /**
      * 寮�闃�IC鍗$紪鍙�
      */
     private String openIcNum;
@@ -58,7 +63,7 @@
     /**
      * 寮�闃�绫诲瀷
      */
-    private Byte openType_;
+    private Byte opType;
     private String openType;
 
     /**
@@ -108,7 +113,7 @@
     /**
      * 鍏抽榾绫诲瀷
      */
-    private Byte closeType_;
+    private Byte clType;
     private String closeType;
 
     /**

--
Gitblit v1.8.0