From 364811c321ca9b3af58f3ec85ca5de0183a5e57b Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 19 六月 2023 17:38:00 +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/FlowEngineServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/FlowEngineServiceImpl.java b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/FlowEngineServiceImpl.java
index a11071e..297d6ca 100644
--- a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/FlowEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/FlowEngineServiceImpl.java
@@ -93,6 +93,8 @@
private static final String USR_TASK = "userTask";
private static final String IMAGE_NAME = "image";
private static final String XML_NAME = "xml";
+ private static final String TASKID = "taskId";
+ private static final String TASKNAME = "taskName";
private static final Integer INT_1024 = 1024;
private static final BpmnJsonConverter BPMN_JSON_CONVERTER = new BpmnJsonConverter();
private static final BpmnXMLConverter BPMN_XML_CONVERTER = new BpmnXMLConverter();
@@ -508,16 +510,19 @@
for (FlowElement flowElement : process.getFlowElements()) {
if (flowElement instanceof UserTask) {
Map<String,String> mi = new HashMap<>();
- mi.put("taskId",flowElement.getId());
- mi.put("taskName",flowElement.getName());
+ mi.put(TASKID,flowElement.getId());
+ mi.put(TASKNAME,flowElement.getName());
ll.add(mi);
}
}
}
-
return ll;
}
+ @Override
+ public String getTaskIdString(){
+ return TASKID;
+ }
/**
* 鏄惁宸插畬缁�
*
--
Gitblit v1.9.3