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/pojoIr/IrIrrigateSchedule.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigateSchedule.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigateSchedule.java
index 65b50d0..8047670 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigateSchedule.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigateSchedule.java
@@ -38,8 +38,8 @@
/**
* 鐏屾簤璁″垝ID
*/
- @NotNull(message = "鐏屾簤璁″垝ID涓嶈兘涓虹┖")
- private Long planId;
+ //@NotNull(message = "鐏屾簤璁″垝ID涓嶈兘涓虹┖")
+ //private Long planId;
/**
* 杞亴缁処D
@@ -53,11 +53,13 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
+
+
/**
* 鐏屾簤缁撴潫鏃堕棿
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date stopTime;
+ //@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ //private Date stopTime;
/**
* 鐏屾簤鏃堕暱;鍒嗛挓
@@ -67,7 +69,7 @@
/**
* 鍙栨按鍙D鍒楄〃
*/
- private String intakeIds;
+ //private String intakeIds;
/**
* 褰撳墠鐘舵��;1-姝ｅ父锛�2-鏆傚仠锛�3-缁堟
--
Gitblit v1.8.0