Borschevskaya A.A. Lab work 4 #6

Closed
pgirl1 wants to merge 17 commits from lab4_base into lab3_base
2 changed files with 2 additions and 2 deletions
Showing only changes of commit dda3f213c9 - Show all commits

View File

@ -32,7 +32,7 @@ namespace FurnitureAssemFileImplement.Implements
return new();
}
return source.Orders
.Where(x => x.Id.Equals(model.Id))
.Where(x => x.Id.Equals(model.Id) || model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo)
.Select(x => GetOrderViewModel(x))
.ToList();
}

View File

@ -36,7 +36,7 @@ namespace FurnitureAssemblyDatabaseImplement.Implements
using var context = new FurnitureAssemblyDatabase();
return context.Orders
.Include(x => x.Furniture)
.Where(x => x.Id == model.Id)
.Where(x => x.Id == model.Id || model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo)
.Select(x => x.GetViewModel)
.ToList();
}