From e19fa68a6bbbe2f87f4051efe048f06dc96e59c8 Mon Sep 17 00:00:00 2001 From: Sergey Kozyrev Date: Wed, 1 May 2024 15:38:13 +0400 Subject: [PATCH] BackReport --- Course/DatabaseImplement/Implements/WorkshopStorage.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Course/DatabaseImplement/Implements/WorkshopStorage.cs b/Course/DatabaseImplement/Implements/WorkshopStorage.cs index fcd1c42..fe6059d 100644 --- a/Course/DatabaseImplement/Implements/WorkshopStorage.cs +++ b/Course/DatabaseImplement/Implements/WorkshopStorage.cs @@ -35,7 +35,9 @@ namespace DatabaseImplement.Implements return new(); } using var context = new FactoryGoWorkDatabase(); - if (model.DateFrom.HasValue) + if (model.DetailId.HasValue) + return context.Workshops.Where(x => x.ProductionId.HasValue).Include(x => x.Production).Where(x => x.Production.Details.FirstOrDefault(y => y.DetailId == model.DetailId) != null).Where(x => x.UserId == model.UserId).Select(x => x.GetViewModel).ToList(); + else if (model.DateFrom.HasValue) return context.Workshops.Where(x => x.UserId == model.Id).Where(x => x.DateCreate < model.DateTo && x.DateCreate > model.DateFrom).Select(x => x.GetViewModel).ToList(); else return context.Workshops.Where(x => x.UserId == model.Id).Select(x => x.GetViewModel).ToList();