xf 1 tahun lalu
induk
melakukan
3e49d18f31

+ 1 - 0
src/Hotline.Api/Controllers/OrderController.cs

@@ -1388,6 +1388,7 @@ public class OrderController : BaseController
             .WhereIF(dto.ExpiredTimeStart.HasValue, d => d.ExpiredTime >= dto.ExpiredTimeStart)
             .WhereIF(dto.ExpiredTimeEnd.HasValue, d => d.ExpiredTime <= dto.ExpiredTimeEnd)
             .WhereIF(dto.Statuses.Any(), d => dto.Statuses.Contains(d.Status))
+            .WhereIF(dto.Statuses.Any(d=>d== EOrderStatus.BackToUnAccept), d => d.Status <= EOrderStatus.BackToUnAccept)
             .OrderByDescending(d => d.CreationTime)
             .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
 

+ 15 - 9
src/Hotline.Share/Enums/Order/EOrderStatus.cs

@@ -7,42 +7,48 @@ public enum EOrderStatus
     /// <summary>
     /// 待受理
     /// </summary>
-    [Description("待受理")]
     WaitForAccept = 0,
 
     /// <summary>
     /// 已开启流程,退回/撤回/跳转到开始节点
     /// 待受理,可编辑
     /// </summary>
+    [Description("待受理")]
     BackToUnAccept = 1,
 
     /// <summary>
-    /// 办理中(20->10)
+    /// 退回省平台(锁定,不可操作)
+    /// </summary>
+    [Description("退回省平台")]
+    BackToProvince = 9,
+
+    /// <summary>
+    /// 办理中
     /// </summary>
     [Description("办理中")]
-    Handling = 10,
+    Handling = 100,
 
     /// <summary>
-    /// 会签中(30->20)
+    /// 会签中
     /// </summary>
     [Description("会签中")]
-    Countersigning = 20,
+    Countersigning = 200,
 
     /// <summary>
-    /// 已归档(60->30)
+    /// 已归档
     /// </summary>
     [Description("已归档")]
-    Filed = 30,
+    Filed = 300,
 
     /// <summary>
     /// 已发布
     /// </summary>
     [Description("已发布")]
-    Published = 40,
+    Published = 400,
 
     /// <summary>
     /// 已回访
     /// </summary>
     [Description("已回访")]
-    Visited = 50,
+    Visited = 500,
 }

+ 17 - 0
src/Hotline/Orders/OrderSpecial.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using XF.Domain.Repository;
+
+namespace Hotline.Orders
+{
+    /// <summary>
+    /// 特提
+    /// </summary>
+    public class OrderSpecial : CreationEntity
+    {
+        public string OrderId { get; set; }
+    }
+}