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/voPr/VoAllIntake.java | 98 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 98 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoAllIntake.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoAllIntake.java
new file mode 100644
index 0000000..311d47f
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoAllIntake.java
@@ -0,0 +1,98 @@
+package com.dy.pipIrrGlobal.voPr;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author :WuZeYu
+ * @Date :2024/12/16 9:58
+ * @LastEditTime :2024/12/16 9:58
+ * @Description
+ */
+@Data
+@JsonPropertyOrder({ "id", "countyId", "townId", "villageId", "divideId", "blockId", "name", "lng", "lat", "remarks", "operator", "operateDt", "blockName", "address"})
+public class VoAllIntake implements BaseEntity {
+ private static final long serialVersionUID = 202412161003001L;
+
+ /**
+ * 涓婚敭
+ */
+ @JSONField(serializeUsing = ObjectWriterImplToString.class)
+ private Long id;
+
+ /**
+ * 鎵�鍦ㄥ幙
+ */
+ @JSONField(serializeUsing = ObjectWriterImplToString.class)
+ private Long countyId;
+
+ /**
+ * 鎵�鍦ㄩ晣
+ */
+ @JSONField(serializeUsing = ObjectWriterImplToString.class)
+ private Long townId;
+
+ /**
+ * 鎵�鍦ㄦ潙
+ */
+ @JSONField(serializeUsing = ObjectWriterImplToString.class)
+ private Long villageId;
+
+ /**
+ * 鎵�鍦ㄥ垎姘村彛
+ */
+ @JSONField(serializeUsing = ObjectWriterImplToString.class)
+ private Long divideId;
+
+ /**
+ * 鎵�鍦ㄧ墖鍖�
+ */
+ @JSONField(serializeUsing = ObjectWriterImplToString.class)
+ private Long blockId;
+
+ /**
+ * 鍙栨按鍙ｅ悕绉�
+ */
+ private String name;
+
+ /**
+ * 缁忓害
+ */
+ private Double lng;
+
+ /**
+ * 绾害
+ */
+ private Double lat;
+
+ /**
+ * 澶囨敞淇℃伅
+ */
+ private String remarks;
+
+ /**
+ * 鎿嶄綔浜篒D
+ */
+ @JSONField(serializeUsing = ObjectWriterImplToString.class)
+ private Long operator;
+
+ /**
+ * 鎿嶄綔鏃堕棿
+ */
+ private Date operateDt;
+
+ /**
+ * 鐗囧尯鍚嶇О
+ */
+ private String blockName;
+
+ /**
+ * 鍦板潃
+ */
+ private String address;
+}
--
Gitblit v1.8.0