田爽 11 mesiacov pred
rodič
commit
5f0ea95fd2

+ 6 - 6
src/Hotline.Api/Controllers/OrderController.cs

@@ -2901,8 +2901,8 @@ public class OrderController : BaseController
             .Where(d => d.Source < ESource.MLSQ || d.Source > ESource.WZSC)
             .Where(d => d.Status != EOrderStatus.BackToProvince)
 			.Where(d => SqlFunc.Subqueryable<OrderSpecial>().Where(os => os.OrderId == d.Id).NotAny())
-            .WhereIF(dto.StartTime.HasValue ,d=>d.StartTime >= dto.StartTime)
-            .WhereIF(dto.EndTime.HasValue, d=> d.StartTime <= dto.EndTime)
+            .WhereIF(dto.StartTime.HasValue ,d=>d.CreationTime >= dto.StartTime)
+            .WhereIF(dto.EndTime.HasValue, d=> d.CreationTime <= dto.EndTime)
 			.OrderByDescending(d => d.StartTime)
             .ToPagedListAsync(dto, HttpContext.RequestAborted);
 
@@ -2933,8 +2933,8 @@ public class OrderController : BaseController
             .WhereIF(dto.IsCounterSign.HasValue && dto.IsCounterSign == false, d => !d.CounterSignType.HasValue)
             .WhereIF(dto.ExpiredOrAlmostOverdue.HasValue && dto.ExpiredOrAlmostOverdue == true, d => (d.ExpiredTime < DateTime.Now && d.Status < EOrderStatus.Filed) || (d.ExpiredTime < d.ActualHandleTime && d.Status >= EOrderStatus.Filed)) //超期 未办
             .WhereIF(dto.ExpiredOrAlmostOverdue.HasValue && dto.ExpiredOrAlmostOverdue == false, d => d.NearlyExpiredTime < DateTime.Now && d.ExpiredTime > DateTime.Now)//即将超期 未办
-            .WhereIF(dto.StartTime.HasValue, d => d.StartTime >= dto.StartTime)
-            .WhereIF(dto.EndTime.HasValue, d => d.StartTime <= dto.EndTime)
+            .WhereIF(dto.StartTime.HasValue, d => d.CreationTime >= dto.StartTime)
+            .WhereIF(dto.EndTime.HasValue, d => d.CreationTime <= dto.EndTime)
 			.Where(x => x.Source < ESource.MLSQ || x.Source > ESource.WZSC)
             .Where(x => x.Status != EOrderStatus.BackToProvince)
             .OrderBy(d => d.Status)
@@ -3017,8 +3017,8 @@ public class OrderController : BaseController
             .WhereIF(dto.IsCounterSign.HasValue && dto.IsCounterSign == false, d => !d.CounterSignType.HasValue)
             .WhereIF(dto.ExpiredOrAlmostOverdue.HasValue && dto.ExpiredOrAlmostOverdue == true, d => (d.ExpiredTime < DateTime.Now && d.Status < EOrderStatus.Filed) || (d.ExpiredTime < d.ActualHandleTime && d.Status >= EOrderStatus.Filed)) //超期 未办
             .WhereIF(dto.ExpiredOrAlmostOverdue.HasValue && dto.ExpiredOrAlmostOverdue == false, d => d.NearlyExpiredTime < DateTime.Now && d.ExpiredTime > DateTime.Now)//即将超期 未办
-            .WhereIF(dto.StartTime.HasValue, d => d.StartTime >= dto.StartTime)
-            .WhereIF(dto.EndTime.HasValue, d => d.StartTime <= dto.EndTime)
+            .WhereIF(dto.StartTime.HasValue, d => d.CreationTime >= dto.StartTime)
+            .WhereIF(dto.EndTime.HasValue, d => d.CreationTime <= dto.EndTime)
 			.Where(d => d.Source < ESource.MLSQ || d.Source > ESource.WZSC)
             .Where(d => d.Status != EOrderStatus.BackToProvince)
             .Where(d => SqlFunc.Subqueryable<OrderSpecial>().Where(os => os.OrderId  == d.Id).NotAny())

+ 2 - 1
src/Hotline/Orders/Order.cs

@@ -23,7 +23,8 @@ namespace Hotline.Orders
     [Description("工单")]
     [SugarIndex("unique_order_no", nameof(Order.No), OrderByType.Desc, true)]
     [SugarIndex("index_order_creationtime", nameof(Order.CreationTime), OrderByType.Asc)]
-    public partial class Order : PositionWorkflowEntity
+    [SugarIndex("index_order_startTime", nameof(Order.StartTime), OrderByType.Asc)]
+	public partial class Order : PositionWorkflowEntity
     {
         public Order()
         {