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

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

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2025-05-07 12:36:23 +07:00
parent e55001e234
commit 3880ce6985
3 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -167,7 +167,7 @@ namespace BMA.EHR.Leave.Service.Controllers
//GetSumApproveLeaveByRangeForUser
var startFiscalYear = new DateTime(data.LeaveStartDate.Year - 1, 10, 1);
var endFiscalYear = data.CreatedAt.Date.AddDays(-1); // นับจากวันที่ยื่นลา
var endFiscalYear = data.LeaveStartDate.Date.AddDays(-1); // นับจากวันที่ยื่นลา
var leaveData = await _leaveBeginningRepository.GetByYearAndTypeIdForUserAsync(data.LeaveStartDate.Year, data.Type.Id, data.KeycloakUserId);
//var sumLeave = leaveData == null ? 0 : leaveData.LeaveDaysUsed;

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

@ -1246,8 +1246,11 @@ namespace BMA.EHR.Leave.Service.Controllers
public async Task<ActionResult<ResponseObject>> GetLeaveRequestCalendarAsync(
[FromBody] GetLeaveRequestCalendarDto req)
{
var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
//var thisYear = DateTime.Now.Year;
var data = await _leaveRequestRepository.GetLeaveRequestByYearAsync(req.Year);
var data = await _leaveRequestRepository.GetLeaveRequestByYearAsync(req.Year, userId);
// var profileList = await _userProfileRepository.GetProfileWithKeycloak(AccessToken);