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

fix #1462, #1476
Some checks failed
release-dev / release-dev (push) Failing after 13s
Details

Browse source
This commit is contained in:
Bright 2025-05-06 18:16:14 +07:00
parent 06a6019e97
commit ed0bde9780
7 changed files with 169 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
BMA.EHR.Leave/Controllers/LeaveReportController.cs
View file

@ -579,6 +579,7 @@ namespace BMA.EHR.Leave.Service.Controllers
govAge = profileLeave.GovAge.ToThaiNumber(),
age = profileLeave.Age.ToThaiNumber(),
dateAppoint = profileLeave.DateAppoint.ToThaiShortDate().ToThaiNumber(),
dateCurrent = profileLeave.DateCurrent.ToThaiShortDate().ToThaiNumber(),
amount = ((double)profileLeave.Amount).ToNumericText().ToThaiNumber(),
telephoneNumber = profileLeave.TelephoneNumber == null ? "" : profileLeave.TelephoneNumber.ToThaiNumber(),
@ -595,7 +596,8 @@ namespace BMA.EHR.Leave.Service.Controllers
positions = profileLeave.Positions.Select(x => new
{
positionName = x.PositionName == null ? "" : x.PositionName.ToThaiNumber(),
date = x.Date.ToThaiShortDate().ToThaiNumber(),
dateStart = x.DateStart.ToThaiShortDate().ToThaiNumber(),
dateEnd = x.DateEnd.ToThaiShortDate().ToThaiNumber(),
positionType = x.PositionType == null ? "" : x.PositionType.ToThaiNumber(),
positionLevel = x.PositionLevel == null ? "" : x.PositionLevel.ToThaiNumber(),
orgRoot = x.OrgRoot == null ? "" : x.OrgRoot.ToThaiNumber(),
@ -609,7 +611,7 @@ namespace BMA.EHR.Leave.Service.Controllers
educationLevel = x.EducationLevel == null ? "" : x.EducationLevel.ToThaiNumber(),
institute = x.Institute == null ? "" : x.Institute.ToThaiNumber(),
country = x.Country == null ? "" : x.Country.ToThaiNumber(),
finishDate = x.FinishDate == null ? "" : x.FinishDate.Value.ToThaiShortDate().ToThaiNumber()
finishDate = x.FinishDate == null ? "-" : x.FinishDate.Value.ToThaiShortDate().ToThaiNumber()
}).ToList()
//positionName = profileLeave.PositionName,
@ -730,6 +732,7 @@ namespace BMA.EHR.Leave.Service.Controllers
govAge = profileLeave.GovAge.ToThaiNumber(),
age = profileLeave.Age.ToThaiNumber(),
dateAppoint = profileLeave.DateAppoint.ToThaiShortDate().ToThaiNumber(),
dateCurrent = profileLeave.DateCurrent.ToThaiShortDate().ToThaiNumber(),
amount = ((double)profileLeave.Amount).ToNumericText().ToThaiNumber(),
telephoneNumber = profileLeave.TelephoneNumber == null ? "" : profileLeave.TelephoneNumber.ToThaiNumber(),
@ -746,7 +749,8 @@ namespace BMA.EHR.Leave.Service.Controllers
positions = profileLeave.Positions.Select(x => new
{
positionName = x.PositionName == null ? "" : x.PositionName.ToThaiNumber(),
date = x.Date.ToThaiShortDate().ToThaiNumber(),
dateStart = x.DateStart.ToThaiShortDate().ToThaiNumber(),
dateEnd = x.DateEnd.ToThaiShortDate().ToThaiNumber(),
positionType = x.PositionType == null ? "" : x.PositionType.ToThaiNumber(),
positionLevel = x.PositionLevel == null ? "" : x.PositionLevel.ToThaiNumber(),
orgRoot = x.OrgRoot == null ? "" : x.OrgRoot.ToThaiNumber(),
@ -760,7 +764,7 @@ namespace BMA.EHR.Leave.Service.Controllers
educationLevel = x.EducationLevel == null ? "" : x.EducationLevel.ToThaiNumber(),
institute = x.Institute == null ? "" : x.Institute.ToThaiNumber(),
country = x.Country == null ? "" : x.Country.ToThaiNumber(),
finishDate = x.FinishDate == null ? "" : x.FinishDate.Value.ToThaiShortDate().ToThaiNumber()
finishDate = x.FinishDate == null ? "-" : x.FinishDate.Value.ToThaiShortDate().ToThaiNumber()
}).ToList()
}
};