admin/Backend-Api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

report bug fixed

Browse Source
This commit is contained in:
SamSys
2025-04-19 20:34:16 +03:30
parent aad033731a
commit c5c79a9629
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CompanyManagment.EFCore/Repository/ReportRepository.cs
View File

@@ -1605,7 +1605,7 @@ public class ReportRepository : IReportRepository
x.StartWorkDate <= nextMonthEnd && x.LeftWorkDate > nextMonthStart);
var allContractLeftworkEmployeeIds = allContractLeftworks.Select(x => x.EmployeeId).ToList();
var allContractCreated = _context.Contracts
.Where(x => allContractLeftworkEmployeeIds.Contains(x.EmployeeId))
.Where(x => allContractLeftworkEmployeeIds.Contains(x.EmployeeId) && x.WorkshopIds == workshopId)
.Where(x =>
x.ContarctStart.Date <= nextMonthEnd.Date && x.ContractEnd.Date > nextMonthStart.Date && x.IsActiveString == "true");
var allContractCreatedEmoployeeIds = allContractCreated.Select(x => x.EmployeeId).ToList();
@@ -1737,7 +1737,7 @@ public class ReportRepository : IReportRepository
x.StartWorkDate <= currentMonthEnd && x.LeftWorkDate > currentMonthStart);
var allContractLeftworkEmployeeIds = allContractLeftworks.Select(x => x.EmployeeId).ToList();
var allContractCreated = _context.CheckoutSet
.Where(x => allContractLeftworkEmployeeIds.Contains(x.EmployeeId))
.Where(x => allContractLeftworkEmployeeIds.Contains(x.EmployeeId) && x.WorkshopId == workshopId)
.Where(x =>
x.ContractStart.Date <= currentMonthEnd.Date && x.ContractEnd.Date > currentMonthStart.Date && x.IsActiveString == "true");
var allContractCreatedEmoployeeIds = allContractCreated.Select(x => x.EmployeeId).ToList();