From 79175184a6b131cef9a318ffd34529f10373c331 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 10 八月 2025 15:49:26 +0800
Subject: [PATCH] 增加已办的字段显示
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeAutoCreateService.java | 33 ++++++++++++++++++++-------------
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java | 4 +++-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java | 5 ++++-
3 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
index 35394e9..57291fc 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
@@ -618,11 +618,13 @@
vo.setProcessCreateTime(processInstance.getStartTime());
vo.setProcessInstanceId(hisTask.getProcessInstanceId());
+ vo.setProcessDefinitionName(processInstance.getProcessDefinitionName());
+ vo.setProcessDefinitionKey(processInstance.getProcessDefinitionKey());
vo.setTaskName(hisTask.getName());
+ vo.setTaskDefinitionKey(hisTask.getTaskDefinitionKey());
vo.setCreateTime(hisTask.getCreateTime());
vo.setEndTime(hisTask.getEndTime());
vo.setVariables(hisTask.getProcessVariables());
-
vo.setProcessCreateTime(processInstance.getStartTime());
vo.setHistoryTaskEndTime(hisTask.getEndTime());
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 ac26b23..06af7c3 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
@@ -152,7 +152,10 @@
* 瀹℃壒鏃剁殑娴佺▼瀹炰緥id锛屽彧鏈夌▼搴忓寘鑺傜偣鏈夎繖涓瓧娈靛��
*/
private String processInstanceId;
-
+ /**
+ * 鍋忕鍗曞彿
+ */
+ private String deviation;
/**
* 鐗堟湰鍙凤紝鏇存柊涓�娆★紙鍏ュ崌鐗堬紝dnc瀵煎叆锛夛紝灏变細+1
*/
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeAutoCreateService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeAutoCreateService.java
index 963ace9..a5f6008 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeAutoCreateService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeAutoCreateService.java
@@ -3,6 +3,8 @@
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.service.FlowCommonService;
@@ -30,7 +32,7 @@
private final ProgramSeqService programSeqService;
public static final String TRY_NAME = "璇曞垏";
public static final String CURE_NAME = "鍥哄寲";
- public static final String PIANLI_NAME = "鍋忕";
+ public static final String DEVIATION_NAME = "鍋忕";
/**
* 鍒涘缓鏍戝埌鏈哄簥绾у埆
@@ -41,10 +43,18 @@
NcNode root;
if(programProperties.getProcessDefinitionKey().equals(FlowContants.TRY_PROCESS_KEY)){
- //璇曞垏
- root = rootNodeByName(TRY_NAME);
- if(root == null){
- root = createTryNode();
+ if(Func.isEmpty(programProperties.getDeviation())){
+ //璇曞垏
+ root = rootNodeByName(TRY_NAME);
+ if (root == null) {
+ root = createTryNode();
+ }
+ }else{
+ //鏈夊亸绂�
+ root = rootNodeByName(DEVIATION_NAME);
+ if(root == null){
+ root = createDeviationNode();
+ }
}
}else if(programProperties.getProcessDefinitionKey().equals(FlowContants.CURE_PROCESS_KEY)){
root = rootNodeByName(CURE_NAME);
@@ -52,13 +62,8 @@
root = createCureNode();
}
}else{
- root = rootNodeByName(PIANLI_NAME);
- if(root == null){
- root = createPianliNode();
- }
+ throw new ServiceException("娴佺▼瀹氫箟涓嶅湪鑼冨洿鍐�");
}
-
- NcNode lastNode = null;
//鍒涘缓浜у搧鍨嬪彿鑺傜偣
NcNode productModelNode = createNodeIfNotExists(programProperties.getProductModel(),NcNode.TYPE_PRODUCT_MODEL, root,programProperties);
//闆剁粍浠跺彿鑺傜偣
@@ -167,6 +172,8 @@
ncNode.setProcessName(programProperties.getProcessName());
ncNode.setMachineCode(programProperties.getMachineCode());
ncNode.setProductModel(programProperties.getProductModel());
+
+ ncNode.setDeviation(programProperties.getDeviation());
//ncNode.setMachineMode(programProperties.getMachineMode());
}
@@ -215,10 +222,10 @@
return ncNode;
}
- NcNode createPianliNode() {
+ NcNode createDeviationNode() {
NcNode ncNode = new NcNode();
ncNode.setId(3L);
- ncNode.setName(PIANLI_NAME);
+ ncNode.setName(DEVIATION_NAME);
ncNode.setParentId(0L);
ncNode.setParentIds("0");
ncNode.setNodeType("10");
--
Gitblit v1.9.3