diff --git a/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs b/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs index c4fb239a..3443b0cc 100644 --- a/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs +++ b/CompanyManagment.EFCore/Repository/InstitutionContractRepository.cs @@ -87,7 +87,9 @@ public class InstitutionContractRepository : RepositoryBase hubContext, ILogger logger, IUidService uidService, - IContractingPartyTempRepository contractingPartyTempRepository, IPersonalContractingPartyRepository contractingPartyRepository, IRepresentativeRepository representativeRepository, IAccountApplication accountApplication) : base(context) + IContractingPartyTempRepository contractingPartyTempRepository, + IPersonalContractingPartyRepository contractingPartyRepository, + IRepresentativeRepository representativeRepository, IAccountApplication accountApplication) : base(context) { _context = context; _employerRepository = employerRepository; @@ -5307,6 +5309,7 @@ public class InstitutionContractRepository : RepositoryBase workshopDetails=[]; + List workshopDetails = []; if (contractingParty != null) { var employerWorkshopIds = _context.Employers @@ -5559,18 +5562,17 @@ public class InstitutionContractRepository : RepositoryBase x.Id == creationTemp.Id, creationTemp ); - - + + var res = new InstitutionContractCreationWorkshopsResponse() { TotalAmount = workshopDetails.Sum(x => x.WorkshopServicesAmount).ToMoney(), @@ -5959,7 +5961,7 @@ public class InstitutionContractRepository : RepositoryBase CreationComplete(InstitutionContractExtensionCompleteRequest request) { @@ -5989,16 +5991,19 @@ public class InstitutionContractRepository : RepositoryBase contractingPartyResult = institutionContractTemp.ContractingPartyLegalType switch - { - LegalType.Legal => await CreateLegalContractingPartyEntity(institutionContractTemp.LegalParty, institutionContractTemp.RepresentativeId, - institutionContractTemp.Address, - institutionContractTemp.City, institutionContractTemp.Province), - LegalType.Real => await CreateRealContractingPartyEntity(institutionContractTemp.RealParty, institutionContractTemp.RepresentativeId, - institutionContractTemp.Address, - institutionContractTemp.City, institutionContractTemp.Province), - _ => throw new BadRequestException("نوع طرف قرارداد مشخص نشده است") - }; + OperationResult contractingPartyResult = + institutionContractTemp.ContractingPartyLegalType switch + { + LegalType.Legal => await CreateLegalContractingPartyEntity(institutionContractTemp.LegalParty, + institutionContractTemp.RepresentativeId, + institutionContractTemp.Address, + institutionContractTemp.City, institutionContractTemp.Province), + LegalType.Real => await CreateRealContractingPartyEntity(institutionContractTemp.RealParty, + institutionContractTemp.RepresentativeId, + institutionContractTemp.Address, + institutionContractTemp.City, institutionContractTemp.Province), + _ => throw new BadRequestException("نوع طرف قرارداد مشخص نشده است") + }; if (!contractingPartyResult.IsSuccedded) throw new BadRequestException(contractingPartyResult.Message); contractingParty = contractingPartyResult.Data; @@ -6021,10 +6026,11 @@ public class InstitutionContractRepository : RepositoryBase x.ContractingPartyId == contractingPartyId && x.IsActiveString == "true")) - return opration.Failed("برای این طرف قرارداد قبلا قرارداد اصلی ایجاد شده است، شما میتوانید از تمدید استفاده کنید"); + return opration.Failed( + "برای این طرف قرارداد قبلا قرارداد اصلی ایجاد شده است، شما میتوانید از تمدید استفاده کنید"); if (string.IsNullOrWhiteSpace(contractStart)) @@ -6048,7 +6054,7 @@ public class InstitutionContractRepository : RepositoryBase> CreateLegalContractingPartyEntity( - InstitutionContractCreationTempLegalParty request, long representativeId, string address, string city, + private async Task> CreateLegalContractingPartyEntity( + InstitutionContractCreationTempLegalParty request, long representativeId, string address, string city, string state) { var opration = new OperationResult(); @@ -6318,6 +6325,7 @@ public class InstitutionContractRepository : RepositoryBase