Merge branch 'master' of http://git.12345lm.cn/Fengwo/hotline

src/Hotline.Api/Controllers/OrderController.cs

@@ -2074,7 +2074,7 @@ public class OrderController : BaseController
     {
         var order = await _orderRepository.Queryable()
             .Includes(d => d.OrderExtension)
-            //.Includes(d => d.OrderDelays)
+            .Includes(d => d.OrderDelays)
             //.Includes(d => d.OrderScreens)
             .Includes(d => d.OrderVisits, x => x.OrderVisitDetails)
             .Includes(d => d.OrderVisits, x => x.Employee)
@@ -2100,6 +2100,9 @@ public class OrderController : BaseController
         var dto = _mapper.Map<OrderDto>(order!);
         dto.CountersignId = countersignId;
         dto.CanHandle = order.CanHandle(_sessionContext.RequiredUserId, _sessionContext.RequiredOrgId);
+        dto.IsCanDelay = !order.OrderDelays.Any(x => x.DelayState == EDelayState.Examining);
+        var delayModel = order.OrderDelays.Where(x => x.DelayState == EDelayState.Pass).OrderByDescending(x => x.CreationTime).FirstOrDefault();
+        dto.DelayString = delayModel != null ? delayModel?.DelayNum + "个" + delayModel?.DelayUnit.GetDescription() : "";
 
         if (dto.FileJson != null && dto.FileJson.Any())
         {

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

@@ -1,8 +1,6 @@
-using Hotline.CallCenter.Tels;
-using Hotline.FlowEngine.Notifications;
+using Hotline.FlowEngine.Notifications;
 using Hotline.FlowEngine.WorkflowModules;
 using Hotline.KnowledgeBase;
-using Hotline.Orders;
 using MediatR;
 
 namespace Hotline.Application.Handlers.FlowEngine;