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

Merge branch 'develop' into working
Some checks failed
release-dev / release-dev (push) Failing after 12s
Details

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2025-04-22 15:36:29 +07:00
commit dd3c614679
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -730,7 +730,14 @@ namespace BMA.EHR.Retirement.Service.Controllers
OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(), OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
LeaveDate = p.LeaveDate == null ? "-" : p.LeaveDate.Value.ToThaiShortDate2().ToThaiNumber(), LeaveDate = p.LeaveDate == null ? "-" : p.LeaveDate.Value.ToThaiShortDate2().ToThaiNumber(),
NewOc = (p.OrganizationPositionOld == null ? "" : p.OrganizationPositionOld) + "\n" + (p.rootOld == null ? "" : p.rootOld), //NewOc = (p.OrganizationPositionOld == null ? "" : p.OrganizationPositionOld) + "\n" + (p.rootOld == null ? "" : p.rootOld),
NewOc = (p.position == null ? "" : $"{p.position}\n") +
(p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") +
(p.child4 == null ? "" : $"{p.child4}\n") +
(p.child3 == null ? "" : $"{p.child3}\n") +
(p.child2 == null ? "" : $"{p.child2}\n") +
(p.child1 == null ? "" : $"{p.child1}\n") +
(p.root == null ? "" : $"{p.root}"),
NewPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld, NewPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld,
NewPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld, NewPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld,
NewPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(), NewPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),