|
|
@@ -44,6 +44,7 @@ using Microsoft.AspNetCore.Authorization;
|
|
|
using Microsoft.AspNetCore.Mvc;
|
|
|
using MiniExcelLibs;
|
|
|
using SqlSugar;
|
|
|
+using System;
|
|
|
using XF.Domain.Authentications;
|
|
|
using XF.Domain.Cache;
|
|
|
using XF.Domain.Constants;
|
|
|
@@ -2896,7 +2897,9 @@ public class OrderController : BaseController
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.ActualHandleOrgName), x => x.ActualHandleOrgName!.Contains(dto.ActualHandleOrgName!))
|
|
|
.WhereIF(dto.Status.HasValue, x => x.Status == dto.Status)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.AcceptorName), x => x.AcceptorName!.Contains(dto.AcceptorName!))
|
|
|
- .WhereIF(dto.ExpiredStatus.HasValue, x => x.ExpiredStatus == dto.ExpiredStatus)
|
|
|
+ .WhereIF(dto.ExpiredStatus is EExpiredStatus.Normal, x => DateTime.Now < x.NearlyExpiredTime)
|
|
|
+ .WhereIF(dto.ExpiredStatus is EExpiredStatus.GoingToExpired, x => DateTime.Now > x.NearlyExpiredTime && DateTime.Now < x.ExpiredTime)
|
|
|
+ .WhereIF(dto.ExpiredStatus is EExpiredStatus.Expired, x => DateTime.Now >= x.ExpiredTime)
|
|
|
.OrderBy(x => x.Status)
|
|
|
.OrderBy(x => x.CreationTime, OrderByType.Desc)
|
|
|
.ToPagedListAsync(dto, HttpContext.RequestAborted);
|
