diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml.cs b/ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml.cs index 733fcee2..38ca5d79 100644 --- a/ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml.cs +++ b/ServiceHost/Areas/AdminNew/Pages/Company/AndroidApk/Index.cshtml.cs @@ -94,11 +94,19 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk var esfandCustomizeCheckouts = _context.CustomizeCheckouts .Where(x => x.WorkshopId == 170 && x.MonthInt == 12 && x.YearInt == 1403); - var employeeSettings = await _context.CustomizeWorkshopEmployeeSettings - .Where(x => x.WorkshopId == 170 && - esfandCustomizeCheckouts.Any(c => c.EmployeeId == x.EmployeeId)).ToListAsync(); - foreach (var employeeSetting in employeeSettings) + + + var employeeSettings = _context.CustomizeWorkshopEmployeeSettings + .Where(x => x.WorkshopId == 170 && + esfandCustomizeCheckouts.Any(c => c.EmployeeId == x.EmployeeId)); + + + var absentEmployees = employeeSettings.Where(x => !_context.RollCalls + .Any(a => a.EmployeeId == x.EmployeeId && a.ShiftDate == new DateTime(2025,03,20))) + .ToList(); + + foreach (var employeeSetting in absentEmployees) { var amount = (int) employeeSetting.Salary / 30; var reward = new Reward(employeeSetting.EmployeeId, 170, amount, "", 0, new DateTime(2025, 3, 21),