From f77e9a7cfbe775523551df5faab3c70a5a9c190c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 03 三月 2025 14:22:35 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigatePlan.java | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigatePlan.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigatePlan.java
index f0c2679..90c7951 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigatePlan.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoIr/IrIrrigatePlan.java
@@ -30,54 +30,59 @@
public static final long serialVersionUID = 202502201543001L;
/**
- * 涓婚敭
- */
+ * 涓婚敭
+ */
@JSONField(serializeUsing= ObjectWriterImplToString.class)
@TableId(type = IdType.INPUT)
private Long id;
/**
- * 椤圭洰ID
- */
+ * 椤圭洰ID
+ */
private Long projectId;
/**
- * 璁″垝鍚嶇О
- */
+ * 璁″垝鍚嶇О
+ */
@NotBlank(message = "璁″垝鍚嶇О涓嶈兘涓虹┖")
private String planName;
/**
- * 璁″垝鍚姩妯″紡;1-鎵嬪姩鍚姩锛�2-鑷姩鍚姩
- */
+ * 璁″垝鍚姩妯″紡;1-鎵嬪姩鍚姩锛�2-鑷姩鍚姩
+ */
@NotNull(message = "璁″垝鍚姩妯″紡涓嶈兘涓虹┖")
private Byte startupMode;
/**
- * 鐏屾簤寮�濮嬫椂闂�;绮剧‘鍒板垎
- */
+ * 鐏屾簤寮�濮嬫椂闂�;绮剧‘鍒板垎
+ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date planStartTime;
/**
- * 鐏屾簤缁撴潫鏃堕棿;绮剧‘鍒板垎
- */
+ * 鐏屾簤缁撴潫鏃堕棿;绮剧‘鍒板垎
+ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date planStopTime;
/**
- * 璁″垝鐘舵��;1-鑽夌锛�2-宸插彂甯�
- */
+ * 鐏屾簤鏃堕暱;鍒嗛挓
+ */
+ private Integer duration;
+
+ /**
+ * 璁″垝鐘舵��;1-鑽夌锛�2-宸插彂甯�
+ */
private Byte planState;
/**
- * 鎵ц鐘舵��;1-鏈墽琛岋紝2-鎵ц涓紝3-宸叉殏鍋滐紝4-宸茬粓姝紝5-宸插畬鎴�
- */
+ * 鎵ц鐘舵��;1-鏈墽琛岋紝2-鎵ц涓紝3-宸叉殏鍋滐紝4-宸茬粓姝紝5-宸插畬鎴�
+ */
private Byte executingState;
/**
- * 閫昏緫鍒犻櫎鏍囪瘑;鏈垹闄や负0锛屽凡鍒犻櫎涓哄垹闄ゆ椂闂�
- */
+ * 閫昏緫鍒犻櫎鏍囪瘑;鏈垹闄や负0锛屽凡鍒犻櫎涓哄垹闄ゆ椂闂�
+ */
private Long deleted;
}
\ No newline at end of file
--
Gitblit v1.8.0