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/VoCommand.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoCommand.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoCommand.java
index 73f38e6..0ac5f2c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoCommand.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoCommand.java
@@ -19,9 +19,9 @@
     private static final long serialVersionUID = 1L;
 
     @JSONField(serializeUsing= ObjectWriterImplToString.class)
-    private Long id;
+    private Long comId;
 
-    private String commandName;
+    private String commandName; //鍛戒护鍚嶇О
 
     private String intakeName;
 
@@ -35,7 +35,9 @@
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date resultTime;
 
-    private String result;
+    private String state;//鎵ц鐘舵��
 
-    private String userName;
+    private String result;//鍛戒护缁撴灉
+
+    private String userName;//鎿嶄綔浜�
 }

--
Gitblit v1.8.0