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

#111 , #1271

Browse source
This commit is contained in:
AdisakKanthawilang 2025-03-26 17:12:46 +07:00
parent a4c629b9bd
commit bcb7c7781c
10 changed files with 51 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -330,7 +330,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
(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.OrganizationPositionOld = org.result.position + "\n" + (retirementOther.PositionExecutiveOld == null ? "" : retirementOther.PositionExecutiveOld + "\n") + retirementOther.OrganizationOld;
retirementOther.EducationOld = org.result.education;
retirementOther.AmountOld = org.result.salary;
}
@ -825,12 +825,7 @@ 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.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}"),
OldOc = p.OrganizationPositionOld,
OldPositionType = p.PositionTypeOld == null ? "-" : p.PositionTypeOld,
OldPositionLevel = p.PositionLevelOld == null ? "-" : p.PositionLevelOld,
OldPositionNumber = p.PositionNumberOld == null ? "-" : p.PositionNumberOld.ToThaiNumber(),
@ -838,6 +833,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
LeaveDate = p.LeaveDate == null ? "-" : p.LeaveDate.Value.ToThaiShortDate2().ToThaiNumber(),
MilitaryDate = p.MilitaryDate == null ? "-" : p.MilitaryDate.Value.ToThaiShortDate2().ToThaiNumber(),
NewOc = (p.PositionOld == null ? "" : $"{p.PositionOld}\n") +
(p.PositionExecutiveOld == null ? "" : $"{p.PositionExecutiveOld}\n") +
(p.child4Old == null ? "" : $"{p.child4Old}\n") +
(p.child3Old == null ? "" : $"{p.child3Old}\n") +
(p.child2Old == null ? "" : $"{p.child2Old}\n") +

4
BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
View file

@ -307,7 +307,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
(org.result.child2 == null ? "" : org.result.child2 + "\n") +
(org.result.child1 == null ? "" : org.result.child1 + "\n") +
(org.result.root == null ? "" : org.result.root);
retirementOut.OrganizationPositionOld = org.result.position + "\n" + retirementOut.OrganizationOld;
retirementOut.OrganizationPositionOld = org.result.position + "\n" + (retirementOut.PositionExecutiveOld == null ? "" : retirementOut.PositionExecutiveOld + "\n") + retirementOut.OrganizationOld;
retirementOut.AmountOld = org.result.salary;
}
}
@ -362,7 +362,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
(org.result.child2 == null ? "" : org.result.child2 + "\n") +
(org.result.child1 == null ? "" : org.result.child1 + "\n") +
(org.result.root == null ? "" : org.result.root);
retirementOut.OrganizationPositionOld = org.result.position + "\n" + retirementOut.OrganizationOld;
retirementOut.OrganizationPositionOld = org.result.position + "\n" + (retirementOut.PositionExecutiveOld == null ? "" : retirementOut.PositionExecutiveOld + "\n") + retirementOut.OrganizationOld;
retirementOut.AmountOld = org.result.salary;
}
}

5
BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
View file

@ -948,7 +948,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
(org.result.child2 == null ? "" : org.result.child2 + "\n") +
(org.result.child1 == null ? "" : org.result.child1 + "\n") +
(org.result.root == null ? "" : org.result.root);
retirementResign.OrganizationPositionOld = org.result.position + "\n" + retirementResign.OrganizationOld;
retirementResign.OrganizationPositionOld = org.result.position + "\n" + (retirementResign.PositionExecutiveOld == null ? "" : retirementResign.PositionExecutiveOld + "\n") + retirementResign.OrganizationOld;
}
await _context.RetirementResigns.AddAsync(retirementResign);
await _context.SaveChangesAsync();
@ -2357,7 +2357,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
PositionName = p.PositionOld ?? "-",
Organization = p.OrganizationPositionOld ?? "-",
Oc = (p.PositionOld == null ? "" : $"{p.PositionOld}\n") +
Oc = (p.PositionOld == null ? "" : $"{p.PositionOld}\n") +
(p.PositionExecutiveOld == null ? "" : $"{p.PositionExecutiveOld}\n") +
(p.child4Old == null ? "" : $"{p.child4Old}\n") +
(p.child3Old == null ? "" : $"{p.child3Old}\n") +
(p.child2Old == null ? "" : $"{p.child2Old}\n") +