diff --git a/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs b/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs index 2a89c94a..9049c2f3 100644 --- a/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs +++ b/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs @@ -909,24 +909,30 @@ public class InstitutionContractRepository : RepositoryBase x.id == rollCallService.WorkshopId); string description = ""; - if (rollCallService.StartService <= prevMonthStart) - { - var monthPrev = prevMonthEnd.ToFarsi().Substring(5, 2); - var yearPrev = prevMonthEnd.ToFarsi().Substring(0, 4); - var prevMonthName = monthPrev.ToFarsiMonthByNumber(); - description = - $"{prevMonthName} و {currentMonthName} {yearCurrent} - {workshop.WorkshopFullName}"; - monthCounter = 2; - } - else if (rollCallService.StartService <= currentMonthStart && - rollCallService.StartService > prevMonthStart) + //if (rollCallService.StartService <= prevMonthStart) + //{ + // var monthPrev = prevMonthEnd.ToFarsi().Substring(5, 2); + // var yearPrev = prevMonthEnd.ToFarsi().Substring(0, 4); + // var prevMonthName = monthPrev.ToFarsiMonthByNumber(); + // description = + // $"{prevMonthName} و {currentMonthName} {yearCurrent} - {workshop.WorkshopFullName}"; + // monthCounter = 2; + //} + //else if (rollCallService.StartService <= currentMonthStart && + // rollCallService.StartService > prevMonthStart) + //{ + // monthCounter = 1; + + // description = $"{currentMonthName} {yearCurrent} - {workshop.WorkshopFullName}"; + //} + + if (rollCallService.StartService <= currentMonthStart) { monthCounter = 1; description = $"{currentMonthName} {yearCurrent} - {workshop.WorkshopFullName}"; } - var employees = _context.RollCallEmployees.Where(x => x.WorkshopId == rollCallService.WorkshopId) .Select(x => x.id); @@ -965,9 +971,14 @@ public class InstitutionContractRepository : RepositoryBase @@ -988,7 +999,7 @@ public class InstitutionContractRepository : RepositoryBase