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/VoIntakeVc.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoIntakeVc.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoIntakeVc.java
index 51a78be..a7abce6 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoIntakeVc.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voRm/VoIntakeVc.java
@@ -7,21 +7,26 @@
* @author ZhuBaoMin
* @date 2025-04-07 21:08
* @LastEditTime 2025-04-07 21:08
- * @Description 鍙栨按鍙ｃ�佽櫄鎷熷崱瑙嗗浘瀵硅薄锛岀粓姝㈢亴婧夎鍒掓椂浣跨敤锛岀敤鏉ユ墽琛岃繙绋嬪叧闃�
+ * @Description 寮�闃�淇℃伅瑙嗗浘瀵硅薄锛岀粓姝㈢亴婧夎鍒掓椂浣跨敤锛岀敤鏉ユ墽琛岃繙绋嬪叧闃�
*/
@Data
-@JsonPropertyOrder({"intakeId", "vcId"})
+@JsonPropertyOrder({"rtuAddr", "vcNum", "orderNo"})
public class VoIntakeVc {
public static final long serialVersionUID = 202411281712001L;
/**
- * 鍙栨按鍙D
+ * 闃�鎺у櫒鍦板潃
*/
- private Long intakeId;
+ private String rtuAddr;
/**
- * 铏氭嫙鍗D
+ * 铏氭嫙鍗＄紪鍙�
*/
- private Long vcId;
+ private String vcNum;
+
+ /**
+ * 璁㈠崟鍙�
+ */
+ private String orderNo;
}
--
Gitblit v1.8.0