src/Hotline.Api/Controllers/OrderController.cs

@@ -33,11 +33,6 @@ using XF.Domain.Constants;
 using XF.Domain.Exceptions;
 using XF.Domain.Repository;
 using XF.Utility.EnumExtensions;
-using Microsoft.IdentityModel.Tokens;
-using System.Linq;
-using Hotline.Share.Dtos.FlowEngine.Workflow;
-using System.Diagnostics;
-using System.Transactions;
 
 namespace Hotline.Api.Controllers;
 

src/Hotline.Application/FlowEngine/WorkflowApplication.cs

@@ -238,9 +238,11 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
     {
         var workflow = await _workflowDomainService.GetWorkflowAsync(dto.WorkflowId, true, true, cancellationToken: cancellationToken);
 
-        await _orderDomainService.ReadyToRecallAsync(workflow.ExternalId, cancellationToken);
+        //await _orderDomainService.ReadyToRecallAsync(workflow.ExternalId, cancellationToken);
 
         var targetStepDefine = _workflowDomainService.GetStepDefine(workflow.WorkflowDefinition, dto.NextStepCode);
+        if (targetStepDefine.StepType is EStepType.End)
+            throw UserFriendlyException.SameMessage("结束节点不支持撤回");
         //var isStartCountersign = targetStepDefine.CouldPrevStartCountersign(dto.NextHandlers.Count);
         var flowAssignInfo =
             await GetNextStepFlowAssignInfoByDefineAsync(targetStepDefine, dto.IsStartCountersign, dto.NextHandlers, cancellationToken);
@@ -544,7 +546,7 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
     }
 
     /// <summary>
-    /// 查询撤回可选节点
+    /// 查询撤回可选节点及办理对象
     /// </summary>
     public async Task<RecallStepsDto> GetRecallStepsAsync(string workflowId, CancellationToken cancellationToken)
     {

src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -468,9 +468,6 @@ namespace Hotline.FlowEngine.Workflows
         /// </summary>
         public async Task RecallAsync(Workflow workflow, RecallDto dto, StepDefine targetStepDefine, FlowAssignInfo flowAssignInfo, CancellationToken cancellationToken)
         {
-            if (targetStepDefine.StepType is EStepType.End)
-                throw UserFriendlyException.SameMessage("结束节点不支持撤回");
-
             var targetStep = workflow.Steps.FirstOrDefault(d => d.Code == dto.NextStepCode && d.IsOrigin);
             if (targetStep is null)
                 throw UserFriendlyException.SameMessage("该流程尚未流转至该节点");

src/Hotline/Orders/OrderDomainService.cs

@@ -113,6 +113,8 @@ public class OrderDomainService : IOrderDomainService, IScopeDependency
         if (order.OrderScreens.Any())
             throw UserFriendlyException.SameMessage("已甄别工单无法撤回或跳转");
 
+        //todo 需求调整：P72， 4，5，6，7，8，9，10
+
         if (order.OrderPublish is not null)
             await _orderPublishRepository.RemoveAsync(order.OrderPublish, cancellationToken: cancellationToken);