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

fix #1382

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2025-04-28 09:45:48 +07:00
parent d54db7b58f
commit 28544df284
2 changed files with 45 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,6 +18,7 @@ using Org.BouncyCastle.Asn1.Pkcs;
using Org.BouncyCastle.Ocsp;
using Sentry;
using Swashbuckle.AspNetCore.Annotations;
using System.Diagnostics.Eventing.Reader;
using System.Globalization;
using System.Security.Claims;
@ -82,6 +83,11 @@ namespace BMA.EHR.Leave.Service.Controllers
public DateTime date { get; set; }
public bool isHoliday { get; set; }
public bool isWeekEnd { get; set; }
public string dateRemark { get; set; }
}
private class DateResultReport
{
@ -1251,12 +1257,33 @@ namespace BMA.EHR.Leave.Service.Controllers
var dateList = new List<LoopDate>();
for (DateTime i = req.StartDate.Date; i <= req.EndDate.Date; i = i.AddDays(1))
{
if (excludeDates.Contains(i))
//if (excludeDates.Contains(i))
//{
// dateList.Add(new LoopDate
// {
// date = i,
// isHoliday = true,
// });
//}
if (holidays.Contains(i))
{
var d = await _holidayRepository.GetHolidayAsync(i);
dateList.Add(new LoopDate
{
date = i,
isHoliday = true,
isWeekEnd = false,
dateRemark = d
});
}
else if (weekend.Contains(i))
{
dateList.Add(new LoopDate
{
date = i,
isHoliday = true,
isWeekEnd = false,
dateRemark = "วันหยุด"
});
}
else
@ -1265,6 +1292,8 @@ namespace BMA.EHR.Leave.Service.Controllers
{
date = i,
isHoliday = false,
isWeekEnd = false,
dateRemark = ""
});
}
}
@ -1340,7 +1369,11 @@ namespace BMA.EHR.Leave.Service.Controllers
remarkStr = "ขาดราชการ";
if (dd.isHoliday == true)
{
remarkStr = "วันหยุด";
remarkStr = $"วันหยุด ({dd.dateRemark})";
}
else if (dd.isWeekEnd)
{
remarkStr = dd.dateRemark;
}
}
else remarkStr = "";