From a1736fa3cc929acf5b8a963ecb70ddb29c262f5c Mon Sep 17 00:00:00 2001 From: mahan Date: Tue, 23 Dec 2025 11:20:10 +0330 Subject: [PATCH] refactor: clean up InstitutionContractApplication and remove unused properties from InstitutionContractPrintViewModel --- .../InstitutionContractWorkshopCurrent.cs | 2 -- .../InstitutionContract/InstitutionContractPrintViewModel.cs | 2 -- CompanyManagment.Application/InstitutionContractApplication.cs | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopCurrent.cs b/Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopCurrent.cs index dd90736f..1f884553 100644 --- a/Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopCurrent.cs +++ b/Company.Domain/InstitutionContractAgg/InstitutionContractWorkshopCurrent.cs @@ -12,8 +12,6 @@ public class InstitutionContractWorkshopCurrent:InstitutionContractWorkshopBase bool hasContractPlanInPerson, bool hasInsurancePlan, bool hasInsurancePlanInPerson, int personnelCount, double price,long institutionContractWorkshopGroupId, InstitutionContractWorkshopGroup workshopGroup,long workshopId,bool isAmendment, long initialWorkshopId) : base(workshopName, hasRollCallPlan, - int personnelCount, double price,long institutionContractWorkshopGroupId, - InstitutionContractWorkshopGroup workshopGroup,long workshopId,long initialWorkshopId,bool isAmendment) : base(workshopName, hasRollCallPlan, hasRollCallPlanInPerson, hasCustomizeCheckoutPlan, hasContractPlan, hasContractPlanInPerson, hasInsurancePlan, hasInsurancePlanInPerson, personnelCount, price,isAmendment) { diff --git a/CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractPrintViewModel.cs b/CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractPrintViewModel.cs index 238fc4d1..05bef59d 100644 --- a/CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractPrintViewModel.cs +++ b/CompanyManagment.App.Contracts/InstitutionContract/InstitutionContractPrintViewModel.cs @@ -25,6 +25,4 @@ public class InstitutionContractPrintViewModel public string VerifierPhoneNumber { get; set; } public LawViewModel LawViewModel { get; set; } public string Obligation { get; set; } - public string OneMonthWithoutTax { get; set; } - public string OneMonthTax { get; set; } } \ No newline at end of file diff --git a/CompanyManagment.Application/InstitutionContractApplication.cs b/CompanyManagment.Application/InstitutionContractApplication.cs index 6a71c2b8..ab2fc788 100644 --- a/CompanyManagment.Application/InstitutionContractApplication.cs +++ b/CompanyManagment.Application/InstitutionContractApplication.cs @@ -1570,7 +1570,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication createdWorkshop.Services.InsuranceInPerson,createdWorkshop.PersonnelCount, createdWorkshop.Price, createdWorkshop.InstitutionContractWorkshopGroupId,createdWorkshop.WorkshopGroup, createdWorkshop.WorkshopId!.Value, false,createdWorkshop.id); - createdWorkshop.WorkshopId!.Value, createdWorkshop.id,false); + institutionContract.WorkshopGroup.AddCurrentWorkshop(currentWorkshop);