From 843c50e9c2b35196f5f4c150e33fdc6f6c2d6826 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 16 七月 2024 09:34:31 +0800
Subject: [PATCH] 测试节点通过后,状态取上一节点状态,而不是默认完成
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrProductionNode.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrProductionNode.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrProductionNode.java
index f84424a..a33064b 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrProductionNode.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPr/PrProductionNode.java
@@ -49,6 +49,12 @@
public String content;
/**
+ * 鎺掑簭
+ */
+ //@NotNull(message = "鑺傜偣绫诲瀷涓嶈兘涓虹┖")
+ public Integer nodeType;
+
+ /**
* 鏄惁寮�濮嬭妭鐐癸紝1鏄紝0鍚�
*/
@NotNull(message = "璇烽�夋嫨鏄惁鐢熶骇寮�濮�")
@@ -69,11 +75,11 @@
/**
* 璁板綍璁惧鍛ㄦ湡鍐呭
*/
- public String equipCycleContent;
+ public String deviceCycleContent;
@AssertTrue(message = "璇疯緭鍏ヨ褰曡澶囧懆鏈熷唴瀹�")
- public boolean isEquipCycleContentValid() {
- return !isRecord || (isRecord && StringUtils.isNotBlank(equipCycleContent));
+ public boolean isDeviceCycleContentValid() {
+ return !isRecord || (isRecord && StringUtils.isNotBlank(deviceCycleContent));
}
/**
--
Gitblit v1.8.0