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

Merge branch 'develop' of github.com:Frappet/hrms-api-backend into develop

Browse source
This commit is contained in:
moss 2025-06-05 12:16:58 +07:00
commit dff98272dd
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -844,7 +844,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
positionNameNew = p.position, positionNameNew = p.position,
posmasterId = p.posmasterId, posmasterId = p.posmasterId,
posTypeNameNew = p.posTypeName, posTypeNameNew = p.posTypeName,
posLeveNamelNew = p.posLevelName, posLevelNameNew = p.posLevelName,
posNoNew = p.posMasterNo?.ToString(), posNoNew = p.posMasterNo?.ToString(),
posNoAbbNew = p.child4ShortName != null ? $"{p.child4ShortName}" : posNoAbbNew = p.child4ShortName != null ? $"{p.child4ShortName}" :
p.child3ShortName != null ? $"{p.child3ShortName}" : p.child3ShortName != null ? $"{p.child3ShortName}" :

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

@ -2454,7 +2454,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
PositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(), PositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),
ActiveDate = p.ActiveDate == null ? "-" : p.ActiveDate.Value.ToThaiShortDate2().ToThaiNumber(), ActiveDate = p.ActiveDate == null ? "-" : p.ActiveDate.Value.ToThaiShortDate2().ToThaiNumber(),
Salary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), Salary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
Remark = p.Reason ?? "-", Remark = p.Reason?.ToThaiNumber() ?? "-",
RemarkHorizontal = r.RemarkHorizontal == null ? "-" : r.RemarkHorizontal.ToThaiNumber(), RemarkHorizontal = r.RemarkHorizontal == null ? "-" : r.RemarkHorizontal.ToThaiNumber(),
RemarkVertical = r.RemarkVertical == null ? "-" : r.RemarkVertical.ToThaiNumber() RemarkVertical = r.RemarkVertical == null ? "-" : r.RemarkVertical.ToThaiNumber()
}).ToList(); }).ToList();

4
BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
View file

@ -1887,12 +1887,12 @@ namespace BMA.EHR.Retirement.Service.Controllers
(p.child2Old == null ? "" : $"{p.child2Old}\n") + (p.child2Old == null ? "" : $"{p.child2Old}\n") +
(p.child1Old == null ? "" : $"{p.child1Old}\n") + (p.child1Old == null ? "" : $"{p.child1Old}\n") +
(p.rootOld == null ? "" : $"{p.rootOld}"), (p.rootOld == null ? "" : $"{p.rootOld}"),
PositionLevel = p.PositionLevelOld ?? "-", PositionLevel = p.PositionLevelOld?.ToThaiNumber() ?? "-",
PositionType = p.PositionTypeOld ?? "-", PositionType = p.PositionTypeOld ?? "-",
PositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(), PositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),
ActiveDate = p.ActiveDate == null ? "-" : p.ActiveDate.Value.ToThaiShortDate2().ToThaiNumber(), ActiveDate = p.ActiveDate == null ? "-" : p.ActiveDate.Value.ToThaiShortDate2().ToThaiNumber(),
Salary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), Salary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
Remark = p.Reason ?? "-", Remark = p.Reason?.ToThaiNumber() ?? "-",
RemarkHorizontal = r.RemarkHorizontal == null ? "-" : r.RemarkHorizontal.ToThaiNumber(), RemarkHorizontal = r.RemarkHorizontal == null ? "-" : r.RemarkHorizontal.ToThaiNumber(),
RemarkVertical = r.RemarkVertical == null ? "-" : r.RemarkVertical.ToThaiNumber() RemarkVertical = r.RemarkVertical == null ? "-" : r.RemarkVertical.ToThaiNumber()
}).ToList(); }).ToList();