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

fix #1467
Some checks failed
release-dev / release-dev (push) Failing after 11s
Details

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2025-04-30 11:46:09 +07:00
parent 91fc939b6d
commit 7d39720121
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2354,11 +2354,11 @@ namespace BMA.EHR.Leave.Service.Controllers
var thisYear = DateTime.Now.Year; var thisYear = DateTime.Now.Year;
var sendList = await _leaveRequestRepository.GetSumSendLeaveAsync(thisYear); var sendList = await _leaveRequestRepository.GetSumSendLeaveAsync(thisYear);
var approveList = await _leaveRequestRepository.GetSumApproveLeaveAsync(thisYear); //var approveList = await _leaveRequestRepository.GetSumApproveLeaveAsync(thisYear);
var rejectList = await _leaveRequestRepository.GetSumRejectLeaveAsync(thisYear); var rejectList = await _leaveRequestRepository.GetSumRejectLeaveAsync(thisYear);
var deleteList = await _leaveRequestRepository.GetSumDeleteLeaveAsync(thisYear); var deleteList = await _leaveRequestRepository.GetSumDeleteLeaveAsync(thisYear);
var approvePrevYear = await _leaveRequestRepository.GetSumApproveLeaveAsync(thisYear - 1); //var approvePrevYear = await _leaveRequestRepository.GetSumApproveLeaveAsync(thisYear - 1);
var result = new List<dynamic>(); var result = new List<dynamic>();
foreach (var leaveType in leaveTypes) foreach (var leaveType in leaveTypes)
@ -2366,8 +2366,11 @@ namespace BMA.EHR.Leave.Service.Controllers
var sendData = sendList.FirstOrDefault(x => x.KeycloakUserId == userId && x.LeaveTypeId == leaveType.Id); var sendData = sendList.FirstOrDefault(x => x.KeycloakUserId == userId && x.LeaveTypeId == leaveType.Id);
var send = sendData == null ? 0 : sendData.SumLeaveDay; var send = sendData == null ? 0 : sendData.SumLeaveDay;
var approveData = approveList.FirstOrDefault(x => x.KeycloakUserId == userId && x.LeaveTypeId == leaveType.Id); //var approveData = approveList.FirstOrDefault(x => x.KeycloakUserId == userId && x.LeaveTypeId == leaveType.Id);
var approve = approveData == null ? 0 : approveData.SumLeaveDay; //var approve = approveData == null ? 0 : approveData.SumLeaveDay;
var leaveData = await _leaveBeginningRepository.GetByYearAndTypeIdForUserAsync(thisYear, leaveType.Id, userId);
var approve = leaveData == null ? 0 : leaveData.LeaveDaysUsed;
var rejectData = rejectList.FirstOrDefault(x => x.KeycloakUserId == userId && x.LeaveTypeId == leaveType.Id); var rejectData = rejectList.FirstOrDefault(x => x.KeycloakUserId == userId && x.LeaveTypeId == leaveType.Id);
var reject = rejectData == null ? 0 : rejectData.SumLeaveDay; var reject = rejectData == null ? 0 : rejectData.SumLeaveDay;
@ -2382,7 +2385,7 @@ namespace BMA.EHR.Leave.Service.Controllers
if (leaveType.Code == "LV-005") if (leaveType.Code == "LV-005")
{ {
var leaveData = await _leaveBeginningRepository.GetByYearAndTypeIdForUserAsync(thisYear, leaveType.Id, userId); //var leaveData = await _leaveBeginningRepository.GetByYearAndTypeIdForUserAsync(thisYear, leaveType.Id, userId);
leaveLimit = leaveData == null ? 0.0 : leaveData.LeaveDays; leaveLimit = leaveData == null ? 0.0 : leaveData.LeaveDays;
extendLeave = leaveLimit - 10; extendLeave = leaveLimit - 10;