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

fix รายงานใบลา ข้อมูลแสดงในรายงานแสดงไม่ครบ #2184

Browse source
This commit is contained in:
harid 2026-01-12 17:23:08 +07:00
parent 1c3ce46bcb
commit cab83d467b
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2618,10 +2618,9 @@ namespace BMA.EHR.Leave.Service.Controllers
updatedAt = x.LastUpdatedAt.HasValue updatedAt = x.LastUpdatedAt.HasValue
? x.LastUpdatedAt.Value.Date.ToThaiShortDate().ToThaiNumber() ? x.LastUpdatedAt.Value.Date.ToThaiShortDate().ToThaiNumber()
: "...... /...... /......", : "...... /...... /......",
comment = (x.Comment ?? "") comment = !string.IsNullOrEmpty(x.Comment)
.Replace("\r", "") ? x.Comment.Replace("\r", "").Replace("\n", "").Trim()
.Replace("\n", "") : "......................",
.Trim(),
approveType = (x.ApproveType ?? "").Trim().ToUpper() approveType = (x.ApproveType ?? "").Trim().ToUpper()
}) })
.ToList(); .ToList();

8
BMA.EHR.Leave/Controllers/LeaveRequestController.cs
View file

@ -2027,10 +2027,10 @@ namespace BMA.EHR.Leave.Service.Controllers
{ {
new LeaveRequestApprover new LeaveRequestApprover
{ {
Prefix = profile.Prefix, Prefix = profile.Prefix ?? "",
FirstName = profile.FirstName, FirstName = profile.FirstName ?? "",
LastName = profile.LastName, LastName = profile.LastName ?? "",
PositionName = profile.Position, PositionName = $"{profile.Position ?? ""}{profile.PositionLeaveName ?? ""}",
ProfileId = profile.Id, ProfileId = profile.Id,
KeycloakId = Guid.Parse(UserId!), KeycloakId = Guid.Parse(UserId!),
ApproveType = "SENDER", ApproveType = "SENDER",