From c903c1606a9c9e58d2b12adea1d7f5c775cca041 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 07 八月 2025 19:25:37 +0800
Subject: [PATCH] 替换流程基本实现
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java | 74 +++++++++++++++++++++++++++++++++++--
1 files changed, 70 insertions(+), 4 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java
index 5abf9bc..21be89d 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java
@@ -4,6 +4,10 @@
import lombok.Getter;
import lombok.Setter;
import org.springblade.core.mp.base.BizEntity;
+import org.springblade.mdm.flow.entity.FlowProgramFile;
+
+import java.util.Date;
+
@Setter
@Getter
@@ -49,6 +53,19 @@
*/
public static final String TYPE_PROGRAM_FILE = "70";
+ /**
+ * 鏂囦欢鑺傜偣鏂囦欢绫诲瀷锛氱▼搴�
+ */
+ public static final String FILE_CATEGOAY_PROGRAM = "program";
+ /**
+ * 鏂囦欢鑺傜偣鏂囦欢绫诲瀷锛氬叾浠�
+ */
+ public static final String FILE_CATEGORY_OTHER = "other";
+ /**
+ * 鏂囦欢鑺傜偣鏂囦欢绫诲瀷锛氬瓙绋嬪簭
+ */
+ public static final String FILE_CATEGORY_SUBPROGRAM = "subprogram";
+
private String name;
private Long parentId;
@@ -61,8 +78,10 @@
*/
private String machineCode;
-
-
+ /**
+ * 鏂囦欢绫诲瀷锛屽彧鏈�
+ */
+ //private String fileCategory;
/**
* 宸ュ簭锛屽鈥滅簿閾ｂ��
*/
@@ -78,6 +97,10 @@
*/
private String craftEdition;
/**
+ * 鏄惁鏈�鏂扮増娆★紝1锛氭渶鏂扮増娆★紱0:鍘嗗彶鐗堟
+ */
+ private Integer isLastEdition = 1;
+ /**
* 闆剁粍浠跺彿/鍥惧彿
*/
private String drawingNo;
@@ -89,11 +112,11 @@
/**
* 鏄惁鍥哄寲
*/
- private Integer isCured;
+ private Integer isCured = 0;
/**
* 杩囨湡鏃ユ湡
*/
- //private LocalDate expireDate;
+ private Date expireDate;
/**
* 鏄惁閿佸畾
*/
@@ -116,6 +139,11 @@
private String productModel;
/**
+ * 绋嬪簭缂栧彿锛堢▼搴忓寘鍚嶈妭鐐归渶瑕侊級
+ */
+ private String programNo;
+
+ /**
* 娴佺▼绋嬪簭鏂囦欢id锛屽彧鏈夌▼搴忔枃浠讹紙70锛夌被鍨嬬殑鑺傜偣鏈夋鍊�
*/
private Long flowProgramFileId;
@@ -124,4 +152,42 @@
* 瀹℃壒鏃剁殑娴佺▼瀹炰緥id锛屽彧鏈夌▼搴忓寘鑺傜偣鏈夎繖涓瓧娈靛��
*/
private String processInstanceId;
+
+ /**
+ * 鐗堟湰鍙凤紝鏇存柊涓�娆★紙鍏ュ崌鐗堬紝dnc瀵煎叆锛夛紝灏变細+1
+ */
+ private Integer versionNumber = 1;
+
+ transient FlowProgramFile flowProgramFile;
+
+ /**
+ * 鏍规嵁褰撳墠鐗堟湰鍙凤紝鑾峰彇鏂板鐗堟湰鍙�
+ * @return 鍗囩骇鍚庣殑鐗堟湰鍙�
+ */
+ public int genNewVersionNumber(){
+ if(this.versionNumber == null){
+ return 1;
+ }else{
+ return this.versionNumber + 1;
+ }
+ }
+
+ /**
+ * 鏄惁鍦ㄦ湁鏁堟湡鍐�
+ * @return 鏄惁
+ */
+ public boolean withinValidityPeriod() {
+ if(expireDate == null){
+ return true;
+ }
+ return expireDate.getTime() > System.currentTimeMillis();
+ }
+
+ /**
+ * 鏄惁宸茬粡鍥哄寲
+ * @return 鏄惁
+ */
+ public boolean hasCured() {
+ return this.isCured != null && this.isCured == 1;
+ }
}
--
Gitblit v1.9.3