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

get report by node

Browse source
This commit is contained in:
kittapath 2024-12-13 12:12:08 +07:00
parent b532eefa61
commit 8813668b43
3 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -757,11 +757,11 @@ namespace BMA.EHR.Leave.Service.Controllers
var profile = new List<GetProfileByKeycloakIdRootDto>();
if (type.Trim().ToUpper() == "OFFICER")
{
profile = await _userProfileRepository.GetProfileWithKeycloakAllOfficer(AccessToken, req.node, req.nodeId);
profile = await _userProfileRepository.GetProfileWithKeycloakAllOfficer(AccessToken, req.node, req.nodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD");
}
else
{
profile = await _userProfileRepository.GetProfileWithKeycloakAllEmployee(AccessToken, req.node, req.nodeId);
profile = await _userProfileRepository.GetProfileWithKeycloakAllEmployee(AccessToken, req.node, req.nodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD");
}
// get leave day
var leaveDays = await _leaveRequestRepository.GetSumApproveLeaveByTypeAndRange(req.StartDate, req.EndDate);
@ -950,11 +950,11 @@ namespace BMA.EHR.Leave.Service.Controllers
var profile = new List<GetProfileByKeycloakIdRootDto>();
if (type.Trim().ToUpper() == "OFFICER")
{
profile = await _userProfileRepository.GetProfileWithKeycloakAllOfficer(AccessToken, req.node, req.nodeId);
profile = await _userProfileRepository.GetProfileWithKeycloakAllOfficer(AccessToken, req.node, req.nodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD");
}
else
{
profile = await _userProfileRepository.GetProfileWithKeycloakAllEmployee(AccessToken, req.node, req.nodeId);
profile = await _userProfileRepository.GetProfileWithKeycloakAllEmployee(AccessToken, req.node, req.nodeId, jsonData["result"] == "OWNER" || jsonData["result"] == "CHILD");
}
var date = req.StartDate.Date;
@ -1273,6 +1273,7 @@ namespace BMA.EHR.Leave.Service.Controllers
{
return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
}
Console.WriteLine(jsonData["result"]);
var leaveDays = await _leaveRequestRepository.GetSumApproveLeaveByRootAndRange(req.StartDate, req.EndDate, type);
var enddate = req.EndDate.Date == req.StartDate.Date ? "" : $" - {req.EndDate.Date.ToThaiShortDate().ToThaiNumber()}";
var result = new
@ -1281,8 +1282,7 @@ namespace BMA.EHR.Leave.Service.Controllers
reportName = "LeaveHalfYear-Officer",
data = new
{
leaveDateStart = $"ณ วันที่ {req.StartDate.Date.ToThaiShortDate().ToThaiNumber()}{enddate}",
leaveDateEnd = req.EndDate.Date.ToThaiShortDate().ToThaiNumber(),
dateTimeStamp = $"ณ วันที่ {req.StartDate.Date.ToThaiShortDate().ToThaiNumber()}{enddate}",
employees = leaveDays
}
};

2
BMA.EHR.Leave/DTOs/Reports/GetLeaveDetailByNodeReportDto.cs
View file

@ -5,7 +5,7 @@ namespace BMA.EHR.Leave.Service.DTOs.Reports
public DateTime StartDate { get; set; } = DateTime.MinValue;
public DateTime EndDate { get; set; } = DateTime.MinValue;
public string? Type { get; set; } = string.Empty;
public string? node { get; set; } = string.Empty;
public int? node { get; set; }
public string? nodeId { get; set; } = string.Empty;
}
}