From 7d39720121d4ba7ea66017e22f8b1ea93ed08e04 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Wed, 30 Apr 2025 11:46:09 +0700 Subject: [PATCH] fix #1467 --- BMA.EHR.Leave/Controllers/LeaveRequestController.cs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs index 6478b9fb..ce3ef92c 100644 --- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs @@ -2354,11 +2354,11 @@ namespace BMA.EHR.Leave.Service.Controllers var thisYear = DateTime.Now.Year; 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 deleteList = await _leaveRequestRepository.GetSumDeleteLeaveAsync(thisYear); - var approvePrevYear = await _leaveRequestRepository.GetSumApproveLeaveAsync(thisYear - 1); + //var approvePrevYear = await _leaveRequestRepository.GetSumApproveLeaveAsync(thisYear - 1); var result = new List(); 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 send = sendData == null ? 0 : sendData.SumLeaveDay; - var approveData = approveList.FirstOrDefault(x => x.KeycloakUserId == userId && x.LeaveTypeId == leaveType.Id); - var approve = approveData == null ? 0 : approveData.SumLeaveDay; + //var approveData = approveList.FirstOrDefault(x => x.KeycloakUserId == userId && x.LeaveTypeId == leaveType.Id); + //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 reject = rejectData == null ? 0 : rejectData.SumLeaveDay; @@ -2382,7 +2385,7 @@ namespace BMA.EHR.Leave.Service.Controllers 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; extendLeave = leaveLimit - 10;