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

12
BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
View file

@ -501,12 +501,12 @@ namespace BMA.EHR.Placement.Service.Controllers
placementReceive.PositionLevelOld = org.result.posLevelName;
placementReceive.PositionTypeOld = org.result.posTypeName;
placementReceive.PositionNumberOld = org.result.nodeShortName + org.result.posMasterNo;
placementReceive.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 + " ") +
placementReceive.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);
placementReceive.OrganizationPositionOld = org.result.position + "\n" + placementReceive.OrganizationOld;
placementReceive.OrganizationPositionOld = org.result.position + "\n" + (placementReceive.PositionExecutiveOld == null ? "" : placementReceive.PositionExecutiveOld + "\n") + placementReceive.OrganizationOld;
}
}
await _context.PlacementReceives.AddAsync(placementReceive);
@ -940,6 +940,7 @@ namespace BMA.EHR.Placement.Service.Controllers
Education = p.EducationOld == null ? "-" : p.EducationOld,
OldOrg = p.OrganizationPositionOld ?? "-",
OldOc = (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") +
@ -949,6 +950,7 @@ namespace BMA.EHR.Placement.Service.Controllers
OldPositionLevel = p.PositionLevelOld ?? "-",
OldSalary = p.AmountOld == null ? "-" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
NewOc = (p.position == null ? "" : $"{p.position}\n") +
(p.PositionExecutive == null ? "" : $"{p.PositionExecutive}\n") +
(p.child4 == null ? "" : $"{p.child4}\n") +
(p.child3 == null ? "" : $"{p.child3}\n") +
(p.child2 == null ? "" : $"{p.child2}\n") +