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

Refactor LeaveReportController and LeaveRequestController to calculate leave days using repository methods #2246 #2247
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 11s
Details

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2026-01-26 22:35:24 +07:00
parent 2e6a81ff31
commit 982dfc33d1
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
BMA.EHR.Leave/Controllers/LeaveReportController.cs
View file

@ -332,7 +332,10 @@ namespace BMA.EHR.Leave.Service.Controllers
//var sumLeave = await _leaveRequestRepository.GetSumApproveLeaveTotalByTypeAndRangeForUser(data.KeycloakUserId, data.Type.Id, startFiscalYear, endFiscalYear);
var sumLeave = leaveData == null ? 0.0 : leaveData.LeaveDaysUsed;
var sumLeave = await _leaveRequestRepository.GetSumApproveLeaveTotalByTypeAndRangeForUser(data.KeycloakUserId, data.Type.Id, startFiscalYear, endFiscalYear);
//var sumLeave = leaveData == null ? 0.0 : leaveData.LeaveDaysUsed;
var leaveLimit = leaveData == null ? 0.0 : leaveData.LeaveDays;
var extendLeave = leaveLimit - 10;
var Oc = profile.isCommission == false

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

@ -2388,8 +2388,10 @@ namespace BMA.EHR.Leave.Service.Controllers
}
}
}
var thisYear = DateTime.Now.Year;
var toDay = DateTime.Now.Date;
var thisYear = rawData.LeaveStartDate.Year;
var toDay = rawData.LeaveStartDate.Date;
// var thisYear = DateTime.Now.Year;
// var toDay = DateTime.Now.Date;
if (toDay >= new DateTime(toDay.Year, 10, 1) && toDay <= new DateTime(toDay.Year, 12, 31))
thisYear = thisYear + 1;
@ -2441,7 +2443,11 @@ namespace BMA.EHR.Leave.Service.Controllers
orgName += $" {rawData.Root}";
var leaveData = await _leaveBeginningRepository.GetByYearAndTypeIdForUser2Async(thisYear, rawData.Type.Id, rawData.KeycloakUserId);
var leaveSummary = leaveData == null ? 0.0 : leaveData.LeaveDaysUsed;
var startFiscalYear = new DateTime(rawData.LeaveStartDate.Year - 1, 10, 1);
var endFiscalYear = rawData.LeaveStartDate.Date.AddDays(-1); // นับจากวันที่ยื่นลา
var leaveSummary = await _leaveRequestRepository.GetSumApproveLeaveTotalByTypeAndRangeForUser(rawData.KeycloakUserId, rawData.Type.Id, startFiscalYear, endFiscalYear);
//var leaveSummary = leaveData == null ? 0.0 : leaveData.LeaveDaysUsed;
var extendLeave = 0.0;
var leaveLimit = (double)rawData.Type.Limit;