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

Merge branch 'develop' of github.com:Frappet/BMA-EHR-BackEnd into develop

Browse source
This commit is contained in:
kittapath 2024-11-14 11:00:32 +07:00
commit bebd9620a5
10 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
View file

@ -454,7 +454,7 @@ namespace BMA.EHR.Placement.Service.Controllers
(org.result.child2 == null ? "" : org.result.child2 + "/") + (org.result.child2 == null ? "" : org.result.child2 + "/") +
(org.result.child1 == null ? "" : org.result.child1 + "/") + (org.result.child1 == null ? "" : org.result.child1 + "/") +
(org.result.root == null ? "" : org.result.root); (org.result.root == null ? "" : org.result.root);
placementAppointment.OrganizationPositionOld = org.result.position + "-" + placementAppointment.OrganizationOld; placementAppointment.OrganizationPositionOld = org.result.position + "/" + placementAppointment.OrganizationOld;
placementAppointment.AmountOld = org.result.salary; placementAppointment.AmountOld = org.result.salary;
} }
await _context.PlacementAppointments.AddAsync(placementAppointment); await _context.PlacementAppointments.AddAsync(placementAppointment);

2
BMA.EHR.Placement.Service/Controllers/PlacementAppointmentEmployeeController.cs
View file

@ -486,7 +486,7 @@ namespace BMA.EHR.Placement.Service.Controllers
(org.result.child2 == null ? "" : org.result.child2 + "/") + (org.result.child2 == null ? "" : org.result.child2 + "/") +
(org.result.child1 == null ? "" : org.result.child1 + "/") + (org.result.child1 == null ? "" : org.result.child1 + "/") +
(org.result.root == null ? "" : org.result.root); (org.result.root == null ? "" : org.result.root);
placementAppointment.OrganizationPositionOld = org.result.position + "-" + placementAppointment.OrganizationOld; placementAppointment.OrganizationPositionOld = org.result.position + "/" + placementAppointment.OrganizationOld;
} }
await _context.PlacementAppointments.AddAsync(placementAppointment); await _context.PlacementAppointments.AddAsync(placementAppointment);
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();

2
BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
View file

@ -399,7 +399,7 @@ namespace BMA.EHR.Placement.Service.Controllers
(org.result.child2 == null ? "" : org.result.child2 + "/") + (org.result.child2 == null ? "" : org.result.child2 + "/") +
(org.result.child1 == null ? "" : org.result.child1 + "/") + (org.result.child1 == null ? "" : org.result.child1 + "/") +
(org.result.root == null ? "" : org.result.root); (org.result.root == null ? "" : org.result.root);
placementOfficer.OrganizationPositionOld = org.result.position + "-" + placementOfficer.OrganizationOld; placementOfficer.OrganizationPositionOld = org.result.position + "/" + placementOfficer.OrganizationOld;
} }
await _context.PlacementOfficers.AddAsync(placementOfficer); await _context.PlacementOfficers.AddAsync(placementOfficer);
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();

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

@ -500,7 +500,7 @@ namespace BMA.EHR.Placement.Service.Controllers
(org.result.child2 == null ? "" : org.result.child2 + "/") + (org.result.child2 == null ? "" : org.result.child2 + "/") +
(org.result.child1 == null ? "" : org.result.child1 + "/") + (org.result.child1 == null ? "" : org.result.child1 + "/") +
(org.result.root == null ? "" : org.result.root); (org.result.root == null ? "" : org.result.root);
placementReceive.OrganizationPositionOld = org.result.position + "-" + placementReceive.OrganizationOld; placementReceive.OrganizationPositionOld = org.result.position + "/" + placementReceive.OrganizationOld;
} }
} }
await _context.PlacementReceives.AddAsync(placementReceive); await _context.PlacementReceives.AddAsync(placementReceive);

2
BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs
View file

@ -278,7 +278,7 @@ namespace BMA.EHR.Placement.Service.Controllers
(org.result.child2 == null ? "" : org.result.child2 + "/") + (org.result.child2 == null ? "" : org.result.child2 + "/") +
(org.result.child1 == null ? "" : org.result.child1 + "/") + (org.result.child1 == null ? "" : org.result.child1 + "/") +
(org.result.root == null ? "" : org.result.root); (org.result.root == null ? "" : org.result.root);
placementRepatriation.OrganizationPositionOld = org.result.position + "-" + placementRepatriation.OrganizationOld; placementRepatriation.OrganizationPositionOld = org.result.position + "/" + placementRepatriation.OrganizationOld;
} }
await _context.PlacementRepatriations.AddAsync(placementRepatriation); await _context.PlacementRepatriations.AddAsync(placementRepatriation);
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();

2
BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
View file

@ -529,7 +529,7 @@ namespace BMA.EHR.Placement.Service.Controllers
(org.result.child2 == null ? "" : org.result.child2 + "/") + (org.result.child2 == null ? "" : org.result.child2 + "/") +
(org.result.child1 == null ? "" : org.result.child1 + "/") + (org.result.child1 == null ? "" : org.result.child1 + "/") +
(org.result.root == null ? "" : org.result.root); (org.result.root == null ? "" : org.result.root);
placementTransfer.OrganizationPositionOld = org.result.position + "-" + placementTransfer.OrganizationOld; placementTransfer.OrganizationPositionOld = org.result.position + "/" + placementTransfer.OrganizationOld;
} }
await _context.PlacementTransfers.AddAsync(placementTransfer); await _context.PlacementTransfers.AddAsync(placementTransfer);
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();

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

@ -401,7 +401,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
(org.result.child2 == null ? "" : org.result.child2 + "/") + (org.result.child2 == null ? "" : org.result.child2 + "/") +
(org.result.child1 == null ? "" : org.result.child1 + "/") + (org.result.child1 == null ? "" : org.result.child1 + "/") +
(org.result.root == null ? "" : org.result.root); (org.result.root == null ? "" : org.result.root);
retirementOther.OrganizationPositionOld = org.result.position + "-" + retirementOther.OrganizationOld; retirementOther.OrganizationPositionOld = org.result.position + "/" + retirementOther.OrganizationOld;
retirementOther.EducationOld = org.result.education; retirementOther.EducationOld = org.result.education;
} }
await _context.RetirementOthers.AddAsync(retirementOther); await _context.RetirementOthers.AddAsync(retirementOther);

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

@ -336,7 +336,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
(org.result.child2 == null ? "" : org.result.child2 + "/") + (org.result.child2 == null ? "" : org.result.child2 + "/") +
(org.result.child1 == null ? "" : org.result.child1 + "/") + (org.result.child1 == null ? "" : org.result.child1 + "/") +
(org.result.root == null ? "" : org.result.root); (org.result.root == null ? "" : org.result.root);
retirementOut.OrganizationPositionOld = org.result.position + "-" + retirementOut.OrganizationOld; retirementOut.OrganizationPositionOld = org.result.position + "/" + retirementOut.OrganizationOld;
} }
await _context.RetirementOuts.AddAsync(retirementOut); await _context.RetirementOuts.AddAsync(retirementOut);
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();

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

@ -945,7 +945,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
(org.result.child2 == null ? "" : org.result.child2 + "/") + (org.result.child2 == null ? "" : org.result.child2 + "/") +
(org.result.child1 == null ? "" : org.result.child1 + "/") + (org.result.child1 == null ? "" : org.result.child1 + "/") +
(org.result.root == null ? "" : org.result.root); (org.result.root == null ? "" : org.result.root);
retirementResign.OrganizationPositionOld = org.result.position + "-" + retirementResign.OrganizationOld; retirementResign.OrganizationPositionOld = org.result.position + "/" + retirementResign.OrganizationOld;
} }
await _context.RetirementResigns.AddAsync(retirementResign); await _context.RetirementResigns.AddAsync(retirementResign);
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();

2
BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
View file

@ -889,7 +889,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
(org.result.child2 == null ? "" : org.result.child2 + "/") + (org.result.child2 == null ? "" : org.result.child2 + "/") +
(org.result.child1 == null ? "" : org.result.child1 + "/") + (org.result.child1 == null ? "" : org.result.child1 + "/") +
(org.result.root == null ? "" : org.result.root); (org.result.root == null ? "" : org.result.root);
retirementResignEmployee.OrganizationPositionOld = org.result.position + "-" + retirementResignEmployee.OrganizationOld; retirementResignEmployee.OrganizationPositionOld = org.result.position + "/" + retirementResignEmployee.OrganizationOld;
} }
await _context.RetirementResignEmployees.AddAsync(retirementResignEmployee); await _context.RetirementResignEmployees.AddAsync(retirementResignEmployee);
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();