From 6de11904c373ded1f44f326382bb59d08b24c8d1 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 13 八月 2025 11:55:22 +0800
Subject: [PATCH] 增加分工表导入功能
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 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 a992ae6..e62386d 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
@@ -1,10 +1,13 @@
package org.springblade.mdm.program.entity;
+import com.alibaba.excel.util.StringUtils;
import com.baomidou.mybatisplus.annotation.TableName;
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
@@ -76,7 +79,6 @@
*/
private String machineCode;
-
/**
* 鏂囦欢绫诲瀷锛屽彧鏈�
*/
@@ -111,11 +113,11 @@
/**
* 鏄惁鍥哄寲
*/
- private Integer isCured;
+ private Integer isCured = 0;
/**
* 杩囨湡鏃ユ湡
*/
- //private LocalDate expireDate;
+ private Date expireDate;
/**
* 鏄惁閿佸畾
*/
@@ -151,7 +153,10 @@
* 瀹℃壒鏃剁殑娴佺▼瀹炰緥id锛屽彧鏈夌▼搴忓寘鑺傜偣鏈夎繖涓瓧娈靛��
*/
private String processInstanceId;
-
+ /**
+ * 鍋忕鍗曞彿
+ */
+ private String deviation;
/**
* 鐗堟湰鍙凤紝鏇存柊涓�娆★紙鍏ュ崌鐗堬紝dnc瀵煎叆锛夛紝灏变細+1
*/
@@ -159,6 +164,13 @@
transient FlowProgramFile flowProgramFile;
+ /**
+ * 鏄惁鏄亸绂荤▼搴�
+ * @return 鏄惁鍋忕
+ */
+ public boolean isDeviationProgram(){
+ return StringUtils.isNotBlank(this.deviation);
+ }
/**
* 鏍规嵁褰撳墠鐗堟湰鍙凤紝鑾峰彇鏂板鐗堟湰鍙�
* @return 鍗囩骇鍚庣殑鐗堟湰鍙�
@@ -170,4 +182,27 @@
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;
+ }
+
+ public void upgradeVersionNUmber() {
+ this.versionNumber = genNewVersionNumber();
+ }
}
--
Gitblit v1.9.3