#1271 (1) placement and retirement
This commit is contained in:
parent
c1a20aca35
commit
6cb0ddff6b
11 changed files with 203 additions and 339 deletions
|
|
@ -939,31 +939,21 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
|
||||
Education = p.EducationOld == null ? "-" : p.EducationOld,
|
||||
OldOrg = p.OrganizationPositionOld ?? "-",
|
||||
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}" : "-",
|
||||
OldOc = (p.PositionOld == null ? "" : $"{p.PositionOld}\n") +
|
||||
(p.child4Old == null ? "" : $"{p.child4Old}\n") +
|
||||
(p.child3Old == null ? "" : $"{p.child3Old}\n") +
|
||||
(p.child2Old == null ? "" : $"{p.child2Old}\n") +
|
||||
(p.child1Old == null ? "" : $"{p.child1Old}\n") +
|
||||
(p.rootOld == null ? "" : $"{p.rootOld}"),
|
||||
OldPositionType = p.PositionTypeOld ?? "-",
|
||||
OldPositionLevel = p.PositionLevelOld ?? "-",
|
||||
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
|
||||
NewOc = p.root == null ? p.position == null ? "-" : $"{p.position}/-" :
|
||||
p.node == 4
|
||||
? p.position == null ? $"{p.child4} {p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position} {p.child4} {p.child3} {p.child2} {p.child1} {p.root}" :
|
||||
p.node == 3
|
||||
? p.position == null ? $"{p.child3} {p.child2} {p.child1} {p.root}" : $"{p.position} {p.child3} {p.child2} {p.child1} {p.root}" :
|
||||
p.node == 2
|
||||
? p.position == null ? $"{p.child2} {p.child1} {p.root}" : $"{p.position} {p.child2} {p.child1} {p.root}" :
|
||||
p.node == 1
|
||||
? p.position == null ? $"{p.child1} {p.root}" : $"{p.position} {p.child1} {p.root}" :
|
||||
p.node == 0
|
||||
? p.position == null ? $"{p.root}" : $"{p.position} {p.root}" : "-",
|
||||
NewOc = (p.position == null ? "" : $"{p.position}\n") +
|
||||
(p.child4 == null ? "" : $"{p.child4}\n") +
|
||||
(p.child3 == null ? "" : $"{p.child3}\n") +
|
||||
(p.child2 == null ? "" : $"{p.child2}\n") +
|
||||
(p.child1 == null ? "" : $"{p.child1}\n") +
|
||||
(p.root == null ? "" : $"{p.root}"),
|
||||
NewPositionType = p.posTypeName == null ? "-" : p.posTypeName,
|
||||
NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName,
|
||||
NewPositionNumber = p.posMasterNo == null ? "-" :
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue