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

#2585 , #2588

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2026-07-03 10:53:27 +07:00
parent 2f2d7fe74c
commit b05e7cc3ab
2 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
View file

@ -1437,7 +1437,6 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
{ {
processCheckIn.CheckInStatus = "LATE"; processCheckIn.CheckInStatus = "LATE";
} }
processCheckIn.CheckInStatus = "NORMAL";
break; break;
case "AFTERNOON": case "AFTERNOON":
if (processCheckIn.CheckOut is not null) if (processCheckIn.CheckOut is not null)
@ -1454,7 +1453,10 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
break; break;
case "ALL": case "ALL":
processCheckIn.CheckInStatus = "NORMAL"; processCheckIn.CheckInStatus = "NORMAL";
if (processCheckIn.CheckOut is not null)
{
processCheckIn.CheckOutStatus = "NORMAL"; processCheckIn.CheckOutStatus = "NORMAL";
}
break; break;
default: default:
break; break;

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

@ -1111,9 +1111,22 @@ namespace BMA.EHR.Leave.Service.Controllers
x.KeycloakUserId == userId) x.KeycloakUserId == userId)
.ToListAsync(); .ToListAsync();
if (req.StartLeaveDate.Date == req.EndLeaveDate.Date)
{
isBetween = existingLeaves.Any(leave =>
req.StartLeaveDate.Date == leave.LeaveEndDate.Date &&
req.EndLeaveDate.Date == leave.LeaveStartDate.Date &&
req.LeaveRange == leave.LeaveRange);
}
else
{
isBetween = existingLeaves.Any(leave => isBetween = existingLeaves.Any(leave =>
req.StartLeaveDate.Date <= leave.LeaveEndDate.Date && req.StartLeaveDate.Date <= leave.LeaveEndDate.Date &&
req.EndLeaveDate.Date >= leave.LeaveStartDate.Date); req.EndLeaveDate.Date >= leave.LeaveStartDate.Date);
}
// var minLeave = (await _context.Set<LeaveRequest>().Where(x => x.Type.Id == req.Type && // var minLeave = (await _context.Set<LeaveRequest>().Where(x => x.Type.Id == req.Type &&
// (x.LeaveStatus == "PENDING" || x.LeaveStatus == "APPROVE") && // (x.LeaveStatus == "PENDING" || x.LeaveStatus == "APPROVE") &&