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

src/Hotline.Api/Controllers/OrderController.cs

@@ -4029,7 +4029,7 @@ public class OrderController : BaseController
     public async Task<PagedDto<OrderDto>> QueryWaited([FromQuery] QueryOrderWaitedDto dto)
     {
         var isHandledStep = dto.IsHandled.HasValue && dto.IsHandled.Value;
-        if (!isHandledStep)
+        if (isHandledStep)
 	        dto.QueryType = null;
 
 		var isAdmin = _orderDomainService.IsCheckAdmin();

src/Hotline.Application/Orders/OrderApplication.cs

@@ -1329,7 +1329,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
         return _orderSpecialDetailRepository.Queryable()
             .Includes(x => x.OrderSpecial)
             .WhereIF(!string.IsNullOrEmpty(dto.OrgName), x => x.OrgName.Contains(dto.OrgName!))
-            .Where(x => x.OrderSpecial.SpecialType == ESpecialType.ReTransact)
+            .Where(x => x.OrderSpecial.SpecialType == ESpecialType.ReTransact || x.OrderSpecial.SpecialType == ESpecialType.SendBack )
             .Where(x => x.OrderSpecial.CreationTime >= dto.StartTime)
             .Where(x => x.OrderSpecial.CreationTime <= dto.EndTime)
             .GroupBy(x => new { Time = x.OrderSpecial.CreationTime.ToString("yyyy-MM-dd"), x.OrgId, x.OrgName })
@@ -1359,7 +1359,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             .WhereIF(!string.IsNullOrEmpty(dto.OrgName), x => x.OrgName.Contains(dto.OrgName!))
             .WhereIF(!string.IsNullOrEmpty(dto.ErrorName), x => x.ErrorName.Contains(dto.ErrorName!))
             .WhereIF(!string.IsNullOrEmpty(dto.No), x => x.OrderSpecial!.Order!.No!.Contains(dto.No!))
-            .Where(x => x.OrderSpecial.SpecialType == ESpecialType.ReTransact)
+            .Where(x => x.OrderSpecial.SpecialType == ESpecialType.ReTransact || x.OrderSpecial.SpecialType == ESpecialType.SendBack)
             .Where(x => x.OrderSpecial.CreationTime >= dto.StartTime)
             .Where(x => x.OrderSpecial.CreationTime <= dto.EndTime);
     }
@@ -2477,10 +2477,9 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             }
 
             _mapper.Map(expiredTimeConfig, order);
-            //await _orderRepository.UpdateAsync(order, cancellationToken);
-
-            //特提（撤回至发起)
-            if (!string.IsNullOrEmpty(order.WorkflowId))
+            await _orderRepository.UpdateAsync(order, cancellationToken);
+			//特提（撤回至发起)
+			if (!string.IsNullOrEmpty(order.WorkflowId))
             {
                 //await _workflowDomainService.RecallToStartStepAsync(order.WorkflowId, "省工单重派", current, order.Status >= EOrderStatus.Filed, cancellationToken);
                 var isPaiDan = await _workflowDomainService.RecallToCenterFirstToSendAsync(order.WorkflowId, "省工单重派", order.Status >= EOrderStatus.Filed,
@@ -2494,10 +2493,11 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                 {
                     order.Status = EOrderStatus.WaitForAccept;
                 }
-                //await _orderRepository.UpdateAsync(order, cancellationToken);
-                //处理回访和发布信息
+                await _orderRepository.Updateable().SetColumns(o => new Order{ Status = order.Status }).Where(o => o.Id == order.Id).ExecuteCommandAsync(cancellationToken);
+				//await _orderRepository.UpdateAsync(order, cancellationToken);
+				//处理回访和发布信息
 
-                var publish = await _orderPublishRepository.GetAsync(x => x.OrderId == order.Id);
+				var publish = await _orderPublishRepository.GetAsync(x => x.OrderId == order.Id);
                 if (publish != null)
                 {
                     var publishHistory = _mapper.Map<OrderPublishHistory>(publish);
@@ -2520,7 +2520,6 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                 }
 
             }
-			await _orderRepository.UpdateAsync(order, cancellationToken);
 			//await _workflowDomainService.RecallToStartStepAsync(order.WorkflowId, "省工单重派", current, cancellationToken);
 		}
         return _mapper.Map<AddOrderResponse>(order);