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

fix holiday count

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2024-01-18 06:11:18 +07:00
parent ce746e4034
commit a1bd2ec4b8
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BMA.EHR.Application/Repositories/MetaData/HolidayRepository.cs
View file

@ -40,7 +40,7 @@ namespace BMA.EHR.Application.Repositories.MetaData
{ {
var dates = new List<DateTime>(); var dates = new List<DateTime>();
for (DateTime i = startDate; i < endDate; i = i.AddDays(1)) for (DateTime i = startDate; i <= endDate; i = i.AddDays(1))
{ {
dates.Add(i); dates.Add(i);
} }

16
BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs
View file

@ -679,9 +679,9 @@ namespace BMA.EHR.Leave.Service.Controllers
var sumLeave = var sumLeave =
await _leaveRequestRepository.GetSumLeaveByTypeForUserAsync(userId, req.Type, req.StartLeaveDate.Year); await _leaveRequestRepository.GetSumLeaveByTypeForUserAsync(userId, req.Type, req.StartLeaveDate.Year);
var sumWorkDay = await _holidayRepository.GetHolidayCountAsync(req.StartLeaveDate, req.EndLeaveDate, category); var sumWorkDay = await _holidayRepository.GetHolidayCountAsync(req.StartLeaveDate.Date, req.EndLeaveDate.Date, category);
var totalDay = req.StartLeaveDate.DiffDay(req.EndLeaveDate); var totalDay = req.StartLeaveDate.DiffDay(req.EndLeaveDate.Date);
var sumWeekend = _holidayRepository.GetWeekEndCount(req.StartLeaveDate, req.EndLeaveDate, category); var sumWeekend = _holidayRepository.GetWeekEndCount(req.StartLeaveDate.Date, req.EndLeaveDate.Date, category);
var isLeave = false; var isLeave = false;
@ -1564,6 +1564,16 @@ namespace BMA.EHR.Leave.Service.Controllers
} }
[HttpGet("holiday/test")]
public async Task<ActionResult<ResponseObject>> GetHolidayTestAsync()
{
var start = new DateTime(2024, 1, 1);
var end = new DateTime(2024, 1, 3);
var count = await _holidayRepository.GetHolidayCountAsync(start, end);
return Success(new { holiday = count });
}
#endregion #endregion
} }
} }