From c53b0b34000badc16741f301d8be37703f13c9d8 Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Tue, 10 Mar 2026 10:58:26 +0800 Subject: [PATCH] =?UTF-8?q?feat(workflow):=20=E6=B7=BB=E5=8A=A0=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=9B=BE=E4=B8=8E=E5=AE=A1=E6=89=B9=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 RemoteWorkflowService 中新增 flowHisTaskList 方法定义 - 实现 RemoteWorkflowServiceImpl 中的 flowHisTaskList 方法 - 添加 RemoteWorkflowServiceMock 中的降级处理实现 - 扩展 WorkflowService 接口定义新方法 - 实现 WorkflowServiceImpl 中的业务逻辑处理 - 集成 flwInstanceService 的历史任务列表查询功能 --- .../dromara/workflow/api/RemoteWorkflowService.java | 8 ++++++++ .../workflow/api/RemoteWorkflowServiceMock.java | 6 ++++++ .../workflow/dubbo/RemoteWorkflowServiceImpl.java | 5 +++++ .../org/dromara/workflow/service/WorkflowService.java | 8 ++++++++ .../workflow/service/impl/WorkflowServiceImpl.java | 11 +++++++++++ 5 files changed, 38 insertions(+) diff --git a/ruoyi-api/ruoyi-api-workflow/src/main/java/org/dromara/workflow/api/RemoteWorkflowService.java b/ruoyi-api/ruoyi-api-workflow/src/main/java/org/dromara/workflow/api/RemoteWorkflowService.java index a6f767f7..3a3418fa 100644 --- a/ruoyi-api/ruoyi-api-workflow/src/main/java/org/dromara/workflow/api/RemoteWorkflowService.java +++ b/ruoyi-api/ruoyi-api-workflow/src/main/java/org/dromara/workflow/api/RemoteWorkflowService.java @@ -54,6 +54,14 @@ public interface RemoteWorkflowService { */ Map instanceVariable(Long instanceId); + /** + * 获取流程图与审批记录 + * + * @param businessId 业务id + * @return 审批记录与实例信息 + */ + Map flowHisTaskList(String businessId); + /** * 按照业务id查询流程实例id * diff --git a/ruoyi-api/ruoyi-api-workflow/src/main/java/org/dromara/workflow/api/RemoteWorkflowServiceMock.java b/ruoyi-api/ruoyi-api-workflow/src/main/java/org/dromara/workflow/api/RemoteWorkflowServiceMock.java index 1118681a..8b12478d 100644 --- a/ruoyi-api/ruoyi-api-workflow/src/main/java/org/dromara/workflow/api/RemoteWorkflowServiceMock.java +++ b/ruoyi-api/ruoyi-api-workflow/src/main/java/org/dromara/workflow/api/RemoteWorkflowServiceMock.java @@ -45,6 +45,12 @@ public class RemoteWorkflowServiceMock implements RemoteWorkflowService { return null; } + @Override + public Map flowHisTaskList(String businessId) { + log.warn("服务调用异常 -> 降级处理"); + return null; + } + @Override public Long getInstanceIdByBusinessId(String businessId) { log.warn("服务调用异常 -> 降级处理"); diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java index e15b02c0..3c3fee85 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java @@ -48,6 +48,11 @@ public class RemoteWorkflowServiceImpl implements RemoteWorkflowService { return workflowService.instanceVariable(instanceId); } + @Override + public Map flowHisTaskList(String businessId) { + return workflowService.flowHisTaskList(businessId); + } + @Override public Long getInstanceIdByBusinessId(String businessId) { return workflowService.getInstanceIdByBusinessId(businessId); diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/WorkflowService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/WorkflowService.java index 29328625..ebb7f95f 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/WorkflowService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/WorkflowService.java @@ -53,6 +53,14 @@ public interface WorkflowService { */ Map instanceVariable(Long instanceId); + /** + * 获取流程图与审批记录 + * + * @param businessId 业务id + * @return 审批记录与实例信息 + */ + Map flowHisTaskList(String businessId); + /** * 按照业务id查询流程实例id * diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java index ac75bda8..ee9226a7 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java @@ -92,6 +92,17 @@ public class WorkflowServiceImpl implements WorkflowService { return flwInstanceService.instanceVariable(instanceId); } + /** + * 获取流程图与审批记录 + * + * @param businessId 业务id + * @return 审批记录与实例信息 + */ + @Override + public Map flowHisTaskList(String businessId) { + return flwInstanceService.flowHisTaskList(businessId); + } + /** * 按照业务id查询流程实例id *