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/voIr/VoPlanDetails.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoPlanDetails.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoPlanDetails.java
index 0a5b7d1..ed2fd95 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoPlanDetails.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voIr/VoPlanDetails.java
@@ -1,5 +1,6 @@
package com.dy.pipIrrGlobal.voIr;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import lombok.Data;
@@ -14,7 +15,7 @@
*/
@Data
-@JsonPropertyOrder({"planName", "projectName", "planStartTime", "planStopTime", "groups"})
+@JsonPropertyOrder({"planName", "projectName", "state", "planStartTime", "planStopTime", "realStopTime", "failureCount", "groups"})
public class VoPlanDetails {
private static final long serialVersionUID = 202504091125001L;
@@ -29,17 +30,36 @@
private String projectName;
/**
+ * 鐏屾簤璁″垝鐘舵��
+ */
+ private Integer state;
+
+ /**
* 鐏屾簤璁″垝寮�濮嬫椂闂�
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date planStartTime;
/**
* 鐏屾簤璁″垝缁撴潫鏃堕棿
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date planStopTime;
+
+ /**
+ * 瀹為檯缁撴潫鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ private Date realStopTime;
+
+ /**
+ * 鍛戒护鍙戝竷澶辫触鏁伴噺
+ */
+ private Integer failureCount;
/**
* 杞亴缁勫垪琛�
*/
private List<VoGroupResult> groups;
+
}
--
Gitblit v1.8.0