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

Merge branch 'develop' into working

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2025-05-15 06:40:41 +07:00
commit 9af97134f4
6 changed files with 31 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -355,8 +355,12 @@ namespace BMA.EHR.Leave.Service.Controllers
// if (list.Count > 0)
// approver = list.First().Name;
//}
if (data != null && data.LeaveSubTypeName == "ลาประกอบพิธีฮัจญ์" && isHajj == false)
{
isHajj = true;
}
if (data.HajjDayStatus == true)
if (isHajj == true)
{
return new
{

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

@ -411,7 +411,7 @@ namespace BMA.EHR.Leave.Service.Controllers
// add dear and oc_data
//var rootOc = _userProfileRepository.GetRootOcId(profile.OcId ?? Guid.Empty, AccessToken);
var approver = profile.Commander ?? "";
// var approver = profile.Commander ?? "";
var userOc = profile.Root ?? "";
//if (rootOc != null)
//{
@ -422,8 +422,8 @@ namespace BMA.EHR.Leave.Service.Controllers
leaveRequest.LeaveTypeCode = leaveType.Code;
leaveRequest.Dear = approver;
leaveRequest.CommanderPosition = profile.CommanderPositionName ?? "";
leaveRequest.Dear = req.Commander ?? "";
leaveRequest.CommanderPosition = req.CommanderPositionName ?? "";
// เพิ่มตำแหน่ง
//leaveRequest.CommanderPosition = req.CommanderPosition ?? "";
@ -934,12 +934,12 @@ namespace BMA.EHR.Leave.Service.Controllers
SalaryText = lastSalary == null ? "" : lastSalary.Amount == null ? "" : ((int)lastSalary.Amount.Value).ToThaiBahtText(false),
LeaveLast = leaveLast == null ? null : leaveLast,
TelephoneNumber = profile.TelephoneNumber ?? "-",
CurrentAddress = profile.CurrentAddress ?? "-",
CurrentSubDistrict = profile.CurrentSubDistrict ?? "-",
CurrentDistrict = profile.CurrentDistrict ?? "-",
CurrentProvince = profile.CurrentProvince ?? "-",
CurrentZipCode = profile.CurrentZipCode ?? "-",
TelephoneNumber = profile.TelephoneNumber ?? "",
CurrentAddress = profile.CurrentAddress ?? "",
CurrentSubDistrict = profile.CurrentSubDistrict ?? "",
CurrentDistrict = profile.CurrentDistrict ?? "",
CurrentProvince = profile.CurrentProvince ?? "",
CurrentZipCode = profile.CurrentZipCode ?? "",
};
return Success(result);
@ -1772,7 +1772,7 @@ namespace BMA.EHR.Leave.Service.Controllers
else if (role == "ROOT")
{
nodeId = profileAdmin?.RootDnaId;
}
}
var rawData =
await _leaveRequestRepository.GetCancelLeaveRequestForAdminAsync(req.Year, req.Type, req.Status, role, nodeId, profileAdmin?.Node);