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-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/qo/QoCommand.java |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 56 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/qo/QoCommand.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/qo/QoCommand.java
new file mode 100644
index 0000000..5d6381d
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/qo/QoCommand.java
@@ -0,0 +1,56 @@
+package com.dy.pipIrrRemote.common.qo;
+
+import com.dy.common.webUtil.QueryConditionVo;
+import lombok.*;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-07-03 9:25
+ * @LastEditTime 2024-07-03 9:25
+ * @Description 鍛戒护鏃ュ織鍘嗗彶璁板綍鏌ヨ瑙嗗浘
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ToString(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class QoCommand extends QueryConditionVo {
+
+    /**
+     * 鍙栨按鍙D
+     */
+    private Long intakeId;
+
+    /**
+     * 鍛戒护鍚嶇О
+     */
+    private String commandName;
+
+    /**
+     * 鍛戒护缁撴灉锛�0-澶辫触锛�1-鎴愬姛
+     */
+    private Integer result;
+
+    /**
+     * 鏌ヨ璧峰鏃堕棿
+     */
+    private String timeStart;
+
+    /**
+     * 鏌ヨ缁撴潫鏃堕棿
+     */
+    private String timeStop;
+
+
+    public void completionTime(){
+        if(timeStart != null && !timeStart.trim().equals("")) {
+            timeStart = timeStart + " 00:00:00";
+        }
+        if(timeStop != null && !timeStop.trim().equals("")) {
+            timeStop = timeStop + " 23:59:59";
+        }
+
+    }
+}

--
Gitblit v1.8.0