Просмотр исходного кода

Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

tangjiang 1 месяц назад
Родитель
Сommit
a2ed972faa
1 измененных файлов с 9 добавлено и 10 удалено
  1. 9 10
      src/Hotline.Api/Controllers/OrderController.cs

+ 9 - 10
src/Hotline.Api/Controllers/OrderController.cs

@@ -6390,7 +6390,6 @@ public class OrderController : BaseController
                 HandlerType = dto.HandlerType,
                 BusinessType = dto.BusinessType,
             };
-            DateTime endTime = order.ExpiredTime!.Value;
             //todo
             //宜宾需求:1. 坐席申请特提:指派给申请人办理 2. 派单员申请特提:所有派单员都能办 3.其他特提场景:按节点原配置办理
             order.ProcessType = dto.FlowDirection is EFlowDirection.OrgToCenter or EFlowDirection.CenterToCenter or EFlowDirection.FiledToCenter
@@ -6452,15 +6451,15 @@ public class OrderController : BaseController
                 }
             }
 
-            // if (dto.BusinessType == EBusinessType.Send && recall.NextHandlers.Any())
-            // {
-            //     var flowStepHandler = recall.NextHandlers.FirstOrDefault();
-            //     await _orderRepository.Updateable().SetColumns(o => new Orders.Order()
-            //             { CenterToOrgHandlerId = flowStepHandler.UserId, CenterToOrgHandlerName = flowStepHandler.Username })
-            //         .Where(o => o.Id == order.Id).ExecuteCommandAsync(HttpContext.RequestAborted);
-            // }
-
-            var (workflow, targetStepDefine, currentStep, targetStep, newStep, isOrgToCenter) =
+			// if (dto.BusinessType == EBusinessType.Send && recall.NextHandlers.Any())
+			// {
+			//     var flowStepHandler = recall.NextHandlers.FirstOrDefault();
+			//     await _orderRepository.Updateable().SetColumns(o => new Orders.Order()
+			//             { CenterToOrgHandlerId = flowStepHandler.UserId, CenterToOrgHandlerName = flowStepHandler.Username })
+			//         .Where(o => o.Id == order.Id).ExecuteCommandAsync(HttpContext.RequestAborted);
+			// }
+			DateTime endTime = order.ExpiredTime!.Value;
+			var (workflow, targetStepDefine, currentStep, targetStep, newStep, isOrgToCenter) =
                 await _workflowDomainService.RecallAsync(
                     recall, recall.NextHandlers.FirstOrDefault(), EWorkflowTraceType.Redo,
                     endTime, order.Status >= EOrderStatus.Filed, EHandleMode.Redo,