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

rotatingShift Compute on Rollcall Bug Fixed

Browse Source
This commit is contained in:
SamSys
2025-04-22 19:14:26 +03:30
parent aff835fd7f
commit 57930aae4f
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CompanyManagment.Application/RollCallEmployeeStatusApplication.cs
View File

@@ -123,7 +123,10 @@ namespace CompanyManagment.Application
bool skipRollCallByEmployeeId = employeeId is 42550;
if (skipRollCallByEmployeeId)
return false;
//9211 محسا تازه
if (employeeId == 9211 && contractStart >= start1404)
return false;
var service = _rollCallServiceRepository.GetAllServiceByWorkshopId(workshopId);

2
CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs
View File

@@ -845,7 +845,7 @@ CreateWorkingHoursTemp command, bool holidayWorking)
if (shift.Start >= eveningStart // 22<---<14
&& shift.End <= eveningEnd)
{
eveningWorkingTime = morningWorkingTime.Add(eveningEnd - eveningStart);
eveningWorkingTime = eveningWorkingTime.Add(shift.End - shift.Start);
}
else if (shift.Start >= eveningStart && shift.Start < eveningEnd // 6<---22---14
&& shift.End > nightStart && shift.End <= nightEndNextday)