甄别

src/Hotline.Api/Controllers/OrderController.cs

@@ -1823,18 +1823,19 @@ public class OrderController : BaseController
             .Includes(d => d.Workflow)
             .WhereIF(!string.IsNullOrEmpty(dto.Title), d => d.Visit.Order.Title.Contains(dto.Title!))
             .WhereIF(!string.IsNullOrEmpty(dto.No), d => d.Visit.Order.No.Contains(dto.No!));
-        if (dto.Status is EScreenStatus.Apply)
+        if (dto.TabStatus is EScreenStatus.Apply)
         {
             query.Where(d => (d.Status == EScreenStatus.Apply || d.Status == EScreenStatus.Approval || (d.Status == EScreenStatus.SendBack || d.SendBackApply  == false)));
         }
 
-        if (dto.Status.HasValue && dto.Status == EScreenStatus.MyHandle)
+        if (dto.TabStatus.HasValue && dto.Status == EScreenStatus.MyHandle)
         {
             query.Where(d => (d.Status != EScreenStatus.Apply));
         }
 
         var (total, items) = await query
-            .WhereIF(dto.DataScope is 1 ,x=>x.CreatorId == _sessionContext.RequiredUserId)
+	        .WhereIF(dto.DataScope is 1, x => x.CreatorId == _sessionContext.RequiredUserId)
+			.WhereIF(dto.Status.HasValue ,x=>x.Status ==  dto.Status)
             .WhereIF(!string.IsNullOrEmpty(dto.AcceptType), x => x.Order!.AcceptTypeCode! == dto.AcceptType!)
             .WhereIF(!string.IsNullOrEmpty(dto.HotspotSpliceName), x => x.Order!.Hotspot.HotSpotFullName!.StartsWith(dto.HotspotSpliceName!))
             .WhereIF(!string.IsNullOrEmpty(dto.SourceChannel), x => x.Order!.SourceChannelCode! == dto.SourceChannel!)

src/Hotline/Orders/OrderScreen.cs

@@ -110,15 +110,21 @@ namespace Hotline.Orders
         public DateTime? ApplyEndTime { get; set; }
 
         /// <summary>
-        /// 甄别申请状态
+        /// 甄别申请状态选项卡
         /// </summary>
         [SugarColumn(ColumnDescription = "甄别申请状态")]
-        public EScreenStatus? Status { get; set; }
+        public EScreenStatus? TabStatus { get; set; }
 
         /// <summary>
-        /// 业务流程ID
+        /// 甄别申请状态
         /// </summary>
-        [SugarColumn(ColumnDescription = "业务流程ID")]
+        [SugarColumn(ColumnDescription = "甄别申请状态")]
+        public EScreenStatus? Status { get; set; }
+
+		/// <summary>
+		/// 业务流程ID
+		/// </summary>
+		[SugarColumn(ColumnDescription = "业务流程ID")]
         public string? WorkflowId { get; set; }
 
         [Navigate(NavigateType.OneToOne, nameof(WorkflowId))]