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-app/src/main/java/com/dy/pipIrrApp/workOrder/qo/QoWorkOrder.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/qo/QoWorkOrder.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/qo/QoWorkOrder.java
index fb636a3..592eed1 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/qo/QoWorkOrder.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/qo/QoWorkOrder.java
@@ -2,6 +2,7 @@
import com.dy.common.webUtil.QueryConditionVo;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* @author ZhuBaoMin
@@ -11,6 +12,7 @@
*/
@Data
+@EqualsAndHashCode(callSuper=false)
public class QoWorkOrder extends QueryConditionVo {
/**
* 娲惧崟浜哄鍚�
@@ -18,11 +20,26 @@
private String dispatcher;
/**
+ * 娲惧崟浜篒D
+ */
+ private Long dispatcherId;
+
+ /**
* 宸℃鍛樺鍚�
*/
private String inspector;
/**
+ * 宸℃鍛業D
+ */
+ private Long inspectorId;
+
+ /**
+ * 鐘舵�侊細1-鏈畬鎴愶紝2-宸插畬鎴�
+ */
+ private Integer state;
+
+ /**
* 鏌ヨ寮�濮嬫椂闂�
*/
private String timeStart;
--
Gitblit v1.8.0