lab4.
This commit is contained in:
parent
d62db28640
commit
e62bd8a33c
@ -25,7 +25,12 @@ namespace ConfectioneryFileImplement.Implements
|
|||||||
return new();
|
return new();
|
||||||
}
|
}
|
||||||
return source.Orders
|
return source.Orders
|
||||||
.Where(x => x.Id == model.Id)
|
.Where(x => (
|
||||||
|
(!model.Id.HasValue || x.Id == model.Id) &&
|
||||||
|
(!model.DateFrom.HasValue || x.DateCreate >= model.DateFrom) &&
|
||||||
|
(!model.DateTo.HasValue || x.DateCreate <= model.DateTo)
|
||||||
|
)
|
||||||
|
)
|
||||||
.Select(x => AccessPastryStorage(x.GetViewModel))
|
.Select(x => AccessPastryStorage(x.GetViewModel))
|
||||||
.ToList();
|
.ToList();
|
||||||
}
|
}
|
||||||
|
@ -30,7 +30,9 @@ namespace ConfectioneryListImplement.Implements
|
|||||||
}
|
}
|
||||||
foreach (var order in _source.Orders)
|
foreach (var order in _source.Orders)
|
||||||
{
|
{
|
||||||
if (order.Id == model.Id)
|
if ((!model.Id.HasValue || order.Id == model.Id) &&
|
||||||
|
(!model.DateFrom.HasValue || order.DateCreate >= model.DateFrom) &&
|
||||||
|
(!model.DateTo.HasValue || order.DateCreate <= model.DateTo))
|
||||||
{
|
{
|
||||||
result.Add(AccessPastryStorage(order.GetViewModel));
|
result.Add(AccessPastryStorage(order.GetViewModel));
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user