diff --git a/CarCenter/CarCenterContracts/SearchModels/CarSearchModel.cs b/CarCenter/CarCenterContracts/SearchModels/CarSearchModel.cs index 58299fa..bd280c0 100644 --- a/CarCenter/CarCenterContracts/SearchModels/CarSearchModel.cs +++ b/CarCenter/CarCenterContracts/SearchModels/CarSearchModel.cs @@ -10,6 +10,7 @@ namespace CarCenterContracts.SearchModels { public int? Id { get; set; } public long? VINnumber { get; set; } + public int? StorekeeperId { get; set; } public DateTime? DateFrom { get; set; } public DateTime? DateTo { get; set; } } diff --git a/CarCenter/CarCenterContracts/SearchModels/OrderSearchModel.cs b/CarCenter/CarCenterContracts/SearchModels/OrderSearchModel.cs index 95be01d..732032a 100644 --- a/CarCenter/CarCenterContracts/SearchModels/OrderSearchModel.cs +++ b/CarCenter/CarCenterContracts/SearchModels/OrderSearchModel.cs @@ -10,7 +10,8 @@ namespace CarCenterContracts.SearchModels public class OrderSearchModel { public int? Id { get; set; } - public List Presales { get; set; } = new(); + public int? WorkerId { get; set; } + public List Presales { get; set; } = new(); public List Cars { get; set; } = new(); public DateTime? DateFrom { get; set; } public DateTime? DateTo { get; set; } diff --git a/CarCenter/CarCenterDatabaseImplement/Implements/CarStorage.cs b/CarCenter/CarCenterDatabaseImplement/Implements/CarStorage.cs index d9a1fbd..b0e0fa4 100644 --- a/CarCenter/CarCenterDatabaseImplement/Implements/CarStorage.cs +++ b/CarCenter/CarCenterDatabaseImplement/Implements/CarStorage.cs @@ -33,6 +33,7 @@ namespace CarCenterDatabaseImplement.Implements { //будет применятся в ReportLogic return context.Cars + .Where(x => x.StorekeeperId == model.StorekeeperId) .Include(x => x.Bundlings) .ThenInclude(x => x.Bundling) .Include(x => x.Feature) @@ -45,7 +46,8 @@ namespace CarCenterDatabaseImplement.Implements else if (model.Id.HasValue) { return context.Cars - .Include(x => x.Bundlings) + .Where(x => x.StorekeeperId == model.StorekeeperId) + .Include(x => x.Bundlings) .ThenInclude(x => x.Bundling) .Include(x => x.Feature) .Include(x => x.Order) diff --git a/CarCenter/CarCenterDatabaseImplement/Implements/OrderStorage.cs b/CarCenter/CarCenterDatabaseImplement/Implements/OrderStorage.cs index 22a5319..81fa605 100644 --- a/CarCenter/CarCenterDatabaseImplement/Implements/OrderStorage.cs +++ b/CarCenter/CarCenterDatabaseImplement/Implements/OrderStorage.cs @@ -59,6 +59,7 @@ namespace CarCenterDatabaseImplement.Implements { //будет применятся в ReportLogic return context.Orders + .Where(x => x.WorkerId == model.WorkerId) .Include(x => x.Worker) .Include(x => x.Cars) .Include(x => x.Presales) @@ -76,6 +77,7 @@ namespace CarCenterDatabaseImplement.Implements { //будет применятся в ReportLogic return context.Orders + .Where(x => x.WorkerId == model.WorkerId) .Include(x => x.Worker) .Include(x => x.Cars) .Include(x => x.Presales) @@ -88,6 +90,7 @@ namespace CarCenterDatabaseImplement.Implements { //будет применятся в ReportLogic return context.Orders + .Where(x => x.WorkerId == model.WorkerId) .Include(x => x.Worker) .Include(x => x.Cars) .Include(x => x.Presales) @@ -99,7 +102,8 @@ namespace CarCenterDatabaseImplement.Implements else if (model.Id.HasValue) { return context.Orders - .Include(x => x.Worker) + .Where(x => x.WorkerId == model.WorkerId) + .Include(x => x.Worker) .Include(x => x.Cars) .Include(x => x.Presales) .ThenInclude(x => x.Presale)