From d883bd3852e86c29641436a4b99eb3a4b0fd689c Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Tue, 19 Nov 2024 15:37:30 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E8=8A=82=E7=82=B9=E6=94=AF=E6=8C=81=E6=9C=89?= =?UTF-8?q?=E6=9D=83=E9=99=90=E7=9A=84=E7=94=A8=E6=88=B7=E5=B9=B2=E9=A2=84?= =?UTF-8?q?=E8=BD=AC=E4=BA=A4=E5=85=B7=E4=BD=93=E5=AE=A1=E6=89=B9=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1293468838625280]后端-审批节点支持有权限的用户干预转交具体审批人 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1293468838625280 --- .../thread/ProcessTaskActionThread.java | 13 +++++ .../thread/ProcessTaskAuditThread.java | 55 +++++++++++-------- 2 files changed, 45 insertions(+), 23 deletions(-) diff --git a/src/main/java/neatlogic/module/process/thread/ProcessTaskActionThread.java b/src/main/java/neatlogic/module/process/thread/ProcessTaskActionThread.java index 1e08ce0bb..741db4ea8 100644 --- a/src/main/java/neatlogic/module/process/thread/ProcessTaskActionThread.java +++ b/src/main/java/neatlogic/module/process/thread/ProcessTaskActionThread.java @@ -109,6 +109,19 @@ public class ProcessTaskActionThread extends NeatLogicThread { ProcessTaskStepVo stepVo = processTaskMapper.getProcessTaskStepBaseInfoById(currentProcessTaskStepVo.getId()); String stepConfig = selectContentByHashMapper.getProcessTaskStepConfigByHash(stepVo.getConfigHash()); actionList = (JSONArray) JSONPath.read(stepConfig, "actionConfig.actionList"); + + currentProcessTaskStepVo.setProcessTaskId(stepVo.getProcessTaskId()); + currentProcessTaskStepVo.setName(stepVo.getName()); + currentProcessTaskStepVo.setProcessStepUuid(stepVo.getProcessStepUuid()); + currentProcessTaskStepVo.setStatus(stepVo.getStatus()); + currentProcessTaskStepVo.setType(stepVo.getType()); + currentProcessTaskStepVo.setHandler(stepVo.getHandler()); + currentProcessTaskStepVo.setIsActive(stepVo.getIsActive()); + currentProcessTaskStepVo.setConfigHash(stepVo.getConfigHash()); + currentProcessTaskStepVo.setActiveTime(stepVo.getActiveTime()); + currentProcessTaskStepVo.setStartTime(stepVo.getStartTime()); + currentProcessTaskStepVo.setEndTime(stepVo.getEndTime()); + currentProcessTaskStepVo.setError(stepVo.getError()); } /* 从步骤配置信息中获取动作列表 **/ if (CollectionUtils.isNotEmpty(actionList)) { diff --git a/src/main/java/neatlogic/module/process/thread/ProcessTaskAuditThread.java b/src/main/java/neatlogic/module/process/thread/ProcessTaskAuditThread.java index 1d9bab429..576c81a3e 100644 --- a/src/main/java/neatlogic/module/process/thread/ProcessTaskAuditThread.java +++ b/src/main/java/neatlogic/module/process/thread/ProcessTaskAuditThread.java @@ -24,9 +24,9 @@ import neatlogic.framework.process.audithandler.core.IProcessTaskAuditDetailType import neatlogic.framework.process.audithandler.core.IProcessTaskAuditType; import neatlogic.framework.process.audithandler.core.ProcessTaskAuditDetailTypeFactory; import neatlogic.framework.process.audithandler.core.ProcessTaskAuditTypeFactory; -import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.*; import neatlogic.framework.util.FreemarkerUtil; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.module.process.service.ProcessTaskService; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -64,6 +64,7 @@ public class ProcessTaskAuditThread extends NeatLogicThread { public ProcessTaskAuditThread(ProcessTaskStepVo _currentProcessTaskStepVo, IProcessTaskAuditType _action) { super("PROCESSTASK-AUDIT-" + _currentProcessTaskStepVo.getId() + "-" + _action.getValue()); currentProcessTaskStepVo = _currentProcessTaskStepVo; + currentProcessTaskStepVo.setIsAutoGenerateId(false); action = _action; } @@ -92,31 +93,39 @@ public class ProcessTaskAuditThread extends NeatLogicThread { if (StringUtils.isNotBlank(source)) { processTaskStepAuditVo.setSource(source); } + ProcessTaskStepVo stepVo = null; if (currentProcessTaskStepVo.getId() != null) { - processTaskStepAuditVo.setProcessTaskStepId(currentProcessTaskStepVo.getId()); - String processTaskStepName = currentProcessTaskStepVo.getName(); - if (StringUtils.isBlank(processTaskStepName)) { - processTaskStepName = processTaskMapper.getProcessTaskStepNameById(currentProcessTaskStepVo.getId()); - } - paramObj.put("processTaskStepName", processTaskStepName); - String configHash = currentProcessTaskStepVo.getConfigHash(); - if (StringUtils.isBlank(configHash)) { - ProcessTaskStepVo processTaskStepVo = processTaskMapper.getProcessTaskStepBaseInfoById(currentProcessTaskStepVo.getId()); - if (processTaskStepVo != null) { - currentProcessTaskStepVo = processTaskStepVo; + stepVo = processTaskMapper.getProcessTaskStepBaseInfoById(currentProcessTaskStepVo.getId()); + if (stepVo != null) { + currentProcessTaskStepVo.setProcessTaskId(stepVo.getProcessTaskId()); + currentProcessTaskStepVo.setName(stepVo.getName()); + currentProcessTaskStepVo.setProcessStepUuid(stepVo.getProcessStepUuid()); + currentProcessTaskStepVo.setStatus(stepVo.getStatus()); + currentProcessTaskStepVo.setType(stepVo.getType()); + currentProcessTaskStepVo.setHandler(stepVo.getHandler()); + currentProcessTaskStepVo.setIsActive(stepVo.getIsActive()); + currentProcessTaskStepVo.setConfigHash(stepVo.getConfigHash()); + currentProcessTaskStepVo.setActiveTime(stepVo.getActiveTime()); + currentProcessTaskStepVo.setStartTime(stepVo.getStartTime()); + currentProcessTaskStepVo.setEndTime(stepVo.getEndTime()); + currentProcessTaskStepVo.setError(stepVo.getError()); + + processTaskStepAuditVo.setProcessTaskStepId(currentProcessTaskStepVo.getId()); + String processTaskStepName = currentProcessTaskStepVo.getName(); + paramObj.put("processTaskStepName", processTaskStepName); + JSONArray replaceableTextList = processTaskService.getReplaceableTextList(currentProcessTaskStepVo); + for (int i = 0; i < replaceableTextList.size(); i++) { + JSONObject replaceableText = replaceableTextList.getJSONObject(i); + String name = replaceableText.getString("name"); + String value = replaceableText.getString("value"); + if (StringUtils.isBlank(value)) { + value = replaceableText.getString("text"); + } + paramObj.put(name, value); } } - JSONArray replaceableTextList = processTaskService.getReplaceableTextList(currentProcessTaskStepVo); - for (int i = 0; i < replaceableTextList.size(); i++) { - JSONObject replaceableText = replaceableTextList.getJSONObject(i); - String name = replaceableText.getString("name"); - String value = replaceableText.getString("value"); - if (StringUtils.isBlank(value)) { - value = replaceableText.getString("text"); - } - paramObj.put(name, value); - } - } else { + } + if (stepVo == null) { ProcessTaskVo processTaskVo = processTaskMapper.getProcessTaskById(currentProcessTaskStepVo.getProcessTaskId()); if (processTaskVo != null) { paramObj.put("processTaskStepName", processTaskVo.getTitle()); -- Gitee