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

fix bug

Browse Source
This commit is contained in:
SamSys
2025-04-27 21:57:28 +03:30
parent 104534ed96
commit 8bdfd44bba
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/RollCallMandatoryRepository.cs
View File

@@ -2079,7 +2079,7 @@ CreateWorkingHoursTemp command, bool holidayWorking)
#region SalaryAidDeduction
var salaryAidViewModel = _context.SalaryAids
.Where(x => x.SalaryAidDateTime >= checkoutStart && x.SalaryAidDateTime <= checkoutEnd &&
.Where(x => x.CalculationDate >= checkoutStart && x.CalculationDate <= checkoutEnd &&
x.EmployeeId == employeeId && x.WorkshopId == workshopId).Select(x => new SalaryAidViewModel()
{
Amount = x.Amount.ToMoney(),
@@ -2636,7 +2636,7 @@ CreateWorkingHoursTemp command, bool holidayWorking)
#region SalaryAidDeduction
var salaryAidViewModel = _context.SalaryAids
.Where(x => x.SalaryAidDateTime >= contractStart && x.SalaryAidDateTime <= contractEnd && x.EmployeeId == employeeId && x.WorkshopId == workshopId).Select(x => new SalaryAidViewModel()
.Where(x => x.CalculationDate >= contractStart && x.CalculationDate <= contractEnd && x.EmployeeId == employeeId && x.WorkshopId == workshopId).Select(x => new SalaryAidViewModel()
{
Amount = x.Amount.ToMoney(),
AmountDouble = x.Amount,