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

ปรับรายงานสถิติการลงเวลา #1730
Some checks failed
release-dev / release-dev (push) Failing after 14s
Details

Browse source
This commit is contained in:
Bright 2025-08-14 16:43:19 +07:00
parent b89f394f1e
commit 0ee17ef586
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1473,6 +1473,11 @@ namespace BMA.EHR.Leave.Service.Controllers
.Where(x => req.node == 4 ? x.OrgChild4Id == req.nodeId : req.node == 3 ? x.OrgChild3Id == req.nodeId : req.node == 2 ? x.OrgChild2Id == req.nodeId : req.node == 1 ? x.OrgChild1Id == req.nodeId : req.node == 0 ? x.OrgRootId == req.nodeId : true) .Where(x => req.node == 4 ? x.OrgChild4Id == req.nodeId : req.node == 3 ? x.OrgChild3Id == req.nodeId : req.node == 2 ? x.OrgChild2Id == req.nodeId : req.node == 1 ? x.OrgChild1Id == req.nodeId : req.node == 0 ? x.OrgRootId == req.nodeId : true)
.ToList(); .ToList();
} }
var defaultRound = await _dutyTimeRepository.GetDefaultAsync();
if (defaultRound == null)
{
return Error("ไม่พบรอบการลงเวลา Default", StatusCodes.Status404NotFound);
}
foreach (var dd in dateList) foreach (var dd in dateList)
{ {
foreach (var p in profile) foreach (var p in profile)
@ -1483,11 +1488,11 @@ namespace BMA.EHR.Leave.Service.Controllers
var fullName = $"{p.Prefix}{p.FirstName} {p.LastName}"; // _userProfileRepository.GetUserFullName(keycloakUserId, AccessToken); var fullName = $"{p.Prefix}{p.FirstName} {p.LastName}"; // _userProfileRepository.GetUserFullName(keycloakUserId, AccessToken);
var defaultRound = await _dutyTimeRepository.GetDefaultAsync(); //var defaultRound = await _dutyTimeRepository.GetDefaultAsync();
if (defaultRound == null) //if (defaultRound == null)
{ //{
return Error("ไม่พบรอบการลงเวลา Default", StatusCodes.Status404NotFound); // return Error("ไม่พบรอบการลงเวลา Default", StatusCodes.Status404NotFound);
} //}
var effectiveDate = await _userDutyTimeRepository.GetLastEffectRound(p.Id); var effectiveDate = await _userDutyTimeRepository.GetLastEffectRound(p.Id);
var roundId = effectiveDate != null ? effectiveDate.DutyTimeId : Guid.Empty; var roundId = effectiveDate != null ? effectiveDate.DutyTimeId : Guid.Empty;