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

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") +