startflow with no id return

src/Hotline.Api/Controllers/KnowledgeController.cs

@@ -615,16 +615,17 @@ namespace Hotline.Api.Controllers
             if (definition is null)
                 throw UserFriendlyException.SameMessage("未配置流程模板");
 
+            //知识审批主表
+            await _knowledgeDomainService.AddWorkFlowAsync(id, eKnowledgeApplyType, HttpContext.RequestAborted);
+
             dto.DefinitionCode = definition.Code;
             dto.Title = knowledge.Title;
-            var workflowId = await _workflowApplication.StartWorkflowAsync(dto, id, HttpContext.RequestAborted);
+            await _workflowApplication.StartWorkflowAsync(dto, id, HttpContext.RequestAborted);
 
-            //知识审批主表
-            await _knowledgeDomainService.AddWorkFlow(id, workflowId, eKnowledgeApplyType, HttpContext.RequestAborted);
 
-            if (eKnowledgeApplyType != EKnowledgeApplyType.Delete)
-                //修改流程ID
-                await _knowledgeDomainService.UpdateWorkFlowId(id, workflowId, HttpContext.RequestAborted);
+            //if (eKnowledgeApplyType != EKnowledgeApplyType.Delete)
+            //    //修改流程ID
+            //    await _knowledgeDomainService.UpdateWorkFlowId(id, workflowId, HttpContext.RequestAborted);
         }
         #endregion
 

src/Hotline.Api/Controllers/OrderController.cs

@@ -210,9 +210,9 @@ public class OrderController : BaseController
             throw UserFriendlyException.SameMessage("未配置流程模板");
         dto.DefinitionCode = definition.Code;
         dto.Title = order.Title;
-        var workflowId = await _workflowApplication.StartWorkflowAsync(dto, order.Id, HttpContext.RequestAborted);
-        order.StartManageFlow(workflowId);
+        order.StartManageFlow();
         await _orderRepository.UpdateAsync(order, HttpContext.RequestAborted);
+        await _workflowApplication.StartWorkflowAsync(dto, order.Id, HttpContext.RequestAborted);
     }
 
     /// <summary>

src/Hotline.Api/Controllers/PbxController.cs

@@ -244,9 +244,11 @@ namespace Hotline.Api.Controllers
 
             bool isApply = bool.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.RestApproval).SettingValue);
             var telRest = new TelRest(work.TelId, work.TelNo, work.UserId, work.UserName, dto.Reason, isApply);
+            await _telRestRepository.AddAsync(telRest, HttpContext.RequestAborted);
             if (!isApply)
             {
-                await _deviceManager.TelRestAsync(telRest.TelNo, HttpContext.RequestAborted);
+                //await _deviceManager.TelRestAsync(telRest.TelNo, HttpContext.RequestAborted);
+                await _telDomainService.TelRestApplyPassAsync(telRest.Id, HttpContext.RequestAborted);
             }
             else
             {
@@ -257,9 +259,9 @@ namespace Hotline.Api.Controllers
                     throw UserFriendlyException.SameMessage("未配置流程模板");
                 startWorkflowDto.DefinitionCode = definition.Code;
                 startWorkflowDto.Title = dto.Reason;
-                telRest.WorkflowId = await _workflowApplication.StartWorkflowAsync(startWorkflowDto, telRest.Id, HttpContext.RequestAborted);
+                await _workflowApplication.StartWorkflowAsync(startWorkflowDto, telRest.Id, HttpContext.RequestAborted);
             }
-            await _telRestRepository.AddAsync(telRest, HttpContext.RequestAborted);
+            //await _telRestRepository.AddAsync(telRest, HttpContext.RequestAborted);
         }
 
         /// <summary>

src/Hotline.Application/FlowEngine/IWorkflowApplication.cs

@@ -8,7 +8,7 @@ namespace Hotline.Application.FlowEngine
 {
     public interface IWorkflowApplication
     {
-        Task<string> StartWorkflowAsync(StartWorkflowDto dto, string? externalId = null, CancellationToken cancellationToken = default);
+        Task StartWorkflowAsync(StartWorkflowDto dto, string? externalId = null, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// 流转至下一节点（节点办理）

src/Hotline.Application/FlowEngine/WorkflowApplication.cs

@@ -52,7 +52,7 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
         _sessionContext = sessionContext;
     }
 
-    public async Task<string> StartWorkflowAsync(StartWorkflowDto dto, string? externalId = null, CancellationToken cancellationToken = default)
+    public async Task StartWorkflowAsync(StartWorkflowDto dto, string? externalId = null, CancellationToken cancellationToken = default)
     {
         if (string.IsNullOrEmpty(dto.DefinitionCode) && string.IsNullOrEmpty(dto.DefinitionModuleCode))
             throw new UserFriendlyException("非法参数");
@@ -75,8 +75,6 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
 
         //更新接办部门(详情页面展示)
         await AddOrUpdateAssignAsync(workflow, dto, nextStepBoxDefine, cancellationToken);
-
-        return workflow.Id;
     }
 
     /// <summary>

src/Hotline.Application/Handlers/FlowEngine/EndWorkflowHandler.cs

@@ -1,4 +1,5 @@
-using Hotline.FlowEngine.Notifications;
+using Hotline.CallCenter.Tels;
+using Hotline.FlowEngine.Notifications;
 using Hotline.KnowledgeBase;
 using Hotline.Orders;
 using Hotline.Settings;
@@ -12,13 +13,17 @@ public class EndWorkflowHandler : INotificationHandler<EndWorkflowNotify>
 
     private readonly IKnowledgeDomainService _knowledgeDomainService;
     private readonly IOrderDomainService _orderDomainService;
+    private readonly ITelDomainService _telDomainService;
 
     public EndWorkflowHandler(
         IKnowledgeDomainService knowledgeDomainService,
-        IOrderDomainService orderDomainService)
+        IOrderDomainService orderDomainService,
+        ITelDomainService telDomainService
+        )
     {
         _knowledgeDomainService = knowledgeDomainService;
         _orderDomainService = orderDomainService;
+        _telDomainService = telDomainService;
     }
 
     /// <summary>Handles a notification</summary>
@@ -37,8 +42,7 @@ public class EndWorkflowHandler : INotificationHandler<EndWorkflowNotify>
                 break;
 
             case WorkflowModuleConsts.TelRestApply:
-                //TODO 审核通过
-                //notification.Workflow.ExternalId;
+                await _telDomainService.TelRestApplyPassAsync(workflow.ExternalId, cancellationToken);
                 break;
 
             case WorkflowModuleConsts.OrderManage:

src/Hotline.Application/Handlers/FlowEngine/StartWorkflowHandler.cs

@@ -1,5 +1,7 @@
 using System.Text.Json;
+using Hotline.CallCenter.Tels;
 using Hotline.FlowEngine.Notifications;
+using Hotline.KnowledgeBase;
 using Hotline.Orders;
 using Hotline.Settings;
 using MediatR;
@@ -10,13 +12,19 @@ namespace Hotline.Application.Handlers.FlowEngine
     public class StartWorkflowHandler : INotificationHandler<StartWorkflowNotify>
     {
         private readonly IOrderDomainService _orderDomainService;
+        private readonly IKnowledgeDomainService _knowledgeDomainService;
+        private readonly ITelDomainService _telDomainService;
         private readonly ILogger<StartWorkflowHandler> _logger;
 
         public StartWorkflowHandler(
             IOrderDomainService orderDomainService,
+            IKnowledgeDomainService knowledgeDomainService,
+            ITelDomainService telDomainService,
             ILogger<StartWorkflowHandler> logger)
         {
             _orderDomainService = orderDomainService;
+            _knowledgeDomainService = knowledgeDomainService;
+            _telDomainService = telDomainService;
             _logger = logger;
         }
 
@@ -32,9 +40,17 @@ namespace Hotline.Application.Handlers.FlowEngine
             switch (workflow.ModuleCode)
             {
                 case WorkflowModuleConsts.OrderManage:
-                    await _orderDomainService.ManageFlowNextAsync(notification.FlowAssignMode,
-                        notification.IsCountersignStart, false,
-                        workflow.ExternalId, workflow.CurrentStepTime, workflow.CurrentStepName, workflow.ExpiredTime, cancellationToken);
+                    await _orderDomainService.ManageFlowStartAsync(notification.FlowAssignMode,
+                        notification.IsCountersignStart, workflow.ExternalId, workflow.Id,
+                        workflow.CurrentStepTime, workflow.CurrentStepName, workflow.ExpiredTime, cancellationToken);
+                    break;
+                case WorkflowModuleConsts.KnowledgeAdd:
+                case WorkflowModuleConsts.KnowledgeUpdate:
+                case WorkflowModuleConsts.KnowledgeDelete:
+                    await _knowledgeDomainService.UpdateWorkFlowId(notification.FlowAssignMode, workflow.ExternalId, workflow.Id, cancellationToken);
+                    break;
+                case WorkflowModuleConsts.TelRestApply:
+                    await _telDomainService.TelRestFlowStartAsync(notification.FlowAssignMode, workflow.ExternalId, workflow.Id, cancellationToken);
                     break;
             }
         }

src/Hotline.Share/Enums/Order/ERestApplyStatus.cs → src/Hotline.Share/Enums/CallCenter/ETelRestApplyStatus.cs

@@ -1,7 +1,6 @@
-
-namespace Hotline.Share.Enums.Order
+namespace Hotline.Share.Enums.CallCenter
 {
-    public enum ERestApplyStatus
+    public enum ETelRestApplyStatus
     {
         /// <summary>
         /// 待审核

src/Hotline/CallCenter/Tels/ITelDomainService.cs

@@ -1,4 +1,5 @@
-using Hotline.Users;
+using Hotline.FlowEngine;
+using Hotline.Users;
 
 namespace Hotline.CallCenter.Tels
 {
@@ -38,21 +39,26 @@ namespace Hotline.CallCenter.Tels
         /// <returns></returns>
         Task<List<TelGroup>> QueryTelGroupsAsync(CancellationToken cancellationToken);
 
+        /// <summary>
+        /// 分机休息审批流程开始
+        /// </summary>
+        Task TelRestFlowStartAsync(FlowAssignMode assignMode, string? telRestId, string workflowId, CancellationToken cancellationToken);
+
         /// <summary>
         /// 分机休息
         /// </summary>
         /// <param name="currentWork"></param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        Task<string> RestAsync(Work currentWork,string reason,bool isApply, CancellationToken cancellationToken);
-        
+        Task<string> RestAsync(Work currentWork, string reason, bool isApply, CancellationToken cancellationToken);
+
         /// <summary>
         /// 分机小休审批通过
         /// </summary>
         /// <param name="id"></param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        Task RestApplyPass(string id, CancellationToken cancellationToken);
+        Task TelRestApplyPassAsync(string? id, CancellationToken cancellationToken);
 
         /// <summary>
         /// 分机结束休息
@@ -68,7 +74,7 @@ namespace Hotline.CallCenter.Tels
         /// <param name="telId"></param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        Task HoldAsync(string telId,string userId,string userName,string callId, CancellationToken cancellationToken);
+        Task HoldAsync(string telId, string userId, string userName, string callId, CancellationToken cancellationToken);
 
         /// <summary>
         /// 恢复通话(解除hold状态)
@@ -76,7 +82,7 @@ namespace Hotline.CallCenter.Tels
         /// <param name="telId"></param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        Task UnHoldAsync(string telId,string userId,string callId, CancellationToken cancellationToken);
+        Task UnHoldAsync(string telId, string userId, string callId, CancellationToken cancellationToken);
 
         /// <summary>
         /// 开启静音

src/Hotline/CallCenter/Tels/TelDomainService.cs

@@ -3,9 +3,11 @@ using Hotline.CallCenter.Devices;
 using Hotline.Realtimes;
 using Hotline.Users;
 using System.Reflection;
+using Hotline.FlowEngine;
 using XF.Domain.Constants;
 using XF.Domain.Dependency;
 using XF.Domain.Exceptions;
+using Hotline.Share.Enums.CallCenter;
 
 namespace Hotline.CallCenter.Tels;
 
@@ -48,6 +50,21 @@ public class TelDomainService : ITelDomainService, IScopeDependency
     public Task<List<TelGroup>> QueryTelGroupsAsync(CancellationToken cancellationToken)
         => _deviceManager.QueryTelGroupsAsync(cancellationToken);
 
+    /// <summary>
+    /// 分机休息审批流程开始
+    /// </summary>
+    public async Task TelRestFlowStartAsync(FlowAssignMode assignMode, string? telRestId, string workflowId, CancellationToken cancellationToken)
+    {
+        if (string.IsNullOrEmpty(telRestId))
+            throw UserFriendlyException.SameMessage("无效分机休息编号");
+        var telRest = await _telRestRepository.GetAsync(telRestId, cancellationToken);
+        if (telRest == null)
+            throw new UserFriendlyException($"无效分机休息编号, telRestId: {telRestId}", "无效分机休息编号");
+        telRest.WorkflowId = workflowId;
+        telRest.Assign(assignMode.FlowAssignType, assignMode.Handlers);
+        await _telRestRepository.UpdateAsync(telRest, cancellationToken);
+    }
+
     /// <summary>
     /// 分机休息
     /// </summary>
@@ -73,17 +90,22 @@ public class TelDomainService : ITelDomainService, IScopeDependency
     /// <param name="id"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    public async Task RestApplyPass(string id, CancellationToken cancellationToken)
+    public async Task TelRestApplyPassAsync(string? id, CancellationToken cancellationToken)
     {
-        var telrest = await _telRestRepository.GetAsync(id, cancellationToken);
-        if (telrest != null)
-        {
-            telrest.ApplyStatus = Share.Enums.Order.ERestApplyStatus.Resting;
-            telrest.StartTime = DateTime.Now;
-            await _telRestRepository.UpdateAsync(telrest, cancellationToken);
-            //通知前端休息通过
-            await _realtimeService.RestApplyPassAsync(telrest.UserId, cancellationToken);
-        }
+        if (string.IsNullOrEmpty(id))
+            throw UserFriendlyException.SameMessage("无效分机休息编号");
+        var telRest = await _telRestRepository.GetAsync(id, cancellationToken);
+        if (telRest == null)
+            throw new UserFriendlyException($"无效分机休息编号, telRestId: {id}", "无效分机休息编号");
+
+        await _deviceManager.TelRestAsync(telRest.TelNo, cancellationToken);
+
+        telRest.ApplyStatus = ETelRestApplyStatus.Resting;
+        telRest.StartTime = DateTime.Now;
+        await _telRestRepository.UpdateAsync(telRest, cancellationToken);
+        //通知前端休息通过
+        await _realtimeService.RestApplyPassAsync(telRest.UserId, cancellationToken);
+
     }
 
     /// <summary>

src/Hotline/CallCenter/Tels/TelRest.cs

@@ -1,5 +1,5 @@
 using System.ComponentModel;
-using Hotline.Share.Enums.Order;
+using Hotline.Share.Enums.CallCenter;
 using SqlSugar;
 using XF.Domain.Entities;
 using XF.Domain.Repository;
@@ -52,7 +52,7 @@ namespace Hotline.CallCenter.Tels
         /// <summary>
         /// 审核状态
         /// </summary>
-        public ERestApplyStatus ApplyStatus { get; set; }
+        public ETelRestApplyStatus ApplyStatus { get; set; }
 
         public TelRest()
         {
@@ -65,11 +65,11 @@ namespace Hotline.CallCenter.Tels
 
             if(isApply)
             {
-                ApplyStatus = ERestApplyStatus.NoAudit;
+                ApplyStatus = ETelRestApplyStatus.NoAudit;
             }
             else
             {
-                ApplyStatus = ERestApplyStatus.Resting;
+                ApplyStatus = ETelRestApplyStatus.Resting;
                 StartTime = DateTime.Now;
             }
         }

src/Hotline/KnowledgeBase/IKnowledgeDomainService.cs

@@ -1,4 +1,5 @@
-using Hotline.FlowEngine.Workflows;
+using Hotline.FlowEngine;
+using Hotline.FlowEngine.Workflows;
 using Hotline.Share.Dtos.Knowledge;
 using Hotline.Share.Enums.KnowledgeBase;
 
@@ -39,11 +40,10 @@ namespace Hotline.KnowledgeBase
         /// 知识审批主表
         /// </summary>
         /// <param name="knowId">知识Id</param>
-        /// <param name="workFlowId">流程ID</param>
         /// <param name="eKnowledgeApplyType">申请类型</param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        Task<string> AddWorkFlow(string knowId, string workFlowId, EKnowledgeApplyType eKnowledgeApplyType, CancellationToken cancellationToken);
+        Task<string> AddWorkFlowAsync(string knowId, EKnowledgeApplyType eKnowledgeApplyType, CancellationToken cancellationToken);
 
         /// <summary>
         /// 修改流程ID
@@ -52,7 +52,7 @@ namespace Hotline.KnowledgeBase
         /// <param name="workFlowId"></param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        Task UpdateWorkFlowId(string knowledgeId, string workFlowId, CancellationToken cancellationToken);
+        Task UpdateWorkFlowId(FlowAssignMode assignMode, string? knowledgeId, string workFlowId, CancellationToken cancellationToken);
 
         /// <summary>
         /// 撤销

src/Hotline/KnowledgeBase/KnowledgeDomainService.cs

@@ -1,4 +1,5 @@
-using Hotline.FlowEngine.Workflows;
+using Hotline.FlowEngine;
+using Hotline.FlowEngine.Workflows;
 using Hotline.Settings;
 using Hotline.Share.Dtos.Knowledge;
 using Hotline.Share.Enums.KnowledgeBase;
@@ -80,18 +81,16 @@ namespace Hotline.KnowledgeBase
         /// 知识审批主表
         /// </summary>
         /// <param name="knowId">知识Id</param>
-        /// <param name="workFlowId">流程ID</param>
         /// <param name="eKnowledgeApplyType">申请类型</param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        public async Task<string> AddWorkFlow(string knowId, string workFlowId, EKnowledgeApplyType eKnowledgeApplyType, CancellationToken cancellationToken)
+        public async Task<string> AddWorkFlowAsync(string knowId, EKnowledgeApplyType eKnowledgeApplyType, CancellationToken cancellationToken)
         {
             KnowledgeWorkFlow workFlow = new()
             {
                 KnowledgeId = knowId,
                 WorkflowModuleStatus = eKnowledgeApplyType,
                 WorkFlowApplyStatus = EKnowledgeWorkFlowStatus.Auditing,
-                WorkflowId = workFlowId
             };
             return await _knowledgeWorkFlowRepository.AddAsync(workFlow, cancellationToken);
         }
@@ -99,15 +98,32 @@ namespace Hotline.KnowledgeBase
         /// <summary>
         /// 修改流程ID
         /// </summary>
+        /// <param name="assignMode"></param>
         /// <param name="knowledgeId"></param>
         /// <param name="workFlowId"></param>
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
-        public async Task UpdateWorkFlowId(string knowledgeId, string workFlowId, CancellationToken cancellationToken)
+        public async Task UpdateWorkFlowId(FlowAssignMode assignMode, string? knowledgeId, string workFlowId, CancellationToken cancellationToken)
         {
-            var knowledge = await _knowledgeRepository.GetAsync(knowledgeId, cancellationToken);
-            knowledge.WorkflowId = workFlowId;
-            await _knowledgeRepository.UpdateAsync(knowledge, cancellationToken);
+            if (string.IsNullOrEmpty(knowledgeId))
+                throw UserFriendlyException.SameMessage("无效知识编号");
+            var knowledgeFlow =
+                await _knowledgeWorkFlowRepository.GetAsync(d => d.KnowledgeId == knowledgeId, cancellationToken);
+            if (knowledgeFlow == null)
+                throw new UserFriendlyException($"无效知识编号, knowledgeId: {knowledgeId}", "无效知识编号");
+            knowledgeFlow.WorkflowId = workFlowId;
+            knowledgeFlow.Assign(assignMode.FlowAssignType, assignMode.Handlers);
+            await _knowledgeWorkFlowRepository.UpdateAsync(knowledgeFlow, cancellationToken);
+
+            if (knowledgeFlow.WorkflowModuleStatus != EKnowledgeApplyType.Delete)
+            {
+                var knowledge = await _knowledgeRepository.GetAsync(knowledgeId, cancellationToken);
+                if (knowledge == null)
+                    throw new UserFriendlyException($"无效知识编号, knowledgeId: {knowledgeId}", "无效知识编号");
+                knowledge.WorkflowId = workFlowId;
+                knowledge.Assign(assignMode.FlowAssignType, assignMode.Handlers);
+                await _knowledgeRepository.UpdateAsync(knowledge, cancellationToken);
+            }
         }
 
         /// <summary>

src/Hotline/Orders/IOrderDomainService.cs

@@ -23,11 +23,17 @@ namespace Hotline.Orders
         /// </summary>
         Task AcceptAsync(string? orderId, CancellationToken cancellationToken);
 
+        /// <summary>
+        /// 工单办理流程开始(流程开始后触发)
+        /// </summary>
+        Task ManageFlowStartAsync(FlowAssignMode assignMode, bool isCountersignStart, string? orderId, string workflowId, 
+            DateTime? currentStepTime, string? currentStepName, DateTime expiredTime, CancellationToken cancellationToken);
+
         /// <summary>
         /// 工单办理流程流转(每个节点办理都会触发)
         /// </summary>
         Task ManageFlowNextAsync(FlowAssignMode assignMode, bool isCountersignStart, bool isCountersignEnd,
-            string? orderId, DateTime? currentStepTime, string? CurrentStepName, DateTime expiredTime, CancellationToken cancellationToken);
+            string? orderId, DateTime? currentStepTime, string? currentStepName, DateTime expiredTime, CancellationToken cancellationToken);
 
         /// <summary>
         /// 工单最终办理（此完结流程并未结束）

src/Hotline/Orders/Order.cs

@@ -263,10 +263,8 @@ namespace Hotline.Orders
         /// <summary>
         /// 开始工单办理流程
         /// </summary>
-        /// <param name="workflowId"></param>
-        public void StartManageFlow(string workflowId)
+        public void StartManageFlow()
         {
-            WorkflowId = workflowId;
             Status = EOrderStatus.WaitForSign;
         }
 

src/Hotline/Orders/OrderDomainService.cs

@@ -65,15 +65,33 @@ public class OrderDomainService : IOrderDomainService, IScopeDependency
         await _orderRepository.UpdateAsync(order, cancellationToken);
     }
 
+    /// <summary>
+    /// 工单办理流程开始(流程开始后触发)
+    /// </summary>
+    public async Task ManageFlowStartAsync(FlowAssignMode assignMode, bool isCountersignStart, string? orderId, string workflowId,
+        DateTime? currentStepTime, string? currentStepName, DateTime expiredTime, CancellationToken cancellationToken)
+    {
+        var order = await GetOrderAsync(orderId, cancellationToken);
+        CheckOrderIfFiled(order);
+        order.WorkflowId = workflowId;
+
+        //更新指派信息
+        order.Assign(assignMode.FlowAssignType, assignMode.Handlers);
+
+        //更新流转信息
+        order.ManageFlow(isCountersignStart, false, currentStepTime, currentStepName, expiredTime);
+
+        await _orderRepository.UpdateAsync(order, cancellationToken);
+    }
+
     /// <summary>
     /// 工单办理(每个节点都会触发)
     /// </summary>
     public async Task ManageFlowNextAsync(FlowAssignMode assignMode,
         bool isCountersignStart, bool isCountersignEnd,
-        string? orderId, DateTime? currentStepTime, string? CurrentStepName, DateTime expiredTime,
+        string? orderId, DateTime? currentStepTime, string? currentStepName, DateTime expiredTime,
         CancellationToken cancellationToken)
     {
-        _logger.LogInformation($"{nameof(ManageFlowNextAsync)}");
         var order = await GetOrderAsync(orderId, cancellationToken);
         CheckOrderIfFiled(order);
 
@@ -83,7 +101,7 @@ public class OrderDomainService : IOrderDomainService, IScopeDependency
         _logger.LogInformation($"{nameof(ManageFlowNextAsync)}, after: order.AssignUserIds: {string.Join(',', order.AssignUserIds)}, order.AssignOrgs: {string.Join(',', order.AssignOrgCodes)}");
 
         //更新流转信息
-        order.ManageFlow(isCountersignStart, isCountersignEnd, currentStepTime, CurrentStepName, expiredTime);
+        order.ManageFlow(isCountersignStart, isCountersignEnd, currentStepTime, currentStepName, expiredTime);
         _logger.LogInformation($"更新流转信息 over, order.AssignUserIds: {string.Join(',', order.AssignUserIds)}");
         await _orderRepository.UpdateAsync(order, cancellationToken);
         _logger.LogInformation($"update db over, order.AssignUserIds: {string.Join(',', order.AssignUserIds)}");