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

Add GetProfileByProfileIdNoAuthAsync method and update related controller logic

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2026-02-11 11:47:49 +07:00
parent a2ac05ed61
commit e5e7c77880
4 changed files with 49 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1579,7 +1579,8 @@ namespace BMA.EHR.Leave.Service.Controllers
var leaveData = await _leaveBeginningRepository.GetByYearAndTypeIdForUserAsync(thisYear, rawData.Type.Id, rawData.KeycloakUserId);
var restDayOld = govAge < 180 ? 0 : leaveData == null ? 0 : leaveData.LeaveDays - 10;
var restDayOld = govAge < 180 ? 0 : leaveData == null ? 0 : (leaveData.LeaveDays + leaveData.BeginningLeaveDays - 10);
if (restDayOld < 0) restDayOld = 0;
var restDayCurrent = govAge < 180 ? 0 : 10;
@ -2509,6 +2510,8 @@ namespace BMA.EHR.Leave.Service.Controllers
var endFiscalYear = rawData.LeaveStartDate.Date.AddDays(-1); // นับจากวันที่ยื่นลา
var leaveSummary = await _leaveRequestRepository.GetSumApproveLeaveTotalByTypeAndRangeForUser(rawData.KeycloakUserId, rawData.Type.Id, startFiscalYear, endFiscalYear);
//var leaveSummary = leaveData == null ? 0.0 : leaveData.LeaveDaysUsed;
if (leaveData != null)
leaveSummary += leaveData.LeaveDaysUsed;
var extendLeave = 0.0;
var leaveLimit = (double)rawData.Type.Limit;
@ -2516,7 +2519,7 @@ namespace BMA.EHR.Leave.Service.Controllers
if (rawData.Type.Code == "LV-005")
{
leaveLimit = leaveData == null ? 0.0 : leaveData.LeaveDays;
extendLeave = leaveLimit - 10;
extendLeave = leaveLimit <= 0 ? 0 : leaveLimit - 10;
}
var result = new GetLeaveRequestForAdminByIdDto
@ -2615,8 +2618,6 @@ namespace BMA.EHR.Leave.Service.Controllers
//OrganizationName = rawData.OrganizationName ?? "",
// fix SIT ระบบบันทึกการลา>>รายการลา (ข้อมูลผู้สังกัดและเรียนไม่แสดง) #971
ApproveStep = rawData.ApproveStep ?? "-",
LeaveLimit = rawData.Type.Limit + extendLeave,
@ -2742,7 +2743,7 @@ namespace BMA.EHR.Leave.Service.Controllers
if (leaveType.Code == "LV-005")
{
leaveLimit = leaveData?.LeaveDays ?? 0.0;
extendLeave = leaveLimit - 10;
extendLeave = leaveLimit <= 0 ? 0 : leaveLimit - 10;
}
var data = new