From 669536d2b2f602a1871e482677fdab1ed53e637c Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期五, 28 二月 2025 10:24:41 +0800 Subject: [PATCH] 金额判断条件万元转元 --- business/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java | 44 ++++++++++++++++++++++++++++++++++---------- 1 files changed, 34 insertions(+), 10 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 f4234ee..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)); + } } } } @@ -1249,21 +1257,31 @@ Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); // 娴佺▼鍙橀噺 Map<String, Object> parameters = new HashMap<>(); + List<FormDetailVO> beforeNodes = new ArrayList<>(); + String processInsId = ""; HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery().includeProcessVariables().finished().taskId(taskId).singleResult(); if (Objects.nonNull(historicTaskInstance)) { parameters = historicTaskInstance.getProcessVariables(); + processInsId = historicTaskInstance.getProcessInstanceId(); + beforeNodes = this.getBeforeNodeForm(parameters, historicTaskInstance.getFormKey(), historicTaskInstance.getName(), historicTaskInstance.getProcessDefinitionId(), historicTaskInstance.getTaskDefinitionKey(), Boolean.FALSE); } else { parameters = taskService.getVariables(taskId); + processInsId = task.getProcessInstanceId(); + beforeNodes = this.getBeforeNodeForm(parameters, task.getFormKey(), task.getName(), task.getProcessDefinitionId(), task.getTaskDefinitionKey(), Boolean.FALSE); } - List<FormDetailVO> beforeNodes = this.getBeforeNodeForm(parameters, task.getFormKey(), task.getName(), task.getProcessDefinitionId(), task.getTaskDefinitionKey(), Boolean.FALSE); // 鍒ゆ柇鍓嶇疆浠诲姟鏄笉鏄拰褰撳墠浠诲姟涓哄悓涓�涓猠xecuteId // 鍒ゆ柇褰撳墠浠诲姟鏄惁琚寕璧蜂腑 - beforeNodes.stream().filter(node -> { - HistoricTaskInstance beforeTask = historyService.createHistoricTaskInstanceQuery().processInstanceId(task.getProcessInstanceId()).finished().taskDefinitionKey(node.getBeforeNodeDefId()).singleResult(); - return Objects.isNull(beforeTask); - }).forEach(node -> { + String finalProcessInsId = processInsId; + beforeNodes = beforeNodes.stream().filter(node -> { if (node.getCurrent()) { - if (processLogService.taskIsHangup(taskId, task.getProcessInstanceId())) { + return Boolean.TRUE; + } + HistoricTaskInstance beforeTask = historyService.createHistoricTaskInstanceQuery().processInstanceId(finalProcessInsId).finished().taskDefinitionKey(node.getBeforeNodeDefId()).singleResult(); + return Objects.nonNull(beforeTask); + }).collect(Collectors.toList()); + beforeNodes.forEach(node -> { + if (node.getCurrent()) { + if (processLogService.taskIsHangup(taskId, finalProcessInsId)) { node.setTaskStatus(TaskStatusEnum.HANGUP); } } @@ -1285,16 +1303,22 @@ parameters = hisTask.getProcessVariables(); List<FormDetailVO> beforeNodes = this.getBeforeNodeForm(parameters, hisTask.getFormKey(), hisTask.getName(), hisTask.getProcessDefinitionId(), hisTask.getTaskDefinitionKey(), Boolean.TRUE); List<FormDetailVO> dataList = beforeNodes.stream().filter(node -> { - HistoricTaskInstance beforeTask = historyService.createHistoricTaskInstanceQuery().processInstanceId(task.getProcessInstanceId()).finished().taskDefinitionKey(node.getBeforeNodeDefId()).singleResult(); - return Objects.isNull(beforeTask); + if (node.getCurrent()) { + return Boolean.TRUE; + } + HistoricTaskInstance beforeTask = historyService.createHistoricTaskInstanceQuery().processInstanceId(hisTask.getProcessInstanceId()).finished().taskDefinitionKey(node.getBeforeNodeDefId()).singleResult(); + return Objects.nonNull(beforeTask); }).collect(Collectors.toList()); return AjaxResult.success(dataList); } else { parameters = taskService.getVariables(taskId); List<FormDetailVO> beforeNodes = this.getBeforeNodeForm(parameters, task.getFormKey(), task.getName(), task.getProcessDefinitionId(), task.getTaskDefinitionKey(), Boolean.TRUE); List<FormDetailVO> dataList = beforeNodes.stream().filter(node -> { + if (node.getCurrent()) { + return Boolean.TRUE; + } HistoricTaskInstance beforeTask = historyService.createHistoricTaskInstanceQuery().processInstanceId(task.getProcessInstanceId()).finished().taskDefinitionKey(node.getBeforeNodeDefId()).singleResult(); - return Objects.isNull(beforeTask); + return Objects.nonNull(beforeTask); }).collect(Collectors.toList()); return AjaxResult.success(dataList); } -- Gitblit v1.8.0