From 665e861303ef2d32682a663b57ad0c97c70d0cd7 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Thu, 1 May 2025 12:02:04 +0700 Subject: [PATCH] fix #1471 and # 1487 --- .../Leaves/LeaveRequests/LeaveRequestRepository.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs index b410db23..59fad799 100644 --- a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs +++ b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs @@ -440,8 +440,8 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests data.LeaveDirectorComment = Reason; // TODO : Update ไปตาราง beginning - //if (data.LeaveStatus == "APPROVE") - // await _leaveBeginningRepository.UpdateLeaveUsageAsync(data.LeaveStartDate.Year, data.Type.Id, data.KeycloakUserId, -1 * data.LeaveTotal); + if (data.ApproveStep == "st4") // ถ้ามีการอนุมัติจากผู้มีอำนาจแล้ว + await _leaveBeginningRepository.UpdateLeaveUsageAsync(data.LeaveStartDate.Year, data.Type.Id, data.KeycloakUserId, -1 * data.LeaveTotal); // Send Noti var noti = new Notification @@ -484,8 +484,8 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests await UpdateWithTrackingAsync(rawData); // TODO : Update ไปตาราง beginning - //if (rawData.LeaveStatus == "APPROVE") - // await _leaveBeginningRepository.UpdateLeaveUsageAsync(rawData.LeaveStartDate.Year, rawData.Type.Id, rawData.KeycloakUserId, -1 * rawData.LeaveTotal); + if (rawData.ApproveStep == "st4") // ถ้ามีการอนุมัติจากผู้มีอำนาจแล้ว + await _leaveBeginningRepository.UpdateLeaveUsageAsync(rawData.LeaveStartDate.Year, rawData.Type.Id, rawData.KeycloakUserId, -1 * rawData.LeaveTotal); // TODO: remove วันลา