From db860f9c08a23fe916121a2c76001e05d2acee3e Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 07 八月 2023 15:17:16 +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 | 24 +++++++++++++++++++++++-
1 files changed, 23 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 48f0515..731fb62 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();
@@ -229,10 +235,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