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

issue #1580
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m45s
Details

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2026-05-11 15:12:09 +07:00
parent f02413f2b2
commit 80fcda61cf
7 changed files with 1884 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -175,6 +175,9 @@ namespace BMA.EHR.Leave.Service.Controllers
LastUpdateFullName = FullName ?? "",
LastUpdateUserId = UserId!,
LastUpdatedAt = DateTime.Now,
IsAct = r.isAct,
KeyId = r.keyId
});
}
@ -2988,7 +2991,10 @@ namespace BMA.EHR.Leave.Service.Controllers
ApproveStatus = x.ApproveStatus,
Comment = x.Comment,
ProfileId = x.ProfileId,
KeycloakId = x.KeycloakId
KeycloakId = x.KeycloakId,
isAct = x.IsAct,
keyId = x.KeyId
}).ToList();
var approvers = rawData.Approvers.Where(x => x.ApproveType.ToUpper() == "APPROVER")
@ -3003,7 +3009,10 @@ namespace BMA.EHR.Leave.Service.Controllers
ApproveStatus = x.ApproveStatus,
Comment = x.Comment,
ProfileId = x.ProfileId,
KeycloakId = x.KeycloakId
KeycloakId = x.KeycloakId,
isAct = x.IsAct,
keyId = x.KeyId
}).ToList();
result.Approvers.AddRange(approvers);

3
BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminByIdDto.cs
View file

@ -174,5 +174,8 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
public string ApproveStatus { get; set; } = string.Empty;
public string Comment { get; set; } = string.Empty;
public bool isAct { get; set; } = false;
public string keyId { get; set; } = string.Empty;
}
}

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

@ -37,5 +37,11 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
[JsonProperty("organizationName")]
public string OrganizationName { get; set; } = string.Empty;
[JsonProperty("isAct")]
public bool isAct { get; set; } = false;
[JsonProperty("keyId")]
public string keyId { get; set; } = string.Empty;
}
}