diff --git a/RenovationWork/RenovationWorkDatabaseImplement/Implements/OrderStorage.cs b/RenovationWork/RenovationWorkDatabaseImplement/Implements/OrderStorage.cs index 1f47fc8..326e604 100644 --- a/RenovationWork/RenovationWorkDatabaseImplement/Implements/OrderStorage.cs +++ b/RenovationWork/RenovationWorkDatabaseImplement/Implements/OrderStorage.cs @@ -23,9 +23,14 @@ namespace RenovationWorkDatabaseImplement.Implements public List GetFilteredList(OrderSearchModel model) { using var context = new RenovationWorkDatabase(); - var result = context.Orders.Include(x => x.Repair).Select(x => x.GetViewModel).ToList(); - return result; - } + if (model.DateFrom.HasValue) + { + return context.Orders.Include(x => x.Repair).Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo).Select(x => x.GetViewModel).ToList(); + } + return context.Orders.Include(x => x.Repair).Where(x => x.Id == model.Id).Select(x => x.GetViewModel).ToList(); + //var result = context.Orders.Include(x => x.Repair).Select(x => x.GetViewModel).ToList(); + // return result; + } public OrderViewModel? GetElement(OrderSearchModel model) {