From 57930aae4f99a8d44c39d5143f9721d01610d075 Mon Sep 17 00:00:00 2001 From: SamSys Date: Tue, 22 Apr 2025 19:14:26 +0330 Subject: [PATCH] rotatingShift Compute on Rollcall Bug Fixed --- .../RollCallEmployeeStatusApplication.cs | 5 ++++- .../Repository/RollCallMandatoryRepository.cs | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CompanyManagment.Application/RollCallEmployeeStatusApplication.cs b/CompanyManagment.Application/RollCallEmployeeStatusApplication.cs index 6d5b1dc0..8b95f3a0 100644 --- a/CompanyManagment.Application/RollCallEmployeeStatusApplication.cs +++ b/CompanyManagment.Application/RollCallEmployeeStatusApplication.cs @@ -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); diff --git a/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs b/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs index e4cac8e7..24ff10d8 100644 --- a/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs +++ b/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs @@ -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)