From b1daac79d0fb507d3f035829a220a4cbd8408562 Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Wed, 3 Jul 2024 13:53:57 +0800 Subject: [PATCH] =?UTF-8?q?fix(sj=5F1.1.0-beta2):=20=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=B5=81=E8=AF=A6=E6=83=85=E6=B7=BB=E5=8A=A0=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/web/model/response/WorkflowDetailResponseVO.java | 5 +++++ .../server/web/service/impl/WorkflowBatchServiceImpl.java | 1 + 2 files changed, 6 insertions(+) diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/WorkflowDetailResponseVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/WorkflowDetailResponseVO.java index e9b5adb3d..18e7eced3 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/WorkflowDetailResponseVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/response/WorkflowDetailResponseVO.java @@ -55,6 +55,11 @@ public class WorkflowDetailResponseVO { */ private Integer workflowStatus; + /** + * see: {@link com.aizuda.snailjob.common.core.enums.JobTaskBatchStatusEnum} + */ + private Integer workflowBatchStatus; + /** * 工作流上下文 */ diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowBatchServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowBatchServiceImpl.java index 0e75c8f88..762014c70 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowBatchServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/WorkflowBatchServiceImpl.java @@ -111,6 +111,7 @@ public class WorkflowBatchServiceImpl implements WorkflowBatchService { Workflow workflow = workflowMapper.selectById(workflowTaskBatch.getWorkflowId()); WorkflowDetailResponseVO responseVO = WorkflowConverter.INSTANCE.convert(workflow); + responseVO.setWorkflowBatchStatus(workflowTaskBatch.getTaskBatchStatus()); List workflowNodes = workflowNodeMapper.selectList(new LambdaQueryWrapper() .eq(WorkflowNode::getDeleted, StatusEnum.NO.getStatus()) .eq(WorkflowNode::getWorkflowId, workflow.getId()));