add commander position and leave approvers
This commit is contained in:
parent
59be7ac619
commit
885478f672
8 changed files with 1685 additions and 2 deletions
|
|
@ -357,6 +357,7 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
|
||||
leaveRequest.LeaveTypeCode = leaveType.Code;
|
||||
leaveRequest.Dear = approver;
|
||||
leaveRequest.CommanderPosition = profile.CommanderPositionName ?? "";
|
||||
|
||||
// เพิ่มตำแหน่ง
|
||||
//leaveRequest.CommanderPosition = req.CommanderPosition ?? "";
|
||||
|
|
@ -643,8 +644,7 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
|
||||
oldData.LeaveTypeCode = leaveType.Code;
|
||||
oldData.Dear = profile.Commander ?? "";
|
||||
|
||||
//oldData.CommanderPosition = profile.CommanderPosition ?? "";
|
||||
oldData.CommanderPosition = profile.CommanderPositionName ?? "";
|
||||
|
||||
|
||||
oldData.PositionName = profile.Position == null ? "" : profile.Position;
|
||||
|
|
@ -802,6 +802,8 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
FullName = $"{profile.Prefix}{profile.FirstName} {profile.LastName}",
|
||||
|
||||
Dear = profile.Commander ?? "",
|
||||
CommanderPosition = profile.CommanderPositionName ?? "",
|
||||
|
||||
PositionName = profile.Position == null ? "" : profile.Position,
|
||||
PositionLevelName = profile.PosLevel == null ? "" : profile.PosLevel,
|
||||
OrganizationName = orgName, //profile.Oc ?? "",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue