xf 2 сар өмнө
parent
commit
c60f8e0223

+ 9 - 9
src/Hotline/FlowEngine/Workflows/IWorkflowDomainService.cs

@@ -94,23 +94,23 @@ namespace Hotline.FlowEngine.Workflows
             Action<Workflow, StepDefine, WorkflowStep, WorkflowStep>? stepConfig = null,
             CancellationToken cancellationToken = default);
 
-        Task<bool> RecallAsync(Workflow workflow, RecallDto dto, StepAssignInfo stepAssignInfo, StepDefine targetStepDefine,
-            EWorkflowTraceType traceType, DateTime? expiredTime, bool isOrderFiled, EHandleMode handleMode,
-            Action<Workflow, StepDefine, WorkflowStep, WorkflowStep>? stepConfig = null,
-            CancellationToken cancellationToken = default);
-
-        Task<bool> RecallAsync(Workflow workflow, RecallDto dto, StepAssignInfo stepAssignInfo,
-            StepDefine targetStepDefine, WorkflowStep targetStep, EWorkflowTraceType traceType,
-            DateTime? expiredTime, bool isOrderFiled, EHandleMode handleMode,
+        Task<bool> RecallAsync(Workflow workflow, BasicWorkflowDto dto, StepAssignInfo stepAssignInfo, 
+            StepDefine targetStepDefine, EWorkflowTraceType traceType, DateTime? expiredTime, bool isOrderFiled, EHandleMode handleMode,
             Action<Workflow, StepDefine, WorkflowStep, WorkflowStep>? stepConfig = null,
             CancellationToken cancellationToken = default);
 
-        Task<bool> RecallAsync(Workflow workflow, RecallDto dto, StepAssignInfo stepAssignInfo,
+        Task<bool> RecallAsync(Workflow workflow, BasicWorkflowDto dto, StepAssignInfo stepAssignInfo,
             WorkflowStep targetStep, EWorkflowTraceType traceType,
             DateTime? expiredTime, bool isOrderFiled, EHandleMode handleMode,
             Action<Workflow, StepDefine, WorkflowStep, WorkflowStep>? stepConfig = null,
             CancellationToken cancellationToken = default);
 
+        // Task<bool> RecallAsync(Workflow workflow, BasicWorkflowDto dto, StepAssignInfo stepAssignInfo,
+        //     StepDefine targetStepDefine, WorkflowStep targetStep, EWorkflowTraceType traceType,
+        //     DateTime? expiredTime, bool isOrderFiled, EHandleMode handleMode,
+        //     Action<Workflow, StepDefine, WorkflowStep, WorkflowStep>? stepConfig = null,
+        //     CancellationToken cancellationToken = default);
+        
         /// <summary>
         /// 撤回至开始节点
         /// </summary>

+ 3 - 4
src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -1519,7 +1519,7 @@ namespace Hotline.FlowEngine.Workflows
         /// <summary>
         /// 撤回(返回到之前任意节点)
         /// </summary>
-        public Task<bool> RecallAsync(Workflow workflow, RecallDto dto, StepAssignInfo stepAssignInfo,
+        public Task<bool> RecallAsync(Workflow workflow, BasicWorkflowDto dto, StepAssignInfo stepAssignInfo,
             StepDefine targetStepDefine, EWorkflowTraceType traceType, DateTime? expiredTime, bool isOrderFiled, EHandleMode handleMode,
             Action<Workflow, StepDefine, WorkflowStep, WorkflowStep>? stepConfig = null,
             CancellationToken cancellationToken = default)
@@ -1533,7 +1533,7 @@ namespace Hotline.FlowEngine.Workflows
         }
 
 
-        public Task<bool> RecallAsync(Workflow workflow, RecallDto dto, StepAssignInfo stepAssignInfo,
+        public Task<bool> RecallAsync(Workflow workflow, BasicWorkflowDto dto, StepAssignInfo stepAssignInfo,
             WorkflowStep targetStep, EWorkflowTraceType traceType, DateTime? expiredTime, bool isOrderFiled, EHandleMode handleMode,
             Action<Workflow, StepDefine, WorkflowStep, WorkflowStep>? stepConfig = null,
             CancellationToken cancellationToken = default)
@@ -2648,8 +2648,7 @@ namespace Hotline.FlowEngine.Workflows
 
             await _publisher.PublishAsync(new CountersignEndAssigned(workflow), PublishStrategy.ParallelWhenAll,
                 cancellationToken);
-
-
+            
             return nextSteps;
         }