工单待办

src/Hotline.Api/Controllers/OrderController.cs

@@ -2781,7 +2781,7 @@ public class OrderController : BaseController
         var (total, items) = await _orderRepository
             .Queryable(viewFilter: true, handlerFilter: !isHandled)
             //.Includes(d => d.OrderSpecials)
-			.WhereIF(dto.IsProvince.HasValue, d=> d.IsProvince == dto.IsProvince)
+            .WhereIF(dto.IsProvince.HasValue, d => d.IsProvince == dto.IsProvince)
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.No.Contains(dto.Keyword) || d.Title.Contains(dto.Keyword))
             .WhereIF(dto.IsCounterSign.HasValue && dto.IsCounterSign == true, d => d.CounterSignType.HasValue)
             .WhereIF(dto.IsCounterSign.HasValue && dto.IsCounterSign == false, d => !d.CounterSignType.HasValue)
@@ -2790,6 +2790,8 @@ public class OrderController : BaseController
             .Where(d => d.Source < ESource.MLSQ || d.Source > ESource.WZSC)
             .Where(d => d.Status != EOrderStatus.BackToProvince)
             //.Where(d=>d.OrderSpecials.Any(s=>s.State != 0 || s.Id ==  null ||  s.IsDeleted == null ))
+            //.LeftJoin(_orderSpecialRepository.Queryable(includeDeleted: true), (d, s) => d.Id == s.OrderId)
+            //.Where((d, s) => s.State != 0 || s.Id == null)
             .OrderByDescending(d => d.StartTime)
             .ToPagedListAsync(dto, HttpContext.RequestAborted);
 

src/Hotline/Orders/OrderDomainService.cs

@@ -230,7 +230,7 @@ public class OrderDomainService : IOrderDomainService, IScopeDependency
             List<(string userId, string username, IReadOnlyList<string> stepIds)> handlers = new();
             ; handlers.Add(new ValueTuple<string, string, IReadOnlyList<string>>(user.Id, user.Name, stepIds));
             var workflowIds = await _workflowDomainService.ChangeHandlerRangeAsync(OrderDefaults.SourceChannel.SendPoolId, handlers, cancellationToken);
-            var orders = await _orderRepository.Queryable().Where(d => workflowIds.Contains(d.WorkflowId))
+            var orders = await _orderRepository.Queryable().Includes(d => d.Workflow).Where(d => workflowIds.Contains(d.WorkflowId))
                 .ToListAsync(cancellationToken);
             foreach (var order in orders)
             {
@@ -292,7 +292,7 @@ public class OrderDomainService : IOrderDomainService, IScopeDependency
             if (handlers.Any())
             {
                 var workflowIds = await _workflowDomainService.ChangeHandlerRangeAsync(OrderDefaults.SourceChannel.SendPoolId, handlers, cancellationToken);
-                var orders = await _orderRepository.Queryable().Where(d => workflowIds.Contains(d.WorkflowId))
+                var orders = await _orderRepository.Queryable().Includes(d=>d.Workflow).Where(d => workflowIds.Contains(d.WorkflowId))
                     .ToListAsync(cancellationToken);
                 foreach (var order in orders)
                 {