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

fix amountOld

Browse source
This commit is contained in:
Bright 2024-11-18 13:51:25 +07:00
parent d08b4ca723
commit 9e99e985cd
7 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -403,6 +403,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
(org.result.root == null ? "" : org.result.root);
retirementOther.OrganizationPositionOld = org.result.position + "/" + retirementOther.OrganizationOld;
retirementOther.EducationOld = org.result.education;
retirementOther.AmountOld = org.result.salary;
}
await _context.RetirementOthers.AddAsync(retirementOther);
await _context.SaveChangesAsync();
@ -701,7 +702,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
OldPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld,
OldPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld,
OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),
OldSalary = p.Amount == null ? "-" : p.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
LeaveDate = p.LeaveDate == null ? "-" : p.LeaveDate.Value.ToThaiShortDate2().ToThaiNumber(),
NewOc = (p.OrganizationPositionOld == null ? "" : p.OrganizationPositionOld) + "/" + (p.rootOld == null ? "" : p.rootOld),
NewPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld,
@ -893,7 +894,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
OldPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld,
OldPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld,
OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),
OldSalary = p.Amount == null ? "-" : p.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
LeaveDate = p.LeaveDate == null ? "-" : p.LeaveDate.Value.ToThaiShortDate2().ToThaiNumber(),
MilitaryDate = p.MilitaryDate == null ? "-" : p.MilitaryDate.Value.ToThaiShortDate2().ToThaiNumber(),
NewOc = p.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" :