From f2a0b754b3094be756065846d6f589d3247603e2 Mon Sep 17 00:00:00 2001
From: moss <>
Date: Wed, 7 May 2025 15:24:24 +0700
Subject: [PATCH] retire add approver

---
 .../RetirementResignEmployeeController.cs            | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
index 5f5e53ca..000f8ed7 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
@@ -363,6 +363,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                 p.IsDiscipline,
                                 p.CancelReason,
                                 p.ApproveStep,
+                                Approvers = p.Approvers.Where(x => x.ApproveType.ToUpper() == "APPROVER"),
+                                Commanders = p.Approvers.Where(x => x.ApproveType.ToUpper() == "COMMANDER"),
+                                KeycloakUserId = p.CreatedUserId,
                                 RetirementResignEmployeeCancels = p.RetirementResignEmployeeCancels.FirstOrDefault(),
                                 RetirementResignEmployeeDocs = p.RetirementResignEmployeeDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
                             })
@@ -442,6 +445,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
                     data.IsNoBurden,
                     data.IsDiscipline,
                     data.CancelReason,
+                    data.KeycloakUserId,
+                    data.Approvers,
+                    data.Commanders,
                     data.ApproveStep,
                     idCancel = data.RetirementResignEmployeeCancels?.Id ?? Guid.Empty,
                     statusCancel = data.RetirementResignEmployeeCancels?.Status ?? null,
@@ -528,6 +534,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                 p.IsNoDebt,
                                 p.IsNoBurden,
                                 p.IsDiscipline,
+                                Approvers = p.Approvers.Where(x => x.ApproveType.ToUpper() == "APPROVER"),
+                                Commanders = p.Approvers.Where(x => x.ApproveType.ToUpper() == "COMMANDER"),
+                                KeycloakUserId = p.CreatedUserId,
                                 p.CancelReason,
                                 idMain = p.RetirementResignEmployee.Id,
                                 statusMain = p.RetirementResignEmployee.Status,
@@ -610,6 +619,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
                     data.CancelReason,
                     data.idMain,
                     data.statusMain,
+                    data.KeycloakUserId,
+                    data.Approvers,
+                    data.Commanders,
                     statusCancel = data.Status,
                     Docs = retirementResignEmployeeDocs,
                 };