|
|
@@ -161,7 +161,7 @@ namespace Hotline.Api.Controllers
|
|
|
.Where(d => d.Source < ESource.MLSQ || d.Source > ESource.WZSC)
|
|
|
.Where(d => d.Status != EOrderStatus.BackToProvince && d.Status < EOrderStatus.Filed)
|
|
|
.Where(d => d.OrderSpecials.Any() == false || d.OrderSpecials.Any(s => s.State > 0))
|
|
|
- .GroupBy(o => new { o.Id,o.Status }).MergeTable()
|
|
|
+ .GroupBy(o => new { o.Id,o.Status })
|
|
|
.Select(o => new
|
|
|
{
|
|
|
aboutExpire = SqlFunc.AggregateSum(SqlFunc.IIF(DateTime.Now > o.NearlyExpiredTime!.Value && DateTime.Now < o.ExpiredTime!.Value,
|
