fixed: 批量归档未查询会签数据

src/Hotline.Api/Controllers/OrderController.cs

@@ -310,8 +310,8 @@ public class OrderController : BaseController
             .WhereIF(!string.IsNullOrEmpty(dto.AcceptType), d => d.AcceptTypeCode == dto.AcceptType) //受理类型
             .WhereIF(!string.IsNullOrEmpty(dto.Hotspot), d => d.HotspotSpliceName != null && d.HotspotSpliceName.Contains(dto.Hotspot))
             .WhereIF(!string.IsNullOrEmpty(dto.FromPhone), d => d.FromPhone == dto.FromPhone) //来电号码
-                                                                                              //.WhereIF(!string.IsNullOrEmpty(dto.PubMan),
-                                                                                              //    d => d.AcceptorName.Contains(dto.PubMan!) || d.AcceptorStaffNo.Contains(dto.PubMan!))
+            //.WhereIF(!string.IsNullOrEmpty(dto.PubMan),
+            //    d => d.AcceptorName.Contains(dto.PubMan!) || d.AcceptorStaffNo.Contains(dto.PubMan!))
             .WhereIF(dto.PubRange == EPublicState.Pub, d => d.OrderPublish.PublishState)
             .WhereIF(dto.PubRange == EPublicState.NoPub, d => !d.OrderPublish.PublishState)
             .WhereIF(dto.IsProvinceOrder.HasValue && dto.IsProvinceOrder == true, d => d.Source == ESource.ProvinceStraight)
@@ -383,7 +383,7 @@ public class OrderController : BaseController
     {
         //验证订单
         var order = await _orderRepository.GetAsync(dto.Id, HttpContext.RequestAborted)
-            ?? throw UserFriendlyException.SameMessage("未找到工单，无法发布");
+                    ?? throw UserFriendlyException.SameMessage("未找到工单，无法发布");
 
         if (order.Status != EOrderStatus.Filed)
             throw UserFriendlyException.SameMessage("当前状态无法发布");
@@ -777,16 +777,16 @@ public class OrderController : BaseController
     /// <returns></returns>
     [HttpPut("publish/cancel")]
     [LogFilter("取消发布")]
-    public async Task<string> PublishCancelAsync([FromBody]PublishCancelInDto dto)
+    public async Task<string> PublishCancelAsync([FromBody] PublishCancelInDto dto)
     {
         var enabled = _systemSettingCacheManager.CancelPublishOrderEnabled;
         if (enabled == false) return "取消发布功能已被关闭";
 
         var publish = await _orderPublishRepository.GetAsync(dto.OrderPublishId)
-            ?? throw UserFriendlyException.SameMessage("发布单不存在");
+                      ?? throw UserFriendlyException.SameMessage("发布单不存在");
         publish.IsDeleted = true;
         var order = await _orderRepository.GetAsync(publish.OrderId, HttpContext.RequestAborted) ??
-            throw UserFriendlyException.SameMessage("工单不存在");
+                    throw UserFriendlyException.SameMessage("工单不存在");
         if (order.Status != EOrderStatus.Published && order.Status != EOrderStatus.Visited)
             throw UserFriendlyException.SameMessage("工单状态非[已发布]和[已回访], 不可取消发布.");
 
@@ -797,6 +797,7 @@ public class OrderController : BaseController
         await _orderRepository.UpdateAsync(order);
         return "取消成功";
     }
+
     #endregion
 
     #region 工单回访
@@ -819,7 +820,7 @@ public class OrderController : BaseController
             .WhereIF(dto.VisitStateQuery == EVisitStateQuery.Visited, d => d.VisitState == EVisitState.Visited)
             .WhereIF(dto.VisitStateQuery == EVisitStateQuery.SMSUnsatisfied, d => d.VisitState == EVisitState.SMSUnsatisfied)
             .WhereIF(dto.VisitStateQuery == EVisitStateQuery.SMSVisiting, d => d.VisitState == EVisitState.SMSVisiting)
-            .WhereIF(dto.VisitStateQuery == EVisitStateQuery.NoPutThrough , d=>d.IsPutThrough == false && d.VisitState != EVisitState.Visited)
+            .WhereIF(dto.VisitStateQuery == EVisitStateQuery.NoPutThrough, d => d.IsPutThrough == false && d.VisitState != EVisitState.Visited)
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Order.Title.StartsWith(dto.Keyword!))
             .WhereIF(!string.IsNullOrEmpty(dto.No), d => d.No == dto.No)
             .WhereIF(dto.VisitType != null, d => d.VisitType == dto.VisitType)
@@ -1086,10 +1087,12 @@ public class OrderController : BaseController
                             VisitOrgCode = orgDetail.VisitOrgCode,
                         });
                 }
+
                 if (visitDto.CallId != null)
-                { 
+                {
                     visitDto.CallId = await _callApplication.GetOrSetCallIdAsync(visitDto.CallId, HttpContext.RequestAborted);
                 }
+
                 await _orderApplication.SaveOrderVisit(visitDto, HttpContext.RequestAborted);
                 await _orderVisitRepository.Updateable()
                     .Where(m => m.Id == visit.VisitId)
@@ -1263,22 +1266,22 @@ public class OrderController : BaseController
     /// <param name="dto"></param>
     /// <returns></returns>
     [HttpPut("visit/put_through")]
-	public async Task VisitPutThrough([FromBody] VisitPutThroughDto dto ) {
-
-        await _orderVisitRepository.Updateable().SetColumns(x => new OrderVisit { IsPutThrough = false }).Where(x => x.Id == dto.id).ExecuteCommandAsync(HttpContext.RequestAborted);
+    public async Task VisitPutThrough([FromBody] VisitPutThroughDto dto)
+    {
+        await _orderVisitRepository.Updateable().SetColumns(x => new OrderVisit { IsPutThrough = false }).Where(x => x.Id == dto.id)
+            .ExecuteCommandAsync(HttpContext.RequestAborted);
     }
 
+    #endregion
 
-	#endregion
-
-	#region 二次回访申请
+    #region 二次回访申请
 
-	/// <summary>
-	/// 可二次回访申请列表
-	/// </summary>
-	/// <param name="dto"></param>
-	/// <returns></returns>
-	[HttpGet("visitapply/visitagainlist")]
+    /// <summary>
+    /// 可二次回访申请列表
+    /// </summary>
+    /// <param name="dto"></param>
+    /// <returns></returns>
+    [HttpGet("visitapply/visitagainlist")]
     public async Task<PagedDto<OrderCanVisitAgainDto>> OrderVisitAgainList([FromQuery] OrderVisitAgainListDto dto)
     {
         var (total, items) = await _orderVisitedDetailRepository.Queryable()
@@ -1709,32 +1712,33 @@ public class OrderController : BaseController
     {
         //var workflow = await _workflowRepository.GetAsync(workflowId, HttpContext.RequestAborted);
         var workflow = await _workflowDomainService.GetWorkflowAsync(workflowId, withDefine: true, withSteps: true,
-	        cancellationToken: HttpContext.RequestAborted);
-        var currentStep = workflow.Steps.FirstOrDefault(d => d.Status == EWorkflowStepStatus.WaitForAccept || d.Status == EWorkflowStepStatus.WaitForHandle);
+            cancellationToken: HttpContext.RequestAborted);
+        var currentStep =
+            workflow.Steps.FirstOrDefault(d => d.Status == EWorkflowStepStatus.WaitForAccept || d.Status == EWorkflowStepStatus.WaitForHandle);
         if (workflow != null)
         {
-	    
-			var orderDelay = await _orderDelayRepository.Queryable().Includes(x => x.Order).Where(x => x.Id == workflow.ExternalId)
+            var orderDelay = await _orderDelayRepository.Queryable().Includes(x => x.Order).Where(x => x.Id == workflow.ExternalId)
                 .FirstAsync(HttpContext.RequestAborted);
             if (orderDelay != null)
             {
-				var result = await _workflowApplication.GetNextStepsAsync(workflowId, HttpContext.RequestAborted);
-				if (!orderDelay.Order.IsProvince)
+                var result = await _workflowApplication.GetNextStepsAsync(workflowId, HttpContext.RequestAborted);
+                if (!orderDelay.Order.IsProvince)
                 {
                     if (result.Steps.Any(x => x.Value == "省审批"))
                     {
                         result.Steps.Remove(result.Steps.First(x => x.Value == "省审批"));
                     }
                 }
+
                 if (!_sessionContext.OrgIsCenter && currentStep.Name != "中心初审")
                 {
-	                if (result.Steps.Any(x => x.Value == "中心终审"))
-	                {
-		                result.Steps.Remove(result.Steps.First(x => x.Value == "中心终审"));
-	                }
+                    if (result.Steps.Any(x => x.Value == "中心终审"))
+                    {
+                        result.Steps.Remove(result.Steps.First(x => x.Value == "中心终审"));
+                    }
                 }
 
-				return result;
+                return result;
             }
         }
 
@@ -1812,10 +1816,10 @@ public class OrderController : BaseController
             .WhereIF(dto.IsApply == false, d => d.DelayState == EDelayState.Examining)
             .WhereIF(dto.DelayState != null, d => d.DelayState == dto.DelayState)
             .WhereIF(dto.DataScope is 1, x => x.CreatorId == _sessionContext.RequiredUserId)
-            .WhereIF(dto.QueryDelayState is EQueryDelayState.Examining , d=>d.DelayState == EDelayState.Examining)
+            .WhereIF(dto.QueryDelayState is EQueryDelayState.Examining, d => d.DelayState == EDelayState.Examining)
             .WhereIF(dto.QueryDelayState is EQueryDelayState.Pass, d => d.DelayState == EDelayState.Pass)
             .WhereIF(dto.QueryDelayState is EQueryDelayState.NoPass, d => d.DelayState == EDelayState.NoPass)
-			.OrderByDescending(d => d.ApplyDelayTime)
+            .OrderByDescending(d => d.ApplyDelayTime)
             .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
 
         return new PagedDto<OrderDelayDto>(total, _mapper.Map<IReadOnlyList<OrderDelayDto>>(items));
@@ -1913,14 +1917,16 @@ public class OrderController : BaseController
                 result.Steps.Remove(result.Steps.First(x => x.Value == "中心初审"));
             }
         }
-        else {
-	        if (result.Steps.Any(x => x.Value == "中心终审"))
-	        {
-		        result.Steps.Remove(result.Steps.First(x => x.Value == "中心终审"));
-	        }
-		}
+        else
+        {
+            if (result.Steps.Any(x => x.Value == "中心终审"))
+            {
+                result.Steps.Remove(result.Steps.First(x => x.Value == "中心终审"));
+            }
+        }
+
         return result;
-	}
+    }
 
     /// <summary>
     /// 延期页面基础信息
@@ -1933,7 +1939,7 @@ public class OrderController : BaseController
         {
             DelayState = EnumExts.GetDescriptions<EDelayState>(),
             QueryDelayState = EnumExts.GetDescriptions<EQueryDelayState>(),
-			TimeType = EnumExts.GetDescriptions<ETimeType>()
+            TimeType = EnumExts.GetDescriptions<ETimeType>()
         };
         return rsp;
     }
@@ -1960,8 +1966,9 @@ public class OrderController : BaseController
             // dto.CreationTimeStart = _timeLimitDomainService.CalcWorkTimeReduce(DateTime.Now, 5);
             dto.CreationTimeStart = await _expireTime.CalcWorkTimeReduce(DateTime.Now, 5);
         }
-		var (total, items) = await _orderApplication.MayScreenList(dto)
-			.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
+
+        var (total, items) = await _orderApplication.MayScreenList(dto)
+            .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
         return new PagedDto<OrderVisitDetailDto>(total, _mapper.Map<IReadOnlyList<OrderVisitDetailDto>>(items));
     }
 
@@ -1972,49 +1979,49 @@ public class OrderController : BaseController
     [HttpPost("mayscreen/_export")]
     public async Task<FileStreamResult> ScreenListExport([FromBody] ExportExcelDto<MayScreenListDto> dto)
     {
-	    if (_appOptions.Value.IsYiBin) dto.QueryDto.ScreenType = EOrderScreenType.Org;
+        if (_appOptions.Value.IsYiBin) dto.QueryDto.ScreenType = EOrderScreenType.Org;
 
-	    dto.QueryDto.CreationTimeEnd = DateTime.Now;
-	    dto.QueryDto.CreationTimeStart = DateTime.Now;
-	    if (dto.QueryDto.IsHomePage != null && dto.QueryDto.IsHomePage == true)
-	    {
-		    // dto.CreationTimeStart = _timeLimitDomainService.CalcWorkTimeReduce(DateTime.Now, 5);
-		    dto.QueryDto.CreationTimeStart = await _expireTime.CalcWorkTimeReduce(DateTime.Now, 5);
-	    }
+        dto.QueryDto.CreationTimeEnd = DateTime.Now;
+        dto.QueryDto.CreationTimeStart = DateTime.Now;
+        if (dto.QueryDto.IsHomePage != null && dto.QueryDto.IsHomePage == true)
+        {
+            // dto.CreationTimeStart = _timeLimitDomainService.CalcWorkTimeReduce(DateTime.Now, 5);
+            dto.QueryDto.CreationTimeStart = await _expireTime.CalcWorkTimeReduce(DateTime.Now, 5);
+        }
 
-		var query = _orderApplication.MayScreenList(dto.QueryDto);
-	    List<OrderVisitDetail> data;
-	    if (dto.IsExportAll)
-	    {
-		    data = await query.ToListAsync(HttpContext.RequestAborted);
-	    }
-	    else
-	    {
-		    var (_, items) = await query.ToPagedListAsync(dto.QueryDto, HttpContext.RequestAborted);
-		    data = items;
-	    }
+        var query = _orderApplication.MayScreenList(dto.QueryDto);
+        List<OrderVisitDetail> data;
+        if (dto.IsExportAll)
+        {
+            data = await query.ToListAsync(HttpContext.RequestAborted);
+        }
+        else
+        {
+            var (_, items) = await query.ToPagedListAsync(dto.QueryDto, HttpContext.RequestAborted);
+            data = items;
+        }
 
-	    var dataDtos = _mapper.Map<ICollection<OrderVisitDetailDto>>(data);
+        var dataDtos = _mapper.Map<ICollection<OrderVisitDetailDto>>(data);
 
-	    dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
+        dynamic? dynamicClass = DynamicClassHelper.CreateDynamicClass(dto.ColumnInfos);
 
-	    var dtos = dataDtos
-		    .Select(stu => _mapper.Map(stu, typeof(OrderVisitDetailDto), dynamicClass))
-		    .Cast<object>()
-		    .ToList();
+        var dtos = dataDtos
+            .Select(stu => _mapper.Map(stu, typeof(OrderVisitDetailDto), dynamicClass))
+            .Cast<object>()
+            .ToList();
 
-	    var stream = ExcelHelper.CreateStream(dtos);
+        var stream = ExcelHelper.CreateStream(dtos);
 
-	    return ExcelStreamResult(stream, "工单甄别待申请列表数据");
+        return ExcelStreamResult(stream, "工单甄别待申请列表数据");
     }
 
 
-	/// <summary>
-	/// 工单甄别列表
-	/// </summary>
-	/// <param name="dto"></param>
-	/// <returns></returns>
-	[HttpGet("screen")]
+    /// <summary>
+    /// 工单甄别列表
+    /// </summary>
+    /// <param name="dto"></param>
+    /// <returns></returns>
+    [HttpGet("screen")]
     public async Task<PagedDto<OrderScreenListDto>> ScreenList([FromQuery] ScreenListDto dto)
     {
         var (total, items) = await _orderApplication.OrderScreenList(dto)
@@ -2212,13 +2219,15 @@ public class OrderController : BaseController
                 result.Steps.Remove(result.Steps.First(x => x.Value == "中心初审"));
             }
         }
-        else {
-			if (result.Steps.Any(x => x.Value == "中心班长"))
-			{
-				result.Steps.Remove(result.Steps.First(x => x.Value == "中心班长"));
-			}
-		}
-		return result;
+        else
+        {
+            if (result.Steps.Any(x => x.Value == "中心班长"))
+            {
+                result.Steps.Remove(result.Steps.First(x => x.Value == "中心班长"));
+            }
+        }
+
+        return result;
     }
 
     /// <summary>
@@ -2258,11 +2267,12 @@ public class OrderController : BaseController
 
                 if (!_sessionContext.OrgIsCenter)
                 {
-					if (result.Steps.Any(x => x.Value == "中心班长"))
-					{
-						result.Steps.Remove(result.Steps.First(x => x.Value == "中心班长"));
-					}
-				}
+                    if (result.Steps.Any(x => x.Value == "中心班长"))
+                    {
+                        result.Steps.Remove(result.Steps.First(x => x.Value == "中心班长"));
+                    }
+                }
+
                 return result;
             }
         }
@@ -2282,7 +2292,7 @@ public class OrderController : BaseController
             ScreenStatus = EnumExts.GetDescriptions<EScreenStatus>(),
             OrderScreenType = EnumExts.GetDescriptions<EOrderScreenType>(),
             QueryScreenType = EnumExts.GetDescriptions<EQueryOrderScreenType>(),
-			ScreenType = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.ScreenType),
+            ScreenType = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.ScreenType),
             CounterSignType = EnumExts.GetDescriptions<ECounterSignType>(),
             AcceptType = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.AcceptType),
             SourceChannel = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.SourceChannel),
@@ -3111,7 +3121,7 @@ public class OrderController : BaseController
                 cancellationToken: HttpContext.RequestAborted);
 
             List<OrderRemarksDto> remarks = workflow.Steps.Where(x => !string.IsNullOrEmpty(x.Remark)).Select(x => new OrderRemarksDto
-            { Remark = x.Remark, RemarkTime = x.HandleTime, RemarkUser = x.HandlerName }).ToList();
+                { Remark = x.Remark, RemarkTime = x.HandleTime, RemarkUser = x.HandlerName }).ToList();
             dto.OrderRemarks = remarks;
             if (order.Status == EOrderStatus.SendBack || order.Status == EOrderStatus.SendBackAudit || order.Status == EOrderStatus.BackToUnAccept)
             {
@@ -3306,7 +3316,7 @@ public class OrderController : BaseController
     [HttpPost("add-anonymous")]
     [AllowAnonymous]
     [LogFilter("省平台调用记录")]
-	public async Task<AddOrderResponse> AddAnonymous([FromBody] AddOrderDto dto)
+    public async Task<AddOrderResponse> AddAnonymous([FromBody] AddOrderDto dto)
     {
         return await _orderApplication.ReceiveOrderFromExternalAsync(dto, HttpContext.RequestAborted);
     }
@@ -3620,14 +3630,14 @@ public class OrderController : BaseController
         BasicWorkflowDto workflowDto, CancellationToken cancellationToken)
     {
         var isAutoFillSummaryOpinion = bool.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.IsAutoFillSummaryOpinion).SettingValue[0]);
-        
+
         switch (orderHandleFlowDto.OrderAssignMode)
         {
             case EOrderAssignMode.AdjoinLevel:
                 var nextDto = _mapper.Map<NextWorkflowDto>(workflowDto);
                 nextDto.WorkflowId = startStep.WorkflowId;
                 nextDto.StepId = startStep.Id;
-                
+
                 if (workflowDto.BusinessType == EBusinessType.Send)
                 {
                     // 宜宾需求： 1.是否是派单节点  2.是否存在历史派单节点  3.存在获取上个派单节点  4.不存在走平均派单 
@@ -3660,7 +3670,7 @@ public class OrderController : BaseController
                     }
                 }
 
-                await _workflowDomainService.NextAsync(_sessionContext, nextDto, order.ExpiredTime,isAutoFillSummaryOpinion, cancellationToken);
+                await _workflowDomainService.NextAsync(_sessionContext, nextDto, order.ExpiredTime, isAutoFillSummaryOpinion, cancellationToken);
                 break;
             case EOrderAssignMode.CrossLevel:
                 if (!orderHandleFlowDto.CrossSteps.Any())
@@ -3865,7 +3875,7 @@ public class OrderController : BaseController
             IdentityTypeOptions = EnumExts.GetDescriptions<EIdentityType>(),
             OrderTags = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.OrderTag),
             FocusOnEvents = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.FocusOnEvent)
-    };
+        };
         return rsp;
     }
 
@@ -3984,12 +3994,13 @@ public class OrderController : BaseController
     /// </summary>
     /// <returns>成功总量</returns>
     [HttpPost("batch-file")]
-    public async Task<string> BatchFile([FromBody]OrderBatchFileDto dto)
+    public async Task<string> BatchFile([FromBody] OrderBatchFileDto dto)
     {
         var orders = await _orderRepository.Queryable()
-            .Includes(w=>w.Workflow,d => d.WorkflowDefinition)
-            .Includes(w=>w.Workflow,d => d.Steps)
-            .Includes(w=>w.Workflow,d => d.Traces)
+            .Includes(w => w.Workflow, d => d.WorkflowDefinition)
+            .Includes(w => w.Workflow, d => d.Steps)
+            .Includes(w => w.Workflow, d => d.Traces)
+            .Includes(w => w.Workflow, d => d.Countersigns)
             .Where(d => dto.OrderIds.Contains(d.Id))
             .ToListAsync(HttpContext.RequestAborted);
         var success = 0;
@@ -3999,11 +4010,11 @@ public class OrderController : BaseController
             var unhandleSteps = order.Workflow.Steps
                 .Where(d => d.Status != EWorkflowStepStatus.Handled)
                 .ToList();
-            if(unhandleSteps.Count == 0
-               || unhandleSteps.Count > 2 
-               || unhandleSteps.First().BusinessType!= EBusinessType.Send)
+            if (unhandleSteps.Count == 0
+                || unhandleSteps.Count > 2
+                || unhandleSteps.First().BusinessType != EBusinessType.Send)
                 continue;
-            
+
             var startStep = order.Workflow.Steps.Where(d => d.StepType == EStepType.Start && d.IsOrigin)
                 .MaxBy(d => d.CreationTime);
             if (startStep?.Status is not EWorkflowStepStatus.Handled || string.IsNullOrEmpty(startStep.Opinion))
@@ -4052,8 +4063,9 @@ public class OrderController : BaseController
             .WhereIF(dto.QueryType is 3,
                 d => SqlFunc.Subqueryable<OrderSpecial>().Where(os => os.OrderId == d.Id && os.SpecialType == ESpecialType.ReTransact).Any())
             .Where(d => SqlFunc.Subqueryable<OrderDelay>().Where(od => od.OrderId == d.Id && od.DelayState == EDelayState.Examining).NotAny())
-            .Where(d => SqlFunc.Subqueryable<OrderSendBackAudit>().Where(osba => osba.OrderId == d.Id && osba.State == ESendBackAuditState.Apply).NotAny())
-			.WhereIF(dto.IsProvince.HasValue, d => d.IsProvince == dto.IsProvince)
+            .Where(d => SqlFunc.Subqueryable<OrderSendBackAudit>().Where(osba => osba.OrderId == d.Id && osba.State == ESendBackAuditState.Apply)
+                .NotAny())
+            .WhereIF(dto.IsProvince.HasValue, d => d.IsProvince == dto.IsProvince)
             .WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Title.StartsWith(dto.Keyword))
             .WhereIF(!string.IsNullOrEmpty(dto.No), d => d.No == dto.No)
             .WhereIF(!string.IsNullOrEmpty(dto.AreaCode), d => d.AreaCode == dto.AreaCode)
@@ -4072,9 +4084,9 @@ public class OrderController : BaseController
             .WhereIF(dto.EndTime.HasValue, d => d.StartTime <= dto.EndTime)
             .WhereIF(dto.IsUrgent.HasValue, d => d.IsUrgent == dto.IsUrgent!.Value)
             .WhereIF(dto.Status.HasValue, d => d.Status == dto.Status)
-            .OrderByDescending(d=> d.IsUrgent)
-            .OrderByIF(string.IsNullOrEmpty(dto.SortField),d => d.StartTime ,OrderByType.Desc)
-            .OrderByIF(dto is { SortField: "creationTime", SortRule:0 },d=> d.CreationTime,OrderByType.Asc) //创建时间升序
+            .OrderByDescending(d => d.IsUrgent)
+            .OrderByIF(string.IsNullOrEmpty(dto.SortField), d => d.StartTime, OrderByType.Desc)
+            .OrderByIF(dto is { SortField: "creationTime", SortRule: 0 }, d => d.CreationTime, OrderByType.Asc) //创建时间升序
             .OrderByIF(dto is { SortField: "creationTime", SortRule: 1 }, d => d.CreationTime, OrderByType.Desc) //创建时间降序
             .OrderByIF(dto is { SortField: "startTime", SortRule: 0 }, d => d.StartTime, OrderByType.Asc) //受理时间升序
             .OrderByIF(dto is { SortField: "startTime", SortRule: 1 }, d => d.StartTime, OrderByType.Desc) //受理时间降序
@@ -4169,7 +4181,7 @@ public class OrderController : BaseController
             .WhereIF(!string.IsNullOrEmpty(dto.CenterToOrgHandlerName), d => d.CenterToOrgHandlerName == dto.CenterToOrgHandlerName)
             .WhereIF(dto.IsUrgent.HasValue, d => d.IsUrgent == dto.IsUrgent!.Value)
             .OrderBy(d => d.Status)
-            .OrderByIF(string.IsNullOrEmpty(dto.SortField),d => d.CreationTime, OrderByType.Desc)
+            .OrderByIF(string.IsNullOrEmpty(dto.SortField), d => d.CreationTime, OrderByType.Desc)
             .OrderByIF(dto is { SortField: "startTime", SortRule: 0 }, d => d.StartTime, OrderByType.Asc) //受理时间升序
             .OrderByIF(dto is { SortField: "startTime", SortRule: 1 }, d => d.StartTime, OrderByType.Desc) //受理时间降序
             .OrderByIF(dto is { SortField: "expiredTime", SortRule: 0 }, d => d.ExpiredTime, OrderByType.Asc) //期满时间升序
@@ -4298,7 +4310,7 @@ public class OrderController : BaseController
             .FirstAsync(d => d.Id == workflow.ExternalId);
         var (currentStep, prevStep, isOrgToCenter, isSecondToFirstOrgLevel) = await _workflowApplication.GetPreviousInformationAsync(
             dto.WorkflowId, _sessionContext.RequiredUserId, _sessionContext.RequiredOrgId, _sessionContext.Roles, HttpContext.RequestAborted);
-		var audit = new OrderSendBackAudit
+        var audit = new OrderSendBackAudit
         {
             OrderId = workflow.ExternalId,
             State = ESendBackAuditState.Apply,
@@ -4419,22 +4431,24 @@ public class OrderController : BaseController
         //执行退回
         if (sendBack.State == ESendBackAuditState.End)
         {
-	        var order = await _orderRepository.Queryable().Includes(d => d.Workflow).FirstAsync(d => d.Id == sendBack.OrderId);
-			if (_appOptions.Value.IsZiGong)
-	        {
-				var (currentStep, prevStep, isOrgToCenter, isSecondToFirstOrgLevel) = await _workflowApplication.GetPreviousInformationAsync(
-					order.WorkflowId, sendBack.WorkflowUserId, sendBack.WorkflowOrgId, sendBack.WorkflowRoleIds.ToArray(), HttpContext.RequestAborted);
-				if (prevStep.BusinessType == EBusinessType.Send)
-		        {
-					// 平均派单
-					var averageSendOrder = bool.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.AverageSendOrder).SettingValue[0]);
-					if (averageSendOrder)
-					{
-						var handler = await _orderDomainService.AverageOrder(HttpContext.RequestAborted);
-						sendBack.SendBackData.Handler = handler;
-					}
-				}
-	        }
+            var order = await _orderRepository.Queryable().Includes(d => d.Workflow).FirstAsync(d => d.Id == sendBack.OrderId);
+            if (_appOptions.Value.IsZiGong)
+            {
+                var (currentStep, prevStep, isOrgToCenter, isSecondToFirstOrgLevel) = await _workflowApplication.GetPreviousInformationAsync(
+                    order.WorkflowId, sendBack.WorkflowUserId, sendBack.WorkflowOrgId, sendBack.WorkflowRoleIds.ToArray(),
+                    HttpContext.RequestAborted);
+                if (prevStep.BusinessType == EBusinessType.Send)
+                {
+                    // 平均派单
+                    var averageSendOrder = bool.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.AverageSendOrder).SettingValue[0]);
+                    if (averageSendOrder)
+                    {
+                        var handler = await _orderDomainService.AverageOrder(HttpContext.RequestAborted);
+                        sendBack.SendBackData.Handler = handler;
+                    }
+                }
+            }
+
             //string applicantId, string applicantOrgId, string[] applicantRoleIds,
             //    ISessionContext current, CancellationToken cancellationToken);
             sendBack.SendBackData.ExpiredTime = order.ExpiredTime;
@@ -4487,23 +4501,24 @@ public class OrderController : BaseController
             //执行退回
             if (sendBack.State == ESendBackAuditState.End)
             {
-	            var order = await _orderRepository.Queryable().Includes(d => d.Workflow).FirstAsync(d => d.Id == sendBack.OrderId);
-				if (_appOptions.Value.IsZiGong)
-	            {
-					var (currentStep, prevStep, isOrgToCenter, isSecondToFirstOrgLevel) = await _workflowApplication.GetPreviousInformationAsync(
-						order.WorkflowId, sendBack.WorkflowUserId, sendBack.WorkflowOrgId, sendBack.WorkflowRoleIds.ToArray(), HttpContext.RequestAborted);
-					if (prevStep.BusinessType == EBusinessType.Send)
-					{
-						// 平均派单
-						var averageSendOrder = bool.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.AverageSendOrder).SettingValue[0]);
-						if (averageSendOrder)
-						{
-							var handler = await _orderDomainService.AverageOrder(HttpContext.RequestAborted);
-							sendBack.SendBackData.Handler = handler;
-						}
-					}
-				}
-				
+                var order = await _orderRepository.Queryable().Includes(d => d.Workflow).FirstAsync(d => d.Id == sendBack.OrderId);
+                if (_appOptions.Value.IsZiGong)
+                {
+                    var (currentStep, prevStep, isOrgToCenter, isSecondToFirstOrgLevel) = await _workflowApplication.GetPreviousInformationAsync(
+                        order.WorkflowId, sendBack.WorkflowUserId, sendBack.WorkflowOrgId, sendBack.WorkflowRoleIds.ToArray(),
+                        HttpContext.RequestAborted);
+                    if (prevStep.BusinessType == EBusinessType.Send)
+                    {
+                        // 平均派单
+                        var averageSendOrder = bool.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.AverageSendOrder).SettingValue[0]);
+                        if (averageSendOrder)
+                        {
+                            var handler = await _orderDomainService.AverageOrder(HttpContext.RequestAborted);
+                            sendBack.SendBackData.Handler = handler;
+                        }
+                    }
+                }
+
                 sendBack.SendBackData.ExpiredTime = order.ExpiredTime;
                 var flowDirection = await _workflowApplication.PreviousAsync(sendBack.SendBackData,
                     sendBack.WorkflowUserId, sendBack.WorkflowOrgId, sendBack.WorkflowRoleIds.ToArray(),
@@ -4834,26 +4849,27 @@ public class OrderController : BaseController
             .AnyAsync();
         if (specialAny) throw UserFriendlyException.SameMessage("工单已存在待审批特提信息！");
         var order = await _orderRepository.Queryable().Includes(d => d.Workflow).FirstAsync(d => d.Id == dto.OrderId);
-		await _orderApplication.SpecialVerify(dto, order, HttpContext.RequestAborted);
-		if (string.IsNullOrEmpty(dto.Cause))
-		{
-			dto.Cause = dto.Reason;
-		}
+        await _orderApplication.SpecialVerify(dto, order, HttpContext.RequestAborted);
+        if (string.IsNullOrEmpty(dto.Cause))
+        {
+            dto.Cause = dto.Reason;
+        }
 
-		var  workflow = await _workflowDomainService.GetWorkflowAsync(order.WorkflowId, withSteps: true, cancellationToken: HttpContext.RequestAborted);
+        var workflow = await _workflowDomainService.GetWorkflowAsync(order.WorkflowId, withSteps: true,
+            cancellationToken: HttpContext.RequestAborted);
         var currentStep = workflow.Steps.FirstOrDefault(x => x.Status != EWorkflowStepStatus.Handled);
         if (currentStep is null)
-	        currentStep = workflow.Steps.OrderByDescending(x => x.CreationTime).FirstOrDefault(x => x.StepType == EStepType.End);
+            currentStep = workflow.Steps.OrderByDescending(x => x.CreationTime).FirstOrDefault(x => x.StepType == EStepType.End);
 
-		if (string.IsNullOrEmpty(dto.Cause))
-		{
-			dto.Cause = dto.Reason;
-		}
+        if (string.IsNullOrEmpty(dto.Cause))
+        {
+            dto.Cause = dto.Reason;
+        }
 
-		var model = _mapper.Map<OrderSpecial>(dto);
-        model.OrgId = currentStep is null ? _sessionContext.RequiredOrgId: currentStep.HandlerOrgId;
+        var model = _mapper.Map<OrderSpecial>(dto);
+        model.OrgId = currentStep is null ? _sessionContext.RequiredOrgId : currentStep.HandlerOrgId;
         model.OrgName = currentStep is null ? _sessionContext.OrgName : currentStep.HandlerOrgName;
-		var step = await _workflowDomainService.FindLastStepAsync(model.WorkflowId, HttpContext.RequestAborted);
+        var step = await _workflowDomainService.FindLastStepAsync(model.WorkflowId, HttpContext.RequestAborted);
         model.StepName = step.Name;
         model.StepCode = step.Code;
         model.Status = order.Status;
@@ -4953,13 +4969,13 @@ public class OrderController : BaseController
             //	ETimeType.WorkDay,
             //	dto.TimeLimit.Value, order.AcceptTypeCode);
             await _orderRepository.Updateable().SetColumns(o => new Orders.Order()
-            {
-                ExpiredTime = expiredTime.ExpiredTime,
-                NearlyExpiredTime = expiredTime.NearlyExpiredTime,
-                NearlyExpiredTimeOne = expiredTime.NearlyExpiredTimeOne,
-                ProcessType = processType,
-                Status = EOrderStatus.Special
-            })
+                {
+                    ExpiredTime = expiredTime.ExpiredTime,
+                    NearlyExpiredTime = expiredTime.NearlyExpiredTime,
+                    NearlyExpiredTimeOne = expiredTime.NearlyExpiredTimeOne,
+                    ProcessType = processType,
+                    Status = EOrderStatus.Special
+                })
                 .Where(o => o.Id == order.Id).ExecuteCommandAsync(HttpContext.RequestAborted);
             var orderDto = _mapper.Map<OrderDto>(order);
             await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderExpiredTimeUpdate, orderDto,
@@ -5024,12 +5040,12 @@ public class OrderController : BaseController
     }
 
 
-	/// <summary>
-	/// 工单重办信息
-	/// </summary>
-	/// <param name="dto"></param>
-	/// <returns></returns>
-	[HttpPost("re_transact")]
+    /// <summary>
+    /// 工单重办信息
+    /// </summary>
+    /// <param name="dto"></param>
+    /// <returns></returns>
+    [HttpPost("re_transact")]
     [LogFilter("工单重办")]
     public async Task Add([FromBody] OrderReTransactDto dto)
     {
@@ -5054,14 +5070,15 @@ public class OrderController : BaseController
 
         var model = _mapper.Map<OrderSpecial>(dto);
 
-        var workflow = await _workflowDomainService.GetWorkflowAsync(order.WorkflowId, withSteps: true, cancellationToken: HttpContext.RequestAborted);
+        var workflow = await _workflowDomainService.GetWorkflowAsync(order.WorkflowId, withSteps: true,
+            cancellationToken: HttpContext.RequestAborted);
         var currentStep = workflow.Steps.FirstOrDefault(x => x.Status != EWorkflowStepStatus.Handled);
         if (currentStep is null)
-	        currentStep = workflow.Steps.OrderByDescending(x => x.CreationTime).FirstOrDefault(x => x.StepType == EStepType.End);
+            currentStep = workflow.Steps.OrderByDescending(x => x.CreationTime).FirstOrDefault(x => x.StepType == EStepType.End);
 
         model.OrgId = currentStep is null ? _sessionContext.RequiredOrgId : currentStep.HandlerOrgId;
         model.OrgName = currentStep is null ? _sessionContext.OrgName : currentStep.HandlerOrgName;
-		var step = await _workflowDomainService.FindLastStepAsync(model.WorkflowId, HttpContext.RequestAborted);
+        var step = await _workflowDomainService.FindLastStepAsync(model.WorkflowId, HttpContext.RequestAborted);
         model.StepName = step.Name;
         model.StepCode = step.Code;
         model.State = 1;
@@ -5091,18 +5108,18 @@ public class OrderController : BaseController
 
         if (model.State == 1)
         {
-	        if (_appOptions.Value.IsZiGong && dto.BusinessType == EBusinessType.Send)
-	        {
-		        // 平均派单
-		        var averageSendOrder = bool.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.AverageSendOrder).SettingValue[0]);
-		        if (averageSendOrder)
-		        {
-			        var handler = await _orderDomainService.AverageOrder(HttpContext.RequestAborted);
-			        dto.NextHandlers = new List<FlowStepHandler> { handler };
-		        }
-	        }
-
-			var recall = new RecallDto
+            if (_appOptions.Value.IsZiGong && dto.BusinessType == EBusinessType.Send)
+            {
+                // 平均派单
+                var averageSendOrder = bool.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.AverageSendOrder).SettingValue[0]);
+                if (averageSendOrder)
+                {
+                    var handler = await _orderDomainService.AverageOrder(HttpContext.RequestAborted);
+                    dto.NextHandlers = new List<FlowStepHandler> { handler };
+                }
+            }
+
+            var recall = new RecallDto
             {
                 WorkflowId = dto.WorkflowId!,
                 NextStepCode = dto.NextStepCode,
@@ -5132,11 +5149,11 @@ public class OrderController : BaseController
 
                 endTime = expiredTime.EndTime;
                 await _orderRepository.Updateable().SetColumns(o => new Orders.Order()
-                {
-                    ExpiredTime = expiredTime.EndTime,
-                    NearlyExpiredTime = expiredTime.NearlyExpiredTime,
-                    NearlyExpiredTimeOne = expiredTime.NearlyExpiredTimeOne
-                })
+                    {
+                        ExpiredTime = expiredTime.EndTime,
+                        NearlyExpiredTime = expiredTime.NearlyExpiredTime,
+                        NearlyExpiredTimeOne = expiredTime.NearlyExpiredTimeOne
+                    })
                     .Where(o => o.Id == order.Id).ExecuteCommandAsync(HttpContext.RequestAborted);
                 var orderDto = _mapper.Map<OrderDto>(order);
                 await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderExpiredTimeUpdate, orderDto,
@@ -5219,17 +5236,18 @@ public class OrderController : BaseController
         var order = await _orderRepository.GetAsync(x => x.Id == special.OrderId);
         if (special.State == 1)
         {
-	        if (_appOptions.Value.IsZiGong && dto.BusinessType == EBusinessType.Send)
-	        {
-		        // 平均派单
-		        var averageSendOrder = bool.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.AverageSendOrder).SettingValue[0]);
-		        if (averageSendOrder)
-		        {
-			        var handler = await _orderDomainService.AverageOrder(HttpContext.RequestAborted);
-			        dto.NextHandlers = new List<FlowStepHandler> { handler };
-		        }
-	        }
-			var recall = new RecallDto
+            if (_appOptions.Value.IsZiGong && dto.BusinessType == EBusinessType.Send)
+            {
+                // 平均派单
+                var averageSendOrder = bool.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.AverageSendOrder).SettingValue[0]);
+                if (averageSendOrder)
+                {
+                    var handler = await _orderDomainService.AverageOrder(HttpContext.RequestAborted);
+                    dto.NextHandlers = new List<FlowStepHandler> { handler };
+                }
+            }
+
+            var recall = new RecallDto
             {
                 WorkflowId = special.WorkflowId!,
                 NextStepCode = special.NextStepCode,
@@ -5266,6 +5284,7 @@ public class OrderController : BaseController
                     expiredTime = await _expireTime.CalcEndTime(DateTime.Now, order.AcceptTypeCode);
                 }
             }
+
             if (expiredTime.ExpiredTime < order.ExpiredTime)
             {
                 expiredTime.ExpiredTime = order.ExpiredTime.Value;
@@ -5277,13 +5296,13 @@ public class OrderController : BaseController
                 ? EProcessType.Zhiban
                 : EProcessType.Jiaoban;
             await _orderRepository.Updateable().SetColumns(o => new Orders.Order()
-            {
-                ExpiredTime = expiredTime.ExpiredTime,
-                NearlyExpiredTime = expiredTime.NearlyExpiredTime,
-                NearlyExpiredTimeOne = expiredTime.NearlyExpiredTimeOne,
-                ProcessType = processType,
-                Status = EOrderStatus.Special
-            })
+                {
+                    ExpiredTime = expiredTime.ExpiredTime,
+                    NearlyExpiredTime = expiredTime.NearlyExpiredTime,
+                    NearlyExpiredTimeOne = expiredTime.NearlyExpiredTimeOne,
+                    ProcessType = processType,
+                    Status = EOrderStatus.Special
+                })
                 .Where(o => o.Id == order.Id).ExecuteCommandAsync(HttpContext.RequestAborted);
             var orderDto = _mapper.Map<OrderDto>(order);
             await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderExpiredTimeUpdate, orderDto,
@@ -5401,23 +5420,25 @@ public class OrderController : BaseController
                         expiredTime = await _expireTime.CalcEndTime(DateTime.Now, order.AcceptTypeCode);
                     }
                 }
+
                 if (expiredTime.ExpiredTime < order.ExpiredTime)
                 {
                     expiredTime.ExpiredTime = order.ExpiredTime.Value;
                     expiredTime.NearlyExpiredTime = order.NearlyExpiredTime.Value;
                     expiredTime.NearlyExpiredTimeOne = order.NearlyExpiredTimeOne.Value;
                 }
+
                 var processType = special.FlowDirection is EFlowDirection.OrgToCenter or EFlowDirection.CenterToCenter or EFlowDirection.FiledToCenter
                     ? EProcessType.Zhiban
                     : EProcessType.Jiaoban;
                 await _orderRepository.Updateable().SetColumns(o => new Orders.Order()
-                {
-                    ExpiredTime = expiredTime.ExpiredTime,
-                    NearlyExpiredTime = expiredTime.NearlyExpiredTime,
-                    NearlyExpiredTimeOne = expiredTime.NearlyExpiredTimeOne,
-                    ProcessType = processType,
-                    Status = EOrderStatus.Special
-                })
+                    {
+                        ExpiredTime = expiredTime.ExpiredTime,
+                        NearlyExpiredTime = expiredTime.NearlyExpiredTime,
+                        NearlyExpiredTimeOne = expiredTime.NearlyExpiredTimeOne,
+                        ProcessType = processType,
+                        Status = EOrderStatus.Special
+                    })
                     .Where(o => o.Id == order.Id).ExecuteCommandAsync(HttpContext.RequestAborted);
                 var orderDto = _mapper.Map<OrderDto>(order);
                 await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderExpiredTimeUpdate, orderDto,
@@ -5560,7 +5581,7 @@ public class OrderController : BaseController
                 d => d.Title.Contains(dto.Keyword!) || d.No.Contains(dto.Keyword!))
             //.WhereIF(!string.IsNullOrEmpty(dto.Content), d => d.Content.Contains(dto.Content!))
             .WhereIF(!string.IsNullOrEmpty(dto.AcceptType), d => d.AcceptTypeCode == dto.AcceptType) //受理类型
-                                                                                                     //.WhereIF(dto.AcceptTypes.Any(), d => dto.AcceptTypes.Contains(d.AcceptTypeCode)) //受理类型
+            //.WhereIF(dto.AcceptTypes.Any(), d => dto.AcceptTypes.Contains(d.AcceptTypeCode)) //受理类型
             .WhereIF(!string.IsNullOrEmpty(dto.Channel), d => d.SourceChannelCode == dto.Channel) //来源渠道
             .WhereIF(!string.IsNullOrEmpty(dto.Hotspot), d => d.HotspotSpliceName != null && d.HotspotSpliceName.Contains(dto.Hotspot))
             .WhereIF(!string.IsNullOrEmpty(dto.TransferPhone), d => d.TransferPhone.Contains(dto.TransferPhone!))
@@ -7299,7 +7320,7 @@ public class OrderController : BaseController
         {
             await _orderRepository.Updateable()
                 .SetColumns(o => new Orders.Order()
-                { SignerId = dto.Handler.UserId, SignerName = dto.Handler.Username, Status = EOrderStatus.HandOverToUnAccept })
+                    { SignerId = dto.Handler.UserId, SignerName = dto.Handler.Username, Status = EOrderStatus.HandOverToUnAccept })
                 .Where(o => o.Id == dto.OrderId).ExecuteCommandAsync(HttpContext.RequestAborted);
         }
         else