hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

#1271 (1) placement and retirement

Browse source
This commit is contained in:
AdisakKanthawilang 2025-03-24 15:36:28 +07:00
parent c1a20aca35
commit 6cb0ddff6b
11 changed files with 203 additions and 339 deletions
Download patch file Download diff file Expand all files Collapse all files

42
BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
View file

@ -325,10 +325,10 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementOther.PositionLevelOld = org.result.posLevelName;
retirementOther.PositionTypeOld = org.result.posTypeName;
retirementOther.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
retirementOther.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 + " ") +
retirementOther.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);
retirementOther.OrganizationPositionOld = org.result.position + "\n" + retirementOther.OrganizationOld;
retirementOther.EducationOld = org.result.education;
@ -825,34 +825,24 @@ namespace BMA.EHR.Retirement.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 = p.LeaveDate == null ? "-" : p.LeaveDate.Value.ToThaiShortDate2().ToThaiNumber(),
MilitaryDate = p.MilitaryDate == null ? "-" : p.MilitaryDate.Value.ToThaiShortDate2().ToThaiNumber(),
NewOc = 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}" : "-",
NewOc = (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}"),
NewPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld,
NewPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld,
NewPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),