#1271 (1) placement and retirement
This commit is contained in:
parent
c1a20aca35
commit
6cb0ddff6b
11 changed files with 203 additions and 339 deletions
|
|
@ -456,10 +456,10 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
placementAppointment.PositionLevelOld = org.result.posLevelName;
|
||||
placementAppointment.PositionTypeOld = org.result.posTypeName;
|
||||
placementAppointment.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
|
||||
placementAppointment.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + " ") +
|
||||
(org.result.child3 == null ? "" : org.result.child3 + " ") +
|
||||
(org.result.child2 == null ? "" : org.result.child2 + " ") +
|
||||
(org.result.child1 == null ? "" : org.result.child1 + " ") +
|
||||
placementAppointment.OrganizationOld = (org.result.child4 == null ? "" : org.result.child4 + "\n") +
|
||||
(org.result.child3 == null ? "" : org.result.child3 + "\n") +
|
||||
(org.result.child2 == null ? "" : org.result.child2 + "\n") +
|
||||
(org.result.child1 == null ? "" : org.result.child1 + "\n") +
|
||||
(org.result.root == null ? "" : org.result.root);
|
||||
placementAppointment.OrganizationPositionOld = org.result.position + "\n" + placementAppointment.OrganizationOld;
|
||||
placementAppointment.AmountOld = org.result.salary;
|
||||
|
|
@ -812,33 +812,23 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
No = r.Sequence.ToString().ToThaiNumber(),
|
||||
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
|
||||
Education = p.EducationOld == null ? "-" : p.EducationOld,
|
||||
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 == null ? "-" : p.PositionTypeOld,
|
||||
OldPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld,
|
||||
OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),
|
||||
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
|
||||
LeaveDate = "-",
|
||||
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 ? "-" :
|
||||
|
|
@ -1036,33 +1026,23 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
No = r.Sequence.ToString().ToThaiNumber(),
|
||||
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
|
||||
Education = p.EducationOld == null ? "-" : p.EducationOld,
|
||||
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 == null ? "-" : p.PositionTypeOld,
|
||||
OldPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld,
|
||||
OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),
|
||||
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
|
||||
LeaveDate = "-",
|
||||
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 ? "-" :
|
||||
|
|
@ -1262,31 +1242,21 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
{
|
||||
No = r.Sequence.ToString().ToThaiNumber(),
|
||||
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
|
||||
OldOrganization = 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}" : "-",
|
||||
OldOrganization = (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}"),
|
||||
OldPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld.ToThaiNumber(),
|
||||
OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),
|
||||
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}"),
|
||||
NewPositionLevel = p.posLevelName == null ? "-" : p.posLevelName.ToThaiNumber(),
|
||||
NewPositionNumber = p.posMasterNo == null ? "-" :
|
||||
p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
|
||||
|
|
@ -1476,35 +1446,25 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
{
|
||||
No = r.Sequence.ToString().ToThaiNumber(),
|
||||
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
|
||||
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}" : "-",
|
||||
OldPositionNumber = p.posMasterNoOld == null ? "-" :
|
||||
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}"),
|
||||
OldPositionNumber = p.posMasterNoOld == null ? "-" :
|
||||
p.child4Old != null ? $"{p.child4ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
|
||||
p.child3Old != null ? $"{p.child3ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
|
||||
p.child2Old != null ? $"{p.child2ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
|
||||
p.child1Old != null ? $"{p.child1ShortNameOld}{p.posMasterNoOld}".ToThaiNumber() :
|
||||
p.rootOld != null ? $"{p.rootShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : "-",
|
||||
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}"),
|
||||
NewPositionNumber = p.posMasterNo == null ? "-" :
|
||||
p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}".ToThaiNumber() :
|
||||
p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}".ToThaiNumber() :
|
||||
|
|
@ -1701,17 +1661,12 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
No = r.Sequence.ToString().ToThaiNumber(),
|
||||
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
|
||||
Education = p.EducationOld == null ? "-" : p.EducationOld,
|
||||
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.posTypeNameOld == null ? "-" : p.posTypeNameOld,
|
||||
OldPositionLevel = p.posLevelNameOld == null ? "-" : p.posLevelNameOld,
|
||||
OldPositionNumber = p.posMasterNoOld == null ? "-" :
|
||||
|
|
@ -1722,17 +1677,12 @@ namespace BMA.EHR.Placement.Service.Controllers
|
|||
p.rootOld != null ? $"{p.rootShortNameOld}{p.posMasterNoOld}".ToThaiNumber() : "-",
|
||||
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
|
||||
PositionDate = p.PositionDate == null ? "-" : p.PositionDate.Value.ToThaiShortDate2().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