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

src/Hotline.Api/Controllers/OrderController.cs

@@ -4153,6 +4153,7 @@ public class OrderController : BaseController
             .Where(d => SqlFunc.Subqueryable<OrderDelay>().Where(od => od.OrderId == d.Id && od.IsDeleted == false && od.DelayState == EDelayState.Examining).NotAny())
             .Where(d => SqlFunc.Subqueryable<OrderSendBackAudit>().Where(osba => osba.OrderId == d.Id && osba.IsDeleted == false && osba.State == ESendBackAuditState.Apply)
                 .NotAny())
+            .Where(d=> SqlFunc.Subqueryable<OrderSpecial>().Where(s=>s.OrderId == d.Id).NotAny() || SqlFunc.Subqueryable<OrderSpecial>().Where(s=> s.OrderId == d.Id && s.State > 0).Any())
             .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)
@@ -4167,12 +4168,12 @@ public class OrderController : BaseController
             .Where(d => d.Source < ESource.MLSQ || d.Source > ESource.WZSC)
             .Where(d => d.Status != EOrderStatus.BackToProvince && d.Status < EOrderStatus.Filed)
             //.Where(d => SqlFunc.Subqueryable<OrderSpecial>().Where(os => os.OrderId == d.Id).NotAny())
-            .Where(d => d.OrderSpecials.Any() == false || d.OrderSpecials.Any(s => s.State > 0))
+            //.Where(d => d.OrderSpecials.Any() == false || d.OrderSpecials.Any(s => s.State > 0))
             .WhereIF(dto.StartTime.HasValue, d => d.StartTime >= dto.StartTime)
             .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)
+            //.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) //创建时间降序

src/Hotline.Application/Orders/OrderApplication.cs

@@ -3034,7 +3034,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             .WhereIF(dto.TypeCode.HasValue == false, m => m.Status < EOrderStatus.Filed)
              //.OrderBy(d => d.Status)
              .OrderByIF(dto.IsHandled == true, d => d.StartTime, OrderByType.Desc)
-            .OrderByIF(dto.IsHandled == false, d => new { IsUrgent = d.IsUrgent }, OrderByType.Desc)
+            //.OrderByIF(dto.IsHandled == false, d => new { IsUrgent = d.IsUrgent }, OrderByType.Desc)
             .OrderByIF(dto.IsHandled == false, d => new { d.Status })
             .OrderByIF(dto.IsHandled == false && string.IsNullOrEmpty(dto.SortField), d => d.CreationTime, OrderByType.Desc)
             .OrderByIF(dto is { SortField: "creationTime", SortRule: 0 }, d => d.CreationTime, OrderByType.Asc) //创建时间升序

src/Hotline/FlowEngine/Workflows/Workflow.cs

@@ -15,6 +15,7 @@ using XF.Domain.Repository;
 
 namespace Hotline.FlowEngine.Workflows;
 
+[SugarIndex("index_workflow_externalId", nameof(Workflow.ExternalId), OrderByType.Asc)]
 public partial class Workflow : CreationEntity
 {
     public string DefinitionId { get; set; }

src/Hotline/FlowEngine/Workflows/WorkflowStep.cs

@@ -10,6 +10,7 @@ using XF.Domain.Exceptions;
 
 namespace Hotline.FlowEngine.Workflows;
 
+[SugarIndex("index_step_externalId", nameof(WorkflowStep.ExternalId), OrderByType.Asc)]
 public class WorkflowStep : StepBasicEntity
 {
    [Navigate(NavigateType.OneToOne, nameof(Id),

src/Hotline/FlowEngine/Workflows/WorkflowTrace.cs

@@ -7,6 +7,7 @@ namespace Hotline.FlowEngine.Workflows;
 /// <summary>
 /// 流转记录
 /// </summary>
+[SugarIndex("index_trace_externalId", nameof(WorkflowTrace.ExternalId), OrderByType.Asc)]
 public class WorkflowTrace : StepBasicEntity
 {
     /// <summary>

src/Hotline/Orders/Order.cs

@@ -24,7 +24,8 @@ namespace Hotline.Orders
     [SugarIndex("unique_order_no", nameof(Order.No), OrderByType.Desc, true)]
     [SugarIndex("index_order_creationtime", nameof(Order.CreationTime), OrderByType.Asc)]
     [SugarIndex("index_order_startTime", nameof(Order.StartTime), OrderByType.Asc)]
-    public partial class Order : PositionWorkflowEntity
+    [SugarIndex("index_order_expiredTime", nameof(Order.ExpiredTime), OrderByType.Asc)]
+	public partial class Order : PositionWorkflowEntity
     {
         public Order()
         {
@@ -459,7 +460,7 @@ namespace Hotline.Orders
         public double? AllDurationWorkday { get; set; }
         
         
-        public string AllDurationHour { get; set; }
+        public string? AllDurationHour { get; set; }
 
         /// <summary>
         /// 办理时间限制(如：24小时、7个工作日)

src/Hotline/Orders/OrderDelay.cs

@@ -13,7 +13,8 @@ namespace Hotline.Orders
     /// 工单延期
     /// </summary>
     [Description("工单延期")]
-    public class OrderDelay : WorkflowEntity
+    [SugarIndex("index_delay_orderId", nameof(OrderDelay.OrderId), OrderByType.Asc)]
+	public class OrderDelay : WorkflowEntity
     {
         /// <summary>
         /// 工单编号（冗余）

src/Hotline/Orders/OrderPublish.cs

@@ -11,6 +11,7 @@ namespace Hotline.Orders;
 /// 已发布工单
 /// </summary>
 [Description("工单发布")]
+[SugarIndex("index_publish_orderId", nameof(OrderPublish.OrderId), OrderByType.Asc)]
 public class OrderPublish : FullStateEntity
 {
     public string OrderId { get; set; }

src/Hotline/Orders/OrderScreen.cs

@@ -10,7 +10,8 @@ using XF.Domain.Repository;
 namespace Hotline.Orders
 {
     [Description("工单甄别")]
-    public class OrderScreen : WorkflowEntity
+    [SugarIndex("index_screen_orderId", nameof(OrderScreen.OrderId), OrderByType.Asc)]
+	public class OrderScreen : WorkflowEntity
     {
         /// <summary>
         /// 工单编号

src/Hotline/Orders/OrderSpecial.cs

@@ -21,6 +21,7 @@ namespace Hotline.Orders
 	/// 特提
 	/// </summary>
 	[Description("工单特提")]
+	[SugarIndex("index_special_orderId", nameof(OrderSpecial.OrderId), OrderByType.Asc)]
 	public class OrderSpecial : FullStateEntity
 	{
         public string OrderId { get; set; }

src/Hotline/Orders/OrderVisit.cs

@@ -12,6 +12,7 @@ namespace Hotline.Orders;
 /// </summary>
 [Description("工单回访")]
 [SugarIndex("index_order_no", nameof(OrderVisit.No), OrderByType.Desc)]
+[SugarIndex("index_visit_orderId", nameof(OrderVisit.OrderId), OrderByType.Asc)]
 public class OrderVisit : CreationEntity
 {
     /// <summary>