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
Some checks failed
release-dev / release-dev (push) Failing after 11s
Details

Browse source
This commit is contained in:
moss 2025-04-03 16:49:51 +07:00
commit 81d22c9f05
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -482,6 +482,8 @@ namespace BMA.EHR.Application.Repositories.Reports
p.SendDate,
p.ActiveDate,
p.Reason,
p.ReasonResign,
p.Remark,
p.Status,
salary = p.AmountOld,
p.ApproveReason,
@ -517,6 +519,8 @@ namespace BMA.EHR.Application.Repositories.Reports
p.SendDate,
p.ActiveDate,
p.Reason,
p.ReasonResign,
p.Remark,
p.Status,
salary = p.AmountOld,
p.ApproveReason,
@ -547,11 +551,14 @@ namespace BMA.EHR.Application.Repositories.Reports
data.prefix,
data.firstName,
data.lastName,
data.Location,
Location = string.IsNullOrEmpty(data.Location) ? string.Empty : data.Location.ToThaiNumber(),
FullName = $"{data.prefix}{data.firstName} {data.lastName}",
SendDate = string.IsNullOrEmpty(data.SendDate.ToString()) ? string.Empty : DateTime.Parse(data.SendDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber(),
ActiveDate = string.IsNullOrEmpty(data.ActiveDate.ToString()) ? string.Empty : DateTime.Parse(data.ActiveDate.ToString()).ToThaiFullDate().ToString().ToThaiNumber(),
data.Reason,
data.ReasonResign,
data.Remark,
ReasonRemark = data.Reason == "OTHER" ? string.IsNullOrEmpty(data.Remark) ? data.ReasonResign : $"{data.ReasonResign}({data.Remark})" : data.ReasonResign,
data.Status,
data.salary,
data.PositionTypeOld,