This commit is contained in:
Suphonchai Phoonsawat 2025-04-24 17:02:01 +07:00
parent 4ca6b7d842
commit 912fa12ad7
3 changed files with 13 additions and 2 deletions

View file

@ -90,6 +90,8 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
} }
public override async Task<LeaveRequest?> GetByIdAsync(Guid id) public override async Task<LeaveRequest?> GetByIdAsync(Guid id)
{
try
{ {
var data = await _dbContext.Set<LeaveRequest>().AsQueryable() var data = await _dbContext.Set<LeaveRequest>().AsQueryable()
.AsNoTracking() .AsNoTracking()
@ -103,6 +105,12 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
return data; return data;
} }
catch
{
throw;
}
}
public override async Task<LeaveRequest> AddAsync(LeaveRequest entity) public override async Task<LeaveRequest> AddAsync(LeaveRequest entity)
{ {

View file

@ -1303,6 +1303,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,
LeaveSubTypeName = item.LeaveSubTypeName ?? "",
FullName = $"{item.Prefix}{item.FirstName} {item.LastName}", FullName = $"{item.Prefix}{item.FirstName} {item.LastName}",
DateSendLeave = item.CreatedAt, DateSendLeave = item.CreatedAt,
IsDelete = item.LeaveStatus == "DELETE", IsDelete = item.LeaveStatus == "DELETE",

View file

@ -6,6 +6,8 @@
public string LeaveTypeName { get; set; } public string LeaveTypeName { get; set; }
public string? LeaveSubTypeName { get; set; } = string.Empty;
public Guid LeaveTypeId { get; set; } public Guid LeaveTypeId { get; set; }
public string FullName { get; set; } public string FullName { get; set; }