add LeaveRange to LeaveRequest
add "dear": String, //*เรียน(4) "leaveTotal": String, //*จำนวนวันขอยกเลิก(12)
This commit is contained in:
parent
203e901767
commit
d7be2da281
8 changed files with 1029 additions and 15 deletions
|
|
@ -642,6 +642,15 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
|
||||
var fullName = $"{profile!.Prefix!.Name}{profile!.FirstName} {profile!.LastName}";
|
||||
|
||||
var rootOc = _userProfileRepository.GetRootOcId(profile.OcId ?? Guid.Empty);
|
||||
var approver = string.Empty;
|
||||
if (rootOc != null)
|
||||
{
|
||||
var list = await _commandRepository.GetOrgApproverAsync(rootOc ?? Guid.Empty);
|
||||
if (list.Count > 0)
|
||||
approver = list.First().Name;
|
||||
}
|
||||
|
||||
var result = new
|
||||
{
|
||||
template = "แบบใบขอยกเลิกวันลา",
|
||||
|
|
@ -656,7 +665,9 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
positionLeaveName = profile!.Position == null ? "-" : profile!.Position!.Name,
|
||||
organizationName = profile!.Oc ?? "",
|
||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate(),
|
||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate()
|
||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate(),
|
||||
dear = approver,
|
||||
leaveTotal = data.LeaveTotal
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue