xf 1 vuosi sitten
vanhempi
commit
7bbacb99c2

+ 2 - 2
src/Hotline.Api/Controllers/OrderController.cs

@@ -1897,8 +1897,8 @@ public class OrderController : BaseController
         {
             if (order.Source is ESource.ProvinceStraight)
             {
-                //todo 特提(撤回至派单
-                await _workflowApplication.RecallToSendAsync(order.WorkflowId, "省工单重派", HttpContext.RequestAborted);
+                //todo 特提(撤回至发起
+                await _workflowApplication.RecallToStartAsync(order.WorkflowId, "省工单重派", HttpContext.RequestAborted);
             }
 
             return _mapper.Map<AddOrderResponse>(order);

+ 2 - 2
src/Hotline.Application/FlowEngine/IWorkflowApplication.cs

@@ -26,9 +26,9 @@ namespace Hotline.Application.FlowEngine
         Task RecallAsync(RecallDto dto, CancellationToken cancellationToken);
 
         /// <summary>
-        /// 撤回至派单节点
+        /// 撤回至发起人节点
         /// </summary>
-        Task RecallToSendAsync(string workflowId, string opinion, CancellationToken cancellationToken);
+        Task RecallToStartAsync(string workflowId, string opinion, CancellationToken cancellationToken);
 
         /// <summary>
         /// 跳转至任意节点

+ 5 - 6
src/Hotline.Application/FlowEngine/WorkflowApplication.cs

@@ -252,16 +252,15 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
     /// <summary>
     /// 撤回至派单节点
     /// </summary>
-    public async Task RecallToSendAsync(string workflowId, string opinion, CancellationToken cancellationToken)
+    public async Task RecallToStartAsync(string workflowId, string opinion, CancellationToken cancellationToken)
     {
-        //var workflow = await _workflowDomainService.GetWorkflowAsync(workflowId, true, true, cancellationToken: cancellationToken);
+        var workflow = await _workflowDomainService.GetWorkflowAsync(workflowId, true, true, cancellationToken: cancellationToken);
 
-        //await _orderDomainService.ReadyToRecallAsync(workflow.ExternalId, cancellationToken);
+        var targetStepDefine = workflow.WorkflowDefinition.FindSendStepDefine();
 
-        //var targetStep = workflow.WorkflowDefinition.FindSendStepDefine();
         //var targetStepDefine = _workflowDomainService.GetStepDefine(workflow.WorkflowDefinition, targetStep.Code);
-        //var flowAssignInfo = await GetNextStepFlowAssignInfoByDefineAsync(targetStepDefine, false, dto.NextHandlers, cancellationToken);
-        //await _workflowDomainService.RecallAsync(workflow, dto, targetStepDefine, flowAssignInfo, cancellationToken);
+        var flowAssignInfo = await GetNextStepFlowAssignInfoByDefineAsync(targetStepDefine, false, dto.NextHandlers, cancellationToken);
+        await _workflowDomainService.RecallAsync(workflow, dto, targetStepDefine, flowAssignInfo, cancellationToken);
     }
 
     /// <summary>