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

retire add approver
Some checks failed
release-dev / release-dev (push) Failing after 11s
Details

Browse source
This commit is contained in:
moss 2025-05-07 15:24:24 +07:00
parent 9f3388eb20
commit f2a0b754b3
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
View file

@ -363,6 +363,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.IsDiscipline, p.IsDiscipline,
p.CancelReason, p.CancelReason,
p.ApproveStep, 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(), RetirementResignEmployeeCancels = p.RetirementResignEmployeeCancels.FirstOrDefault(),
RetirementResignEmployeeDocs = p.RetirementResignEmployeeDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }), 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.IsNoBurden,
data.IsDiscipline, data.IsDiscipline,
data.CancelReason, data.CancelReason,
data.KeycloakUserId,
data.Approvers,
data.Commanders,
data.ApproveStep, data.ApproveStep,
idCancel = data.RetirementResignEmployeeCancels?.Id ?? Guid.Empty, idCancel = data.RetirementResignEmployeeCancels?.Id ?? Guid.Empty,
statusCancel = data.RetirementResignEmployeeCancels?.Status ?? null, statusCancel = data.RetirementResignEmployeeCancels?.Status ?? null,
@ -528,6 +534,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.IsNoDebt, p.IsNoDebt,
p.IsNoBurden, p.IsNoBurden,
p.IsDiscipline, 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, p.CancelReason,
idMain = p.RetirementResignEmployee.Id, idMain = p.RetirementResignEmployee.Id,
statusMain = p.RetirementResignEmployee.Status, statusMain = p.RetirementResignEmployee.Status,
@ -610,6 +619,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
data.CancelReason, data.CancelReason,
data.idMain, data.idMain,
data.statusMain, data.statusMain,
data.KeycloakUserId,
data.Approvers,
data.Commanders,
statusCancel = data.Status, statusCancel = data.Status,
Docs = retirementResignEmployeeDocs, Docs = retirementResignEmployeeDocs,
}; };