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

fix #1462 และ #1497
Some checks failed
release-dev / release-dev (push) Failing after 11s
Details

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2025-05-02 12:03:56 +07:00
parent 9bf7ee2e9a
commit 66d4a08f3c
4 changed files with 60 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
BMA.EHR.Leave/BMA.EHR.Leave.csproj
View file

@ -11,7 +11,8 @@
<RootNamespace>BMA.EHR.Leave.Service</RootNamespace>
<AssemblyName>BMA.EHR.Leave</AssemblyName>
<NoWarn>$(NoWarn);</NoWarn>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<NoWarn>$(NoWarn);$(WarningsNotAsErrors)</NoWarn>
</PropertyGroup>

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

@ -3,6 +3,7 @@ using BMA.EHR.Application.Repositories.Commands;
using BMA.EHR.Application.Repositories.Leaves.LeaveRequests;
using BMA.EHR.Application.Repositories.Leaves.TimeAttendants;
using BMA.EHR.Application.Repositories.MetaData;
using BMA.EHR.Application.Responses.Profiles;
using BMA.EHR.Domain.Common;
using BMA.EHR.Domain.Extensions;
using BMA.EHR.Domain.Models.Leave.Commons;
@ -1552,7 +1553,27 @@ namespace BMA.EHR.Leave.Service.Controllers
{
return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
}
var rawData = await _leaveRequestRepository.GetLeaveRequestForAdminAsync(req.Year, req.Type, req.Status, req.StartDate, req.EndDate);
// เพิ่มเติมการดึงคนตามสิทธิ์แบบที่ bright ทำ #1462
var profileList = new List<GetProfileByKeycloakIdRootDto>();
if (req.ProfileType.Trim().ToUpper() == "OFFICER")
{
profileList = await _userProfileRepository.GetProfileWithNoneValidateKeycloakAllOfficerAndRevision(AccessToken, req.Node, req.NodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD", req.RevisionId);
}
else
{
profileList = await _userProfileRepository.GetProfileWithNoneValidateKeycloakAllEmployeeAndRevision(AccessToken, req.Node, req.NodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD", req.RevisionId);
}
var keycloakList = new List<Guid>();
if(profileList != null)
{
keycloakList = profileList.Where(x => x.Keycloak != null).Select(x => x.Keycloak!.Value).ToList();
}
var rawData = await _leaveRequestRepository.GetLeaveRequestForAdminWithAuthAsync(req.Year, req.Type, req.Status, req.StartDate, req.EndDate, keycloakList);
var result = new List<GetLeaveRequestForAdminResultDto>();
@ -1650,7 +1671,7 @@ namespace BMA.EHR.Leave.Service.Controllers
}
else
{
data = await _leaveRequestRepository.ApproveCancelLeaveRequestAsync(data, "อนุมัติการขอยกเลิกการลา โดยระบบ");
data = await _leaveRequestRepository.ApproveCancelLeaveRequestAsync(data, "อนุมัติการขอยกเลิกการลา โดยระบบ", req.Reason ?? "");
}
// upload leave cancel document

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

@ -28,5 +28,11 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
public string ProfileType { get; set; } = string.Empty;
public string NodeId { get; set; } = string.Empty;
public int Node { get; set; }
public string? RevisionId { get; set; } = string.Empty;
}
}