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

แก้ api ลา

Browse source
This commit is contained in:
kittapath 2024-11-18 18:43:46 +07:00
parent d08b4ca723
commit 4822110533
20 changed files with 20695 additions and 2783 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -850,7 +850,7 @@ namespace BMA.EHR.Leave.Service.Controllers
no = count,
fullName = $"{p.Prefix}{p.FirstName} {p.LastName}",// _userProfileRepository.GetUserFullName(p.Keycloak ?? Guid.Empty, AccessToken),
position = p.Position == null ? "" : p.Position,
//positionLevel = p.PosLevel == null ? "" : p.PosLevel.PosLevelName,
//positionLevel = p.PosLevel == null ? "" : p.PosLevel,
//posNo = p.ProfileSalary == null ? "" : p.ProfileSalary.PosNo,
positionLevel = p.PositionLevel == null ? "" : p.PositionLevel,
posNo = p.PosNo == null ? "" : p.PosNo,
@ -1084,7 +1084,7 @@ namespace BMA.EHR.Leave.Service.Controllers
{
//var profile = await _userProfileRepository.SearchProfile(null, null, null);
var profile = await _userProfileRepository.GetProfileWithKeycloak(AccessToken);
if(profile.Count > 0)
if (profile.Count > 0)
{
profile = profile.Where(p => p.IsLeave == false).ToList();
}
@ -1232,12 +1232,12 @@ namespace BMA.EHR.Leave.Service.Controllers
workTotal += 1;
if (!timeStamps.IsLocationCheckIn)
{
if(timeStamps.CheckInLocationName == "ปฏิบัติงานที่บ้าน")
if (timeStamps.CheckInLocationName == "ปฏิบัติงานที่บ้าน")
wfhTotal += 1;
else if (timeStamps.CheckInLocationName == "ไปประชุม/อบรม/สัมมนา/ปฏิบัติงานที่บ้านนอกสถานที่")
seminarTotal += 1;
}
}