From 42a7552b9c8603aeab7f0785eb05270dfbeb0bd3 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期日, 02 三月 2025 10:16:20 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java b/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
index d638720..7fb7052 100644
--- a/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java
@@ -74,6 +74,7 @@
import java.io.InputStream;
import java.lang.reflect.Field;
+import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
@@ -160,7 +161,14 @@
newV.put(task.getTaskDefinitionKey() + "&" + key, variables.get(key));
//瀛楀吀閲屾湁灏辨斁鍏ユ祦绋嬪彉閲忎腑
if (!CollectionUtils.isEmpty(dictList) && dictList.contains(key)) {
- processVariables.put(key,variables.get(key));
+ if ("money".equals(key)) {
+ // 涓囧厓杞厓
+ Object w = variables.get(key);
+ BigDecimal y = new BigDecimal(w.toString()).multiply(new BigDecimal(10000));
+ processVariables.put(key, y);
+ } else {
+ processVariables.put(key,variables.get(key));
+ }
}
}
}
@@ -1264,13 +1272,14 @@
// 鍒ゆ柇鍓嶇疆浠诲姟鏄笉鏄拰褰撳墠浠诲姟涓哄悓涓�涓猠xecuteId
// 鍒ゆ柇褰撳墠浠诲姟鏄惁琚寕璧蜂腑
String finalProcessInsId = processInsId;
- beforeNodes.stream().filter(node -> {
+ beforeNodes = beforeNodes.stream().filter(node -> {
if (node.getCurrent()) {
return Boolean.TRUE;
}
HistoricTaskInstance beforeTask = historyService.createHistoricTaskInstanceQuery().processInstanceId(finalProcessInsId).finished().taskDefinitionKey(node.getBeforeNodeDefId()).singleResult();
return Objects.nonNull(beforeTask);
- }).forEach(node -> {
+ }).collect(Collectors.toList());
+ beforeNodes.forEach(node -> {
if (node.getCurrent()) {
if (processLogService.taskIsHangup(taskId, finalProcessInsId)) {
node.setTaskStatus(TaskStatusEnum.HANGUP);
--
Gitblit v1.8.0