From 53f20bd7f8db6fe50a613c6f1d7177b3fb8ae792 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期日, 15 十月 2023 17:32:26 +0800
Subject: [PATCH] 历史导入做填充bug修复
---
Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 44 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java
index 48f0515..6502574 100644
--- a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java
+++ b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java
@@ -18,13 +18,18 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.vci.ubcs.flow.core.constant.ProcessConstant;
+import com.vci.ubcs.flow.core.dto.FlowTaskDTO;
+import com.vci.ubcs.flow.core.dto.ProcessStageAttrDTO;
import com.vci.ubcs.flow.core.entity.BladeFlow;
+import com.vci.ubcs.flow.core.entity.FlowTaskUser;
+import com.vci.ubcs.flow.core.entity.ProcessStageAttr;
import com.vci.ubcs.flow.core.utils.TaskUtil;
import com.vci.ubcs.flow.engine.entity.*;
import com.vci.ubcs.flow.engine.service.FlowEngineService;
import com.vci.ubcs.flow.engine.service.FlowTaskUserService;
import com.vci.ubcs.flow.engine.service.ProcessStageAttrService;
import com.vci.ubcs.flow.engine.service.VICFlowService;
+import com.vci.ubcs.starter.web.util.BeanUtil;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -63,6 +68,7 @@
private static String MODELKEY = "modelKey";//鍓嶇浼犺繃鏉ョ殑妯″瀷key
private static String TASKID = "taskId";//鍓嶇浼犺繃鏉ョ殑妯″瀷key
+ private static String PROCESSINSTANCEID = "processInstanceId";//鍓嶇浼犺繃鏉ョ殑妯″瀷key
@Override
public R<BladeFlow> startProcess(FlowTaskDTO flowTaskUserC){
Map<String, Object> kvv = flowTaskUserC.getVariables();
@@ -153,10 +159,17 @@
String modelKey = processInstance.getProcessDefinitionKey();
List<FlowTaskDTO> mis = flowEngineService.getNodeByFlowableKey(modelKey);
+ Map<String,String> taskMap = new HashMap<>();
+ mis.stream().forEach(e->{
+ String taskId = e.getTaskId();
+ String taskName = e.getTaskName();
+ taskMap.put(taskId,taskName);
+ });
// 杈撳嚭杩炵嚎
List<SequenceFlow> outFlows = flowNode.getOutgoingFlows();
for (SequenceFlow sequenceFlow : outFlows) {
+ String toname = sequenceFlow.getName()==null?"鍚屾剰":sequenceFlow.getName();
//褰撳墠瀹℃壒鑺傜偣
if (NODE_NOW.equals(node)) {
FlowElement sourceFlowElement = sequenceFlow.getSourceFlowElement();
@@ -168,9 +181,11 @@
FlowTaskDTO flowTaskUserCi = new FlowTaskDTO();
//flowTaskUserCi.setConditionKey(null);
//flowTaskUserCi.setConditionValue(null);
- flowTaskUserCi.setToName("鍚屾剰");
+ flowTaskUserCi.setToName(toname);
flowTaskUserCi.setToTaskId(targetFlow.getId());
- flowTaskUserCi.setToTaskName(targetFlow.getName());
+ String taskName = taskMap.get(targetFlow.getId());
+ flowTaskUserCi.setToTaskName(taskName);
+ flowTaskUserCi.setTaskName(taskName);
taskList.add(flowTaskUserCi);
}
@@ -184,16 +199,21 @@
flowTaskUserCi.setToTaskName(targetFlow.getName());
taskList.add(flowTaskUserCi);
}
- // 濡傛灉涓嬩釜瀹℃壒鑺傜偣涓烘帓浠栫綉鍏�
- if (targetFlow instanceof ExclusiveGateway) {
+ // 濡傛灉涓嬩釜瀹℃壒鑺傜偣涓虹綉鍏�
+ if (targetFlow instanceof Gateway) {
ExclusiveGateway exclusiveGateway = (ExclusiveGateway) targetFlow;
List<SequenceFlow> exclusiveGatewayOutgoingFlows = exclusiveGateway.getOutgoingFlows();
for (SequenceFlow nexti:exclusiveGatewayOutgoingFlows){
String conditionExpression = nexti.getConditionExpression();//condition
+
String taskId = nexti.getTargetRef();//taskId
String name = nexti.getName();//toName,椹冲洖銆佸悓鎰�
-
+ String taskName = taskMap.get(taskId);
+//ExclusiveGateway
+ if(StringUtils.isEmpty(conditionExpression)){//姝ゆ椂鎺掍粬缃戝叧娌℃湁閰嶇疆娴佽浆鏉′欢
+ continue;
+ }
for (FlowTaskDTO flowTaskUserCi:mis){
if(taskId.equals(flowTaskUserCi.getTaskId())){
flowTaskUserCi.setCondition(conditionExpression);
@@ -214,7 +234,8 @@
}
flowTaskUserCi.setToName(name);
flowTaskUserCi.setToTaskId(taskId);
- flowTaskUserCi.setToTaskName(flowTaskUserCi.getTaskName());
+ flowTaskUserCi.setToTaskName(taskName);
+ flowTaskUserCi.setTaskName(taskName);
taskList.add(flowTaskUserCi);
}
}
@@ -229,10 +250,26 @@
flowTaskDTO.setVariables(variables);
}
+ //娴佺▼闃舵
+ Map<String, Object> m = new HashMap<>();
+ String templateId = variables.get("templateId").toString();
+ m.put("template_id", templateId);
+ m.put("task_id", crruentActivityId);
+ m.put("model_key", modelKey);
+ QueryWrapper q = Condition.getQueryWrapper(m, ProcessStageAttr.class)
+ .select("attr_id attrId,attr_name attrName,attr_group attrGroup");
+ List<ProcessStageAttr> stageAttrs = processStageAttrService.list(q);
+ List<ProcessStageAttrDTO> stageAttrsDto = new ArrayList<>();
+ stageAttrs.stream().forEach(e->{
+ ProcessStageAttrDTO dto = new ProcessStageAttrDTO();
+ BeanUtil.convert(e,dto);
+ stageAttrsDto.add(dto);
+ });
+ flowTaskDTO.setStageAttrs(stageAttrsDto);
//鏀惧叆娴佺▼闃舵銆佹祦绋媘odelkey
variables.put(TASKID,crruentActivityId);
- flowTaskDTO.setProcessInstanceId(processInstanceId);
+ variables.put(PROCESSINSTANCEID,processInstanceId);
return flowTaskDTO;
}
}
--
Gitblit v1.9.3