Поправки после слияния

This commit is contained in:
prodigygirl 2023-03-11 10:57:24 +04:00
parent ef9ae7a52b
commit dda3f213c9
2 changed files with 2 additions and 2 deletions

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();
}