From 86143a044c529f1fa53a598efd762bc56e77d99c Mon Sep 17 00:00:00 2001 From: SamSys Date: Mon, 9 Jun 2025 16:45:23 +0330 Subject: [PATCH] report bug fixed --- CompanyManagment.EFCore/Repository/ReportRepository.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CompanyManagment.EFCore/Repository/ReportRepository.cs b/CompanyManagment.EFCore/Repository/ReportRepository.cs index 85b5924e..83e41372 100644 --- a/CompanyManagment.EFCore/Repository/ReportRepository.cs +++ b/CompanyManagment.EFCore/Repository/ReportRepository.cs @@ -2089,6 +2089,7 @@ public class ReportRepository : IReportRepository var notCompletedWorkshops = accountWorkshopList.Select(workshop => { + var contractSigned = workshop.Contracts2.Count(x => x.Signature == "1"); var contractCreated = workshop.Contracts2.Count(); int contractSignedPercent = 0; @@ -2103,9 +2104,12 @@ public class ReportRepository : IReportRepository if (contractSignedPercent < 100 && contractCreated > 0) { - + var contractEmployeeIds = workshop.Contracts2.Where(x => x.Signature == "0") + .Select(x => x.EmployeeId).ToList(); + var lefts = workshop.LeftWorks.Select(x => x.EmployeeId).Distinct().ToList(); + var contractNotNullEmployeeId = lefts.Where(x => contractEmployeeIds.Contains(x)).ToList(); var employeeNotDone = - workshop.Contracts2.Where(x => x.Signature == "0").Select(l => new EmployeeNotDone() + workshop.Contracts2.Where(x => x.Signature == "0" && contractNotNullEmployeeId.Contains(x.EmployeeId)).Select(l => new EmployeeNotDone() { Id = l.EmployeeId, EmployeeFullName = workshop.LeftWorks.FirstOrDefault(x => x.EmployeeId == l.EmployeeId)!.EmployeeFullName,