hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

update placement and retire

Browse source
This commit is contained in:
AdisakKanthawilang 2025-06-16 12:10:50 +07:00
parent b528f0a81d
commit 706edbd0f0
32 changed files with 282 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

12
BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
View file

@ -1301,6 +1301,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementResign.AmountOld = org.result.salary;
retirementResign.PositionOld = org.result.position;
retirementResign.PositionExecutiveOld = org.result.posExecutiveName;
retirementResign.positionExecutiveFieldOld = org.result.positionExecutiveField;
retirementResign.positionAreaOld = org.result.positionArea;
retirementResign.PositionLevelOld = org.result.posLevelName;
retirementResign.PositionTypeOld = org.result.posTypeName;
retirementResign.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
@ -2626,7 +2628,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
amountSpecial = r.amountSpecial,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
positionExecutive = "",
positionExecutive = p.PositionExecutiveOld,
positionExecutiveField = p.positionExecutiveFieldOld,
positionArea = p.positionAreaOld,
positionType = p.PositionTypeOld,
positionLevel = p.PositionLevelOld,
isLeave = p.IsCancel == true ? false : true,
@ -2748,7 +2752,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
PositionName = p.PositionOld ?? "-",
Organization = p.OrganizationPositionOld ?? "-",
Oc = (p.PositionOld == null ? "" : $"{p.PositionOld}\n") +
(p.PositionExecutiveOld == null ? "" : $"{p.PositionExecutiveOld}\n") +
(p.PositionExecutiveOld == null ? "" : (p.positionExecutiveFieldOld == null ? $"{p.PositionExecutiveOld}\n" : $"{p.PositionExecutiveOld}({p.positionExecutiveFieldOld})\n")) +
(p.child4Old == null ? "" : $"{p.child4Old}\n") +
(p.child3Old == null ? "" : $"{p.child3Old}\n") +
(p.child2Old == null ? "" : $"{p.child2Old}\n") +
@ -2824,7 +2828,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
amountSpecial = r.amountSpecial,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
positionExecutive = "",
positionExecutive = p.PositionExecutiveOld,
positionExecutiveField = p.positionExecutiveFieldOld,
positionArea = p.positionAreaOld,
positionType = p.PositionTypeOld,
positionLevel = p.PositionLevelOld,
isLeave = false,