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/voSt/VoIntakeOpenCount.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeOpenCount.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeOpenCount.java
index 421b9b2..a93cfe3 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeOpenCount.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeOpenCount.java
@@ -1,16 +1,22 @@
package com.dy.pipIrrGlobal.voSt;
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* @author :WuZeYu
* @Date :2024/8/5 10:45
* @LastEditTime :2024/8/5 10:45
- * @Description 鍙栨按鍙ｅ紑闃� 鎸囧畾鍊� 娆℃暟
+ * @Description 鍙栨按鍙ｅ紑闃� > 鎸囧畾鍊� 锛堟鏁�)
+ * 鐢ㄦ按鏃堕暱 > 鎸囧畾鍊� (鍒嗛挓)
*/
@Data
+@JsonPropertyOrder({ "intakeId", "intakeNum", "blockName", "lng", "lat"
+ ,"recordCount"
+})
+@EqualsAndHashCode(callSuper=false)
public class VoIntakeOpenCount extends VoIntake{
private static final long serialVersionUID = 202408051046001L;
--
Gitblit v1.8.0