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

ปรับ Report Resign, Deceased

Browse source
This commit is contained in:
Bright 2024-08-02 17:45:47 +07:00
parent 197f8f7150
commit 6bb5c90964
3 changed files with 69 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

10
BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs
View file

@ -258,7 +258,7 @@ namespace BMA.EHR.Application.Repositories.Reports
// string FirstName = string.IsNullOrEmpty(data.FirstName.ToString()) ? string.Empty : data.FirstName.ToString();
// string LastName = string.IsNullOrEmpty(data.LastName.ToString()) ? string.Empty : data.LastName.ToString();
// string FullName = $"{Prefix} {FirstName} {LastName}";
string Date = string.IsNullOrEmpty(data.Date.ToString()) ? "วันที่ - เดือน - พ.ศ. -" : DateTime.Parse(data.Date.ToString()).ToThaiFullDate().ToString().ToThaiNumber();
string Date = string.IsNullOrEmpty(data.Date.ToString()) ? "-" : DateTime.Parse(data.Date.ToString()).ToThaiFullDate().ToString().ToThaiNumber();
string CurrentDate = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd")).ToThaiFullDate().ToString().ToThaiNumber();
return new
{
@ -282,8 +282,8 @@ namespace BMA.EHR.Application.Repositories.Reports
data.posMasterNo,
data.posLevelName,
data.posTypeName,
data.Number,
data.Location,
Number = data.Number != null ? data.Number.ToThaiNumber() : "-",
Location = data.Location != null ? data.Location.ToThaiNumber() : "-",
data.Reason,
Position = data.position,
};
@ -334,8 +334,8 @@ namespace BMA.EHR.Application.Repositories.Reports
return new
{
Oc = oc,
Number = $"กท /{data.CreatedAt.Year.ToThaiYear()}",
Date = data.CreatedAt.ToThaiFullDate().ToString().ToThaiNumber(),
Number = $"กท /{(data.CreatedAt.Year.ToThaiYear()).ToString().ToThaiNumber()}",
Date = data.CreatedAt.ToThaiFullDate2().ToString().ToThaiNumber(),
Subject = "ข้าราชการถึงแก่กรรม",
Send = "หัวหน้าสำนักงาน ก.ก.",
};