|
@@ -37,7 +37,9 @@ namespace Hotline.Orders
|
|
.WhereIF(!string.IsNullOrEmpty(dto.SupplyName), p => p.SupplyName == dto.SupplyName)
|
|
.WhereIF(!string.IsNullOrEmpty(dto.SupplyName), p => p.SupplyName == dto.SupplyName)
|
|
.WhereIF(dto.StartTime.HasValue, p => p.SupplyTime >= dto.StartTime)
|
|
.WhereIF(dto.StartTime.HasValue, p => p.SupplyTime >= dto.StartTime)
|
|
.WhereIF(dto.EndTime.HasValue, p => p.SupplyTime <= dto.EndTime)
|
|
.WhereIF(dto.EndTime.HasValue, p => p.SupplyTime <= dto.EndTime)
|
|
- .OrderByDescending(p => p.SupplyTime);
|
|
|
|
|
|
+ .OrderByIF(dto is { SortField: "supplyTime", SortRule: 0 }, d => d.SupplyTime, OrderByType.Asc) //受理时间升序
|
|
|
|
+ .OrderByIF(dto is { SortField: "supplyTime", SortRule: 1 }, d => d.SupplyTime, OrderByType.Desc) //受理时间降序
|
|
|
|
+ .OrderByIF(string.IsNullOrEmpty(dto.SortField), p => p.SupplyTime, OrderByType.Desc);
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
@@ -58,7 +60,9 @@ namespace Hotline.Orders
|
|
.WhereIF(dto.StartTime.HasValue, p => p.CreationTime >= dto.StartTime)
|
|
.WhereIF(dto.StartTime.HasValue, p => p.CreationTime >= dto.StartTime)
|
|
.WhereIF(dto.EndTime.HasValue, p => p.CreationTime <= dto.EndTime)
|
|
.WhereIF(dto.EndTime.HasValue, p => p.CreationTime <= dto.EndTime)
|
|
.WhereIF(!string.IsNullOrEmpty(dto.OperationType), p => p.OperationType == dto.OperationType)
|
|
.WhereIF(!string.IsNullOrEmpty(dto.OperationType), p => p.OperationType == dto.OperationType)
|
|
- .OrderByDescending(p => p.CreationTime);
|
|
|
|
|
|
+ .OrderByIF(dto is { SortField: "creationTime", SortRule: 0 }, d => d.CreationTime, OrderByType.Asc) //受理时间升序
|
|
|
|
+ .OrderByIF(dto is { SortField: "creationTime", SortRule: 1 }, d => d.CreationTime, OrderByType.Desc) //受理时间降序
|
|
|
|
+ .OrderByIF(string.IsNullOrEmpty(dto.SortField), p => p.CreationTime, OrderByType.Desc);
|
|
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|