change create workshop structure

This commit is contained in:
2025-09-28 10:38:51 +03:30
parent b47759244e
commit 3d12f3b4d2
2 changed files with 14 additions and 6 deletions

View File

@@ -155,7 +155,7 @@ public class CreateWorkshopWorkflowRegistration
/// <summary>
/// باز بودن در تعطیلات
/// </summary>
public bool OpenInHolidays { get; set; }
public bool WorkingInHoliday { get; set; }
/// <summary>
/// محاسبه نوبت کاری در فیش حقوقی
/// </summary>
@@ -248,9 +248,17 @@ public class CreateWorkshopWorkflowRegistration
/// </summary>
public string AgreementNumber { get; set; }
/// <summary>
/// نوع محاسبه طلب مرخصی
/// </summary>
public string ComputeOptions { get; set; }
public bool AddYearsPay { get; set; }
public bool AddLeavePay { get; set; }
/// <summary>
/// نوع محسبه عیدی و پاداش
/// </summary>
public string BonusesOptions { get; set; }
/// <summary>
/// نوع محاسبه سنوات
/// </summary>
public string YearsOptions { get; set; }
}

View File

@@ -1070,10 +1070,10 @@ public class WorkshopAppliction : IWorkshopApplication
command.ArchiveCode, command.AgentName, command.AgentPhone, command.Province, command.City,
command.Address,
command.TypeOfInsuranceSend, command.TypeOfContract, command.ContractTerm, command.AgreementNumber
, command.FixedSalary, command.Population, command.InsuranceJobId, null, false,
command.AddYearsPay, command.AddLeavePay, command.TotalPaymentHide, false,
, command.FixedSalary, command.Population, command.InsuranceJobId, null, true,
true, true, command.TotalPaymentHide, false,
command.ComputeOptions,
command.BonusesOptions, command.YearsOptions, command.HasRollCallFreeVip, command.OpenInHolidays,
command.BonusesOptions, command.YearsOptions, command.HasRollCallFreeVip, command.WorkingInHoliday,
command.InsuranceCheckoutOvertime, command.InsuranceCheckoutFamilyAllowance, command.CreateContract,
command.SignContract,
command.CreateCheckout, command.SignCheckout, command.CutContractEndOfYear, command.RotatingShiftCompute,