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

fix: Optimize Leave API

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2024-07-11 15:12:38 +07:00
parent 96a2c8d94f
commit 5731ac6f3d
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1109,7 +1109,7 @@ namespace BMA.EHR.Leave.Service.Controllers
Id = item.Id, Id = item.Id,
LeaveTypeId = item.Type.Id, LeaveTypeId = item.Type.Id,
LeaveTypeName = item.Type.Name, LeaveTypeName = item.Type.Name,
FullName = $"{profile.Prefix}{profile.FirstName} {profile.LastName}", FullName = $"{item.Prefix}{item.FirstName} {item.LastName}",
DateSendLeave = item.CreatedAt.Date, DateSendLeave = item.CreatedAt.Date,
Status = item.LeaveStatus, Status = item.LeaveStatus,
CitizenId = profile.CitizenId ?? "", CitizenId = profile.CitizenId ?? "",
@ -1267,7 +1267,7 @@ namespace BMA.EHR.Leave.Service.Controllers
{ {
Id = rawData.Id, Id = rawData.Id,
LeaveTypeName = rawData.Type.Name, LeaveTypeName = rawData.Type.Name,
FullName = $"{profile.Prefix}{profile.FirstName} {profile.LastName}", FullName = $"{rawData.Prefix}{rawData.FirstName} {rawData.LastName}",
Status = rawData.LeaveCancelStatus ?? "", Status = rawData.LeaveCancelStatus ?? "",
LeaveStartDate = rawData.LeaveStartDate, LeaveStartDate = rawData.LeaveStartDate,
LeaveEndDate = rawData.LeaveEndDate, LeaveEndDate = rawData.LeaveEndDate,
@ -1490,7 +1490,7 @@ namespace BMA.EHR.Leave.Service.Controllers
LeaveTypeName = rawData.Type.Name, LeaveTypeName = rawData.Type.Name,
LeaveTypeId = rawData.Type.Id, LeaveTypeId = rawData.Type.Id,
FullName = $"{profile.Prefix}{profile.FirstName} {profile.LastName}", FullName = $"{rawData.Prefix}{rawData.FirstName} {rawData.LastName}",
DateSendLeave = rawData.CreatedAt, DateSendLeave = rawData.CreatedAt,
Status = rawData.LeaveStatus, Status = rawData.LeaveStatus,
LeaveStartDate = rawData.LeaveStartDate, LeaveStartDate = rawData.LeaveStartDate,