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

16
BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
View file

@ -406,6 +406,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementOther.LeaveDate = org.result.leaveDate;
retirementOther.PositionOld = org.result.position;
retirementOther.PositionExecutiveOld = org.result.posExecutiveName;
retirementOther.positionExecutiveFieldOld = org.result.positionExecutiveField;
retirementOther.positionAreaOld = org.result.positionArea;
retirementOther.PositionLevelOld = org.result.posLevelName;
retirementOther.PositionTypeOld = org.result.posTypeName;
retirementOther.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
@ -528,6 +530,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
uppdated.posMasterNo = req.posMasterNo;
uppdated.position = req.positionName;
uppdated.PositionExecutive = req.posExecutiveName;
uppdated.positionExecutiveField = req.positionExecutiveField;
uppdated.positionArea = req.positionArea;
uppdated.positionField = req.positionField;
uppdated.posTypeId = req.posTypeId;
uppdated.posTypeName = req.posTypeName;
@ -731,7 +735,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
LeaveDate = p.LeaveDate == null ? "-" : p.LeaveDate.Value.ToThaiShortDate2().ToThaiNumber(),
NewOc = (p.position == null ? "" : $"{p.position}\n") +
(p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") +
(p.PositionExecutive == null ? "" : (p.positionArea == null ? $"{p.positionExecutiveField}\n" : $"{p.PositionExecutive}({p.positionExecutiveField})\n")) +
(p.child4 == null ? "" : $"{p.child4}\n") +
(p.child3 == null ? "" : $"{p.child3}\n") +
(p.child2 == null ? "" : $"{p.child2}\n") +
@ -812,7 +816,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,
@ -973,7 +979,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
LeaveDate = p.LeaveDate == null ? "-" : p.LeaveDate.Value.ToThaiShortDate2().ToThaiNumber(),
MilitaryDate = p.MilitaryDate == null ? "-" : p.MilitaryDate.Value.ToThaiShortDate2().ToThaiNumber(),
NewOc = (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") +
@ -1054,7 +1060,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,