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 *