แก้แนบท้าย
This commit is contained in:
parent
20eced3e86
commit
5ef296851b
6 changed files with 282 additions and 121 deletions
|
|
@ -845,14 +845,24 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
{
|
||||
No = r.Sequence.ToString().ToThaiNumber(),
|
||||
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
|
||||
Oc = (p.PositionOld == null ? "" : p.PositionOld) + "/" + (p.OrganizationPositionOld == null ? "" : p.OrganizationPositionOld),
|
||||
PositionType = p.PositionTypeOld == null ? "" : p.PositionTypeOld,
|
||||
PositionLevel = p.PositionLevelOld == null ? "" : p.PositionLevelOld,
|
||||
PositionNumber = p.PositionNumberOld == null ? "" : p.PositionNumberOld.ToThaiNumber(),
|
||||
Salary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
|
||||
ReceiveOrganizationName = p.Organization == null ? "" : p.Organization,
|
||||
ActiveDate = p.Date == null ? "" : p.Date.Value.ToThaiShortDate2().ToThaiNumber(),
|
||||
Reason = p.Reason ?? "",
|
||||
OldOc = p.rootOld == null ? p.PositionOld == null ? "-" : $"{p.PositionOld}/-" :
|
||||
p.child4Old != null
|
||||
? p.PositionOld == null ? $"{p.child4Old}/{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" : $"{p.PositionOld}/{p.child4Old}/{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" :
|
||||
p.child3Old != null
|
||||
? p.PositionOld == null ? $"{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" : $"{p.PositionOld}/{p.child3Old}/{p.child2Old}/{p.child1Old}/{p.rootOld}" :
|
||||
p.child2Old != null
|
||||
? p.PositionOld == null ? $"{p.child2Old}/{p.child1Old}/{p.rootOld}" : $"{p.PositionOld}/{p.child2Old}/{p.child1Old}/{p.rootOld}" :
|
||||
p.child1Old != null
|
||||
? p.PositionOld == null ? $"{p.child1Old}/{p.rootOld}" : $"{p.PositionOld}/{p.child1Old}/{p.rootOld}" :
|
||||
p.rootOld != null
|
||||
? p.PositionOld == null ? $"{p.rootOld}" : $"{p.PositionOld}/{p.rootOld}" : "-",
|
||||
PositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld,
|
||||
PositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld,
|
||||
PositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),
|
||||
Salary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
|
||||
ReceiveOrganizationName = p.Organization == null ? "-" : p.Organization,
|
||||
ActiveDate = p.Date == null ? "-" : p.Date.Value.ToThaiShortDate2().ToThaiNumber(),
|
||||
Reason = p.Reason ?? "-",
|
||||
RemarkHorizontal = r.RemarkHorizontal,
|
||||
RemarkVertical = r.RemarkVertical,
|
||||
}).ToList();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue