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

บันทึกเรียนระบบลา
Some checks failed
release-dev / release-dev (push) Failing after 12s
Details

Browse source
This commit is contained in:
moss 2025-05-14 11:36:38 +07:00
parent 3f31f68c60
commit 741eccd933
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -411,7 +411,7 @@ namespace BMA.EHR.Leave.Service.Controllers
// add dear and oc_data // add dear and oc_data
//var rootOc = _userProfileRepository.GetRootOcId(profile.OcId ?? Guid.Empty, AccessToken); //var rootOc = _userProfileRepository.GetRootOcId(profile.OcId ?? Guid.Empty, AccessToken);
var approver = profile.Commander ?? ""; // var approver = profile.Commander ?? "";
var userOc = profile.Root ?? ""; var userOc = profile.Root ?? "";
//if (rootOc != null) //if (rootOc != null)
//{ //{
@ -422,8 +422,8 @@ namespace BMA.EHR.Leave.Service.Controllers
leaveRequest.LeaveTypeCode = leaveType.Code; leaveRequest.LeaveTypeCode = leaveType.Code;
leaveRequest.Dear = approver; leaveRequest.Dear = req.Commander ?? "";
leaveRequest.CommanderPosition = profile.CommanderPositionName ?? ""; leaveRequest.CommanderPosition = req.CommanderPositionName ?? "";
// เพิ่มตำแหน่ง // เพิ่มตำแหน่ง
//leaveRequest.CommanderPosition = req.CommanderPosition ?? ""; //leaveRequest.CommanderPosition = req.CommanderPosition ?? "";
@ -1772,7 +1772,7 @@ namespace BMA.EHR.Leave.Service.Controllers
else if (role == "ROOT") else if (role == "ROOT")
{ {
nodeId = profileAdmin?.RootDnaId; nodeId = profileAdmin?.RootDnaId;
} }
var rawData = var rawData =
await _leaveRequestRepository.GetCancelLeaveRequestForAdminAsync(req.Year, req.Type, req.Status, role, nodeId, profileAdmin?.Node); await _leaveRequestRepository.GetCancelLeaveRequestForAdminAsync(req.Year, req.Type, req.Status, role, nodeId, profileAdmin?.Node);

6
BMA.EHR.Leave/DTOs/LeaveRequest/CreateLeaveRequestDto.cs
View file

@ -102,7 +102,11 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
public DateTime? CoupleDayEndDateHistory { get; set; } public DateTime? CoupleDayEndDateHistory { get; set; }
public string? CoupleDaySumTotalHistory { get; set; } public string? CoupleDaySumTotalHistory { get; set; }
public string? Commander { get; set; }
public string? CommanderPositionName { get; set; }
} }
} }