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

แก้ defect

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-12-15 09:59:03 +07:00
parent bd1a77c1a2
commit 89a88c92dc
4 changed files with 53 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -891,6 +891,8 @@ namespace BMA.EHR.Leave.Service.Controllers
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
public async Task<ActionResult<ResponseObject>> GetLeaveRequestForAdminByIdAsync(Guid id)
{
var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
var rawData = await _leaveRequestRepository.GetByIdAsync(id);
var thisYear = DateTime.Now.Year;
@ -923,6 +925,8 @@ namespace BMA.EHR.Leave.Service.Controllers
approver = list.First().Name;
}
var leaveSummary = await _leaveRequestRepository.GetSumApproveLeaveByTypeForUserAsync(userId, rawData.Type.Id, thisYear);
var result = new GetLeaveRequestForAdminByIdDto
{
Id = rawData.Id,
@ -993,6 +997,10 @@ namespace BMA.EHR.Leave.Service.Controllers
Dear = approver,
ApproveStep = rawData.ApproveStep ?? "-",
LeaveLimit = rawData.Type.Limit,
LeaveSummary = leaveSummary,
LeaveRemain = rawData.Type.Limit - leaveSummary
};
return Success(result);