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

fix issue #1401
Some checks failed
release-dev / release-dev (push) Failing after 11s
Details

Browse source
This commit is contained in:
Bright 2025-04-28 18:41:34 +07:00
parent 414dae40cc
commit 124109bf57
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -738,9 +738,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
(p.child2 == null ? "" : $"{p.child2}\n") + (p.child2 == null ? "" : $"{p.child2}\n") +
(p.child1 == null ? "" : $"{p.child1}\n") + (p.child1 == null ? "" : $"{p.child1}\n") +
(p.root == null ? "" : $"{p.root}"), (p.root == null ? "" : $"{p.root}"),
NewPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld, NewPositionType = p.posTypeName == null ? "-" : p.posTypeName,
NewPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld, NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName,
NewPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(), NewPositionNumber = p.rootShortName == null && p.posMasterNo == null ? null : $"{(p.child1ShortName == null ? p.rootShortName : (p.child2ShortName == null ? p.child1ShortName : (p.child3ShortName == null ? p.child2ShortName : (p.child4ShortName == null ? p.child3ShortName : p.child4ShortName))))}"+
$" {p.posMasterNo?.ToString().ToThaiNumber()}",
NewSalary = r.Amount == null ? "-" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), NewSalary = r.Amount == null ? "-" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
AppointDate = p.PositionDate == null ? "-" : p.PositionDate.Value.ToThaiShortDate2().ToThaiNumber(), AppointDate = p.PositionDate == null ? "-" : p.PositionDate.Value.ToThaiShortDate2().ToThaiNumber(),
CommandExcecuteDate = string.IsNullOrEmpty(r.CommandExcecuteDate.ToString()) ? "-" : r.CommandExcecuteDate.Value.ToThaiShortDate2().ToThaiNumber(), CommandExcecuteDate = string.IsNullOrEmpty(r.CommandExcecuteDate.ToString()) ? "-" : r.CommandExcecuteDate.Value.ToThaiShortDate2().ToThaiNumber(),