From 51cd18dc2821b2b67802ea36c707fd96b99a6afa Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期三, 05 七月 2023 09:46:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 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 0fde0f7..e9ec1fd 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
@@ -16,12 +16,14 @@
*/
package com.vci.ubcs.flow.engine.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.vci.ubcs.flow.core.constant.ProcessConstant;
import com.vci.ubcs.flow.core.entity.BladeFlow;
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 lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -33,6 +35,7 @@
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.task.api.Task;
import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.support.Kv;
@@ -56,6 +59,7 @@
private final FlowTaskUserService flowTaskUserService;
private final FlowEngineService flowEngineService;
private final HistoryService historyService;
+ private final ProcessStageAttrService processStageAttrService;
private static String MODELKEY = "modelKey";//鍓嶇浼犺繃鏉ョ殑妯″瀷key
@Override
@@ -192,7 +196,7 @@
for (FlowTaskDTO flowTaskUserCi:mis){
if(taskId.equals(flowTaskUserCi.getTaskId())){
flowTaskUserCi.setCondition(conditionExpression);
- if(conditionExpression.split("=").length>1) {
+ if(conditionExpression.contains("=")||conditionExpression.contains("<")||conditionExpression.contains(">")) {
conditionExpression = conditionExpression.replace("${","").replace("}","").replaceAll("\"","");
String[] conditionExpressionStr = conditionExpression.split("==");
if(conditionExpression.contains("<")){
@@ -217,6 +221,23 @@
}
}
}
+
+ //娴佺▼甯搁噺
+ Map<String,Object> variables = runtimeService.getVariables(processInstanceId);
+ if(!variables.isEmpty()){
+ flowTaskDTO.setVariables(variables);
+ }
+
+ String templateId = variables.get("templateId").toString();
+ //娴佺▼闃舵
+ Map<String, Object> m = new HashMap<>();
+ 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);
+ flowTaskDTO.setStageAttrs(stageAttrs);
return flowTaskDTO;
}
}
--
Gitblit v1.9.3