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

fix
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m50s
Details

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2026-05-06 18:53:53 +07:00
parent 6d0921a76a
commit 4161fcc1cf
5 changed files with 62 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

26
BMA.EHR.Leave/Controllers/LeaveBeginningController.cs
View file

@ -378,6 +378,15 @@ namespace BMA.EHR.Leave.Service.Controllers
try
{
var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
// var profileId = ProfileId ?? Guid.Empty;
// var prefix = Prefix ?? "";
// var firstName = FirstName ?? "";
// var lastName = LastName ?? "";
// var rootDnaId = OrgRootDnaId ?? Guid.Empty;
// var child1DnaId = OrgChild1DnaId ?? Guid.Empty;
// var child2DnaId = OrgChild2DnaId ?? Guid.Empty;
// var child3DnaId = OrgChild3DnaId ?? Guid.Empty;
// var child4DnaId = OrgChild4DnaId ?? Guid.Empty;
var getPermission = await _permission.GetPermissionAPIAsync("UPDATE", "SYS_LEAVE_HISTORY");
var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
@ -389,7 +398,6 @@ namespace BMA.EHR.Leave.Service.Controllers
if (leaveBeginning == null)
return Error("ไม่พบข้อมูลที่ต้องการแก้ไข", StatusCodes.Status404NotFound);
var profile = await _userProfileRepository.GetProfileByProfileIdAsync(req.ProfileId, AccessToken);
if (profile == null)
{
@ -399,10 +407,11 @@ namespace BMA.EHR.Leave.Service.Controllers
var startFiscalDate = new DateTime(DateTime.Now.Year - 1, 10, 1);
var endFiscalDate = new DateTime(DateTime.Now.Year, 9, 30);
if (req.LeaveDaysUsed is null || req.LeaveCount is null)
{
var systemLeaveDays = await _leaveRequestRepository.GetSumApproveLeaveTotalByTypeAndRangeForUser2(profile.Keycloak ?? Guid.Empty, req.LeaveTypeId, startFiscalDate, endFiscalDate);
var systemLeaveCount = await _leaveRequestRepository.GetSumApproveLeaveCountByTypeAndRangeForUser2(profile.Keycloak ?? Guid.Empty, req.LeaveTypeId, startFiscalDate, endFiscalDate);
var systemLeaveDays = await _leaveRequestRepository.GetSumApproveLeaveTotalByTypeAndRangeForUserByProfile(req.ProfileId, req.LeaveTypeId, startFiscalDate, endFiscalDate);
var systemLeaveCount = await _leaveRequestRepository.GetSumApproveLeaveCountByTypeAndRangeForUserByProfile(req.ProfileId, req.LeaveTypeId, startFiscalDate, endFiscalDate);
leaveBeginning.LeaveDaysUsed = req.BeginningLeaveDays + systemLeaveDays;
leaveBeginning.LeaveCount = req.BeginningLeaveCount + systemLeaveCount;
@ -464,6 +473,17 @@ namespace BMA.EHR.Leave.Service.Controllers
try
{
var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
// var profileId = ProfileId ?? Guid.Empty;
// var prefix = Prefix ?? "";
// var firstName = FirstName ?? "";
// var lastName = LastName ?? "";
// var rootDnaId = OrgRootDnaId ?? Guid.Empty;
// var child1DnaId = OrgChild1DnaId ?? Guid.Empty;
// var child2DnaId = OrgChild2DnaId ?? Guid.Empty;
// var child3DnaId = OrgChild3DnaId ?? Guid.Empty;
// var child4DnaId = OrgChild4DnaId ?? Guid.Empty;
var getPermission = await _permission.GetPermissionAPIAsync("CREATE", "SYS_LEAVE_HISTORY");
var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
if (jsonData["status"]?.ToString() != "200")