From 0bd3343912d4b50bb0b3402b2f9eb5b6ebf85246 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 04 八月 2023 18:44:27 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-ops-api/ubcs-flow-api/src/main/java/com/vci/ubcs/flow/core/entity/BladeFlow.java | 5 +++++
Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/business/service/impl/FlowBusinessServiceImpl.java | 15 +++++++++++----
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-ops-api/ubcs-flow-api/src/main/java/com/vci/ubcs/flow/core/entity/BladeFlow.java b/Source/UBCS/ubcs-ops-api/ubcs-flow-api/src/main/java/com/vci/ubcs/flow/core/entity/BladeFlow.java
index a0ca9b6..dceab7c 100644
--- a/Source/UBCS/ubcs-ops-api/ubcs-flow-api/src/main/java/com/vci/ubcs/flow/core/entity/BladeFlow.java
+++ b/Source/UBCS/ubcs-ops-api/ubcs-flow-api/src/main/java/com/vci/ubcs/flow/core/entity/BladeFlow.java
@@ -185,6 +185,11 @@
private String historyActivityIdea;
/**
+ * 娴佺▼寮�濮嬩簨浠�
+ */
+ private String processDefinitionStartTime;
+
+ /**
* 鑾峰彇鏄惁閫氳繃
*/
public boolean isPass() {
diff --git a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/business/service/impl/FlowBusinessServiceImpl.java b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/business/service/impl/FlowBusinessServiceImpl.java
index 502f332..a8581d4 100644
--- a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/business/service/impl/FlowBusinessServiceImpl.java
+++ b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/business/service/impl/FlowBusinessServiceImpl.java
@@ -24,6 +24,7 @@
import com.vci.ubcs.flow.engine.constant.FlowEngineConstant;
import com.vci.ubcs.flow.engine.entity.FlowProcess;
import com.vci.ubcs.flow.engine.utils.FlowCache;
+import com.vci.ubcs.starter.web.util.VciDateUtil;
import com.vci.ubcs.system.user.cache.UserCache;
import com.vci.ubcs.system.user.entity.User;
import lombok.AllArgsConstructor;
@@ -340,10 +341,11 @@
flow.setHistoryActivityIdea(commentList.get(0).getFullMessage());
}
}
+ List<HistoricProcessInstance> processInstanceList = historyService.createHistoricProcessInstanceQuery()
+ .processInstanceId(task.getProcessInstanceId()).orderByProcessInstanceStartTime().asc().list();
+ flow.setProcessDefinitionStartTime(VciDateUtil.date2Str(processInstanceList.get(0).getStartTime(),VciDateUtil.DateTimeFormat));
// 鑾峰彇娴佺▼鍙戣捣浜哄悕绉�
if (FlowEngineConstant.START_EVENT.equals(historicActivityInstance.getActivityType())) {
- List<HistoricProcessInstance> processInstanceList = historyService.createHistoricProcessInstanceQuery()
- .processInstanceId(task.getProcessInstanceId()).orderByProcessInstanceStartTime().asc().list();
if (processInstanceList.size() > 0) {
if (StringUtil.isNotBlank(processInstanceList.get(0).getStartUserId())) {
String taskUser = processInstanceList.get(0).getStartUserId();
@@ -357,9 +359,14 @@
}
if (Func.isNotEmpty(historicProcessInstance)) {
- String[] businessKey = Func.toStrArray(StringPool.COLON, historicProcessInstance.getBusinessKey());
+ String[] businessKey = new String[2];
+ if(historicProcessInstance.getBusinessKey().contains(StringPool.COLON)){
+ businessKey = Func.toStrArray(StringPool.COLON, historicProcessInstance.getBusinessKey());
+ }else{
+ businessKey[0] = historicProcessInstance.getBusinessKey();
+ }
flow.setBusinessTable(businessKey[0]);
- flow.setBusinessId(businessKey.length>1?businessKey[1]:"1");
+ flow.setBusinessId(businessKey.length>1 && StringUtils.isNotEmpty(businessKey[1])?businessKey[1]:"1");
}
FlowProcess processDefinition = FlowCache.getProcessDefinition(task.getProcessDefinitionId());
--
Gitblit v1.9.3