TurnerIlya/PIbd-22_Turner_I.A._PlumbingRepair
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

логгер видит реальное количество заказов

Browse Source
This commit is contained in:
ityurner02@mail.ru 2023-04-16 22:47:33 +04:00
parent 9ba9cf92d1
commit b38577fc3a
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
PlumbingRepair/PlumbingRepairDatabaseImplement/Implements/OrderStorage.cs
View File

@ -44,7 +44,7 @@ namespace PlumbingRepairDatabaseImplement.Implements
.Select(x => x.GetViewModel) .Select(x => x.GetViewModel)
.ToList(); .ToList();
} }
else if (model.ClientId.HasValue) else if (model.ClientId.HasValue)
{ {
return context.Orders return context.Orders
.Include(x => x.Work) .Include(x => x.Work)
@ -64,9 +64,14 @@ namespace PlumbingRepairDatabaseImplement.Implements
.Select(x => x.GetViewModel) .Select(x => x.GetViewModel)
.ToList(); .ToList();
} }
return context.Orders
return new(); .Include(x => x.Work)
} .Include(x => x.Client)
.Include(x => x.Implementer)
.Where(x => model.Status == x.Status)
.Select(x => x.GetViewModel)
.ToList();
}
public OrderViewModel? GetElement(OrderSearchModel model) public OrderViewModel? GetElement(OrderSearchModel model)
{ {
@ -81,9 +86,10 @@ namespace PlumbingRepairDatabaseImplement.Implements
.Include(x => x.Work) .Include(x => x.Work)
.Include(x => x.Client) .Include(x => x.Client)
.Include(x => x.Implementer) .Include(x => x.Implementer)
.FirstOrDefault(x => (!model.ImplementerId.HasValue || x.ImplementerId == model.ImplementerId) && .FirstOrDefault(x => (model.Status == null || model.Status != null && model.Status == x.Status) &&
(!model.Status.HasValue || x.Status == model.Status) && model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId ||
(!model.Id.HasValue || x.Id == model.Id))?.GetViewModel; model.Id.HasValue && x.Id == model.Id)
?.GetViewModel;
} }
public OrderViewModel? Insert(OrderBindingModel model) public OrderViewModel? Insert(OrderBindingModel model)