diff --git a/CompanyManagment.EFCore/Repository/AdminMonthlyOverviewRepository.cs b/CompanyManagment.EFCore/Repository/AdminMonthlyOverviewRepository.cs index f2893897..ef958b85 100644 --- a/CompanyManagment.EFCore/Repository/AdminMonthlyOverviewRepository.cs +++ b/CompanyManagment.EFCore/Repository/AdminMonthlyOverviewRepository.cs @@ -234,11 +234,23 @@ public class AdminMonthlyOverviewRepository : RepositoryBase workshopIds, DateTime targetDate, DateTime nextMonth) { - var workingCheckoutEmployeeIds = _companyContext.LeftWorkList.AsNoTracking() - .Where(x => workshopIds.Contains(x.WorkshopId) && x.StartWorkDate <= targetDate && x.LeftWorkDate.AddDays(-1) >= targetDate) - .Select(x => new { x.WorkshopId, x.EmployeeId }); + var workingCheckoutEmployeeIds = _companyContext.LeftWorkList.AsNoTracking() + .Join( + _companyContext.Contracts.AsNoTracking(), + leftWork => new { leftWork.EmployeeId, WorkshopId = leftWork.WorkshopId }, + contract => new { contract.EmployeeId, WorkshopId = contract.WorkshopIds }, + (leftWork, contract) => new { leftWork, contract } + ) + .Where(x => + workshopIds.Contains(x.leftWork.WorkshopId) && + x.leftWork.StartWorkDate <= targetDate && + x.leftWork.LeftWorkDate.AddDays(-1) >= targetDate && + x.contract.ContarctStart <= targetDate && + x.contract.ContractEnd >= targetDate + ) + .Select(x => new { x.leftWork.WorkshopId, x.leftWork.EmployeeId }); - var workingContractEmployeeIds = _companyContext.LeftWorkList.AsNoTracking() + var workingContractEmployeeIds = _companyContext.LeftWorkList.AsNoTracking() .Where(x => workshopIds.Contains(x.WorkshopId) && x.StartWorkDate <= nextMonth && x.LeftWorkDate.AddDays(-1) >= nextMonth) .Select(x => new { x.WorkshopId, x.EmployeeId }); diff --git a/ServiceHost/Areas/AdminNew/Pages/Shared/_Menu.cshtml b/ServiceHost/Areas/AdminNew/Pages/Shared/_Menu.cshtml index 49698052..7964bc77 100644 --- a/ServiceHost/Areas/AdminNew/Pages/Shared/_Menu.cshtml +++ b/ServiceHost/Areas/AdminNew/Pages/Shared/_Menu.cshtml @@ -401,60 +401,7 @@ -
  • - - - - - - - - -
  • +