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

Merge branch 'develop' into forgejo/dev
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m13s
Details

Browse source
This commit is contained in:
harid 2026-01-05 13:21:30 +07:00
commit f5e242ab1d
1 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -935,7 +935,7 @@ namespace BMA.EHR.Leave.Service.Controllers
// if (list.Count > 0)
// approver = list.First().Name;
//}
var approveResult = await GetApproverData(data.Approvers);
var result = new
{
template = "แบบใบขอยกเลิกวันลา",
@ -956,6 +956,22 @@ namespace BMA.EHR.Leave.Service.Controllers
profileType = data.ProfileType,
leaveReasonDelete = data.LeaveCancelComment == null ? "" : data.LeaveCancelComment!.ToThaiNumber(),
leaveDetail = data.LeaveDetail.ToThaiNumber(),
Type1 = profile.ProfileType == "OFFICER" ? "🗹" : "☐",
Type2 = profile.ProfileType != "OFFICER" ? "🗹" : "☐",
Type3 = "☐",
approve = approveResult,
approverComment = !string.IsNullOrEmpty(data.LeaveDirectorComment)
? data.LeaveDirectorComment.Replace("\r", "").Replace("\n", "").Trim()
: "......................",
approverUpdatedAt = data.LastUpdatedAt.HasValue
? data.LastUpdatedAt.Value.ToThaiShortDate().ToThaiNumber()
: "...... /...... /......",
leaveStatus = data.LeaveCancelStatus != null && data.LeaveCancelStatus!.ToUpper() == "APPROVE"
? "🗹 อนุญาต ☐ ไม่อนุญาต"
: data.LeaveCancelStatus != null && data.LeaveCancelStatus!.ToUpper() == "REJECT"
? "☐ อนุญาต 🗹 ไม่อนุญาต"
: "☐ อนุญาต ☐ ไม่อนุญาต"
}
};