diff --git a/CarCenter/CarCenterDataBaseImplement/Implements/EmployeeStorage.cs b/CarCenter/CarCenterDataBaseImplement/Implements/EmployeeStorage.cs index f7323dc..d7d30ac 100644 --- a/CarCenter/CarCenterDataBaseImplement/Implements/EmployeeStorage.cs +++ b/CarCenter/CarCenterDataBaseImplement/Implements/EmployeeStorage.cs @@ -55,7 +55,21 @@ namespace CarCenterDataBaseImplement.Implemets return new(); } using var context = new CarCenterDataBase(); - + if (model.DateFrom.HasValue) + { + return context.Employees + .Include(x => x.Sales) + .ThenInclude(x => x.Sale) + .ThenInclude(x => x.PreSaleWorkSale) + .ThenInclude(x => x.PreSaleWork) + .Include(x => x.Inspections) + .Include(x => x.Manager) + .Where(x => x.ManagerId == model.ManagerId) + .ToList() + .Select(x => x.GetViewModel) + .ToList(); + } + else if (model.ManagerId.HasValue) return context.Employees .Include(x => x.Sales) .ThenInclude(x => x.Sale) @@ -148,4 +162,4 @@ namespace CarCenterDataBaseImplement.Implemets } } -} +} \ No newline at end of file