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

Update leave limit logic and add GovAge property to user leave profile DTO
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m10s
Details

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2026-02-03 21:03:40 +07:00
parent c25bef0672
commit 1a0e712a1c
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -900,7 +900,11 @@ namespace BMA.EHR.Leave.Service.Controllers
if (govAge < 180)
leaveLimit = 0;
else
leaveLimit = leaveData == null ? 0 : leaveData.LeaveDays;
{
leaveLimit = leaveData == null ?
govAge < 180 ? 0 : 10
: leaveData.LeaveDays;
}
}
else
leaveLimit = leaveType.Limit;
@ -955,6 +959,7 @@ namespace BMA.EHR.Leave.Service.Controllers
CurrentDistrict = profile.CurrentDistrict ?? "",
CurrentProvince = profile.CurrentProvince ?? "",
CurrentZipCode = profile.CurrentZipCode ?? "",
GovAge = govAge
};
return Success(result);

2
BMA.EHR.Leave/DTOs/LeaveRequest/GetUserLeaveProfileResultDto.cs
View file

@ -51,5 +51,7 @@
public string? CurrentProvince { get; set; }
public string? CurrentZipCode { get; set; }
public int GovAge { get; set; } = 0;
}
}