diff --git a/CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionCompleteRequest.cs b/CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionCompleteRequest.cs index 8de7ac89..e507db6d 100644 --- a/CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionCompleteRequest.cs +++ b/CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractExtensionCompleteRequest.cs @@ -7,6 +7,7 @@ public class InstitutionContractExtensionCompleteRequest public Guid TemporaryId { get; set; } public bool IsInstallment { get; set; } public long LawId { get; set; } + public bool CancelSendVerificationSms { get; set; } } public class InstitutionContractCreationCompleteRequest diff --git a/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs b/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs index 99f7b652..39c98954 100644 --- a/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs +++ b/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs @@ -2269,7 +2269,8 @@ public class InstitutionContractRepository : RepositoryBase x.WorkshopId.Value)??[]; + var workshopIds = prevInstitutionContracts.WorkshopGroup?.CurrentWorkshops?.Select(x => x.WorkshopId.Value) ?? + []; var workshopsNotInInstitution = employerWorkshopIds.Where(x => !workshopIds.Contains(x)).ToList(); @@ -2317,7 +2318,7 @@ public class InstitutionContractRepository : RepositoryBase workshopsNotInInstitution.Contains(x.WorkshopId) && x.StartWorkDate <= DateTime.Now && x.LeftWorkDate >= DateTime.Now) @@ -2959,8 +2960,11 @@ public class InstitutionContractRepository : RepositoryBase workshopDetails = []; @@ -5109,9 +5113,11 @@ public class InstitutionContractRepository : RepositoryBase