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

update placement and retire

Browse source
This commit is contained in:
AdisakKanthawilang 2025-06-16 12:10:50 +07:00
parent b528f0a81d
commit 706edbd0f0
32 changed files with 282 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -157,6 +157,8 @@ namespace BMA.EHR.Placement.Service.Controllers
p.posMasterNoOld,
p.PositionOld,
p.PositionExecutiveOld,
p.positionExecutiveFieldOld,
p.positionAreaOld,
p.posTypeOldId,
p.posTypeNameOld,
p.posLevelOldId,
@ -244,6 +246,8 @@ namespace BMA.EHR.Placement.Service.Controllers
p.AmountOld,
p.PositionOld,
p.PositionExecutiveOld,
p.positionExecutiveFieldOld,
p.positionAreaOld,
p.OrganizationOld,
p.PositionTypeOld,
p.PositionLevelOld,
@ -343,6 +347,8 @@ namespace BMA.EHR.Placement.Service.Controllers
data.AmountOld,
data.PositionOld,
data.PositionExecutiveOld,
data.positionExecutiveFieldOld,
data.positionAreaOld,
organizationOld = data.OrganizationOld == "/" || data.OrganizationOld == null ? null : data.OrganizationOld,
data.PositionTypeOld,
data.PositionLevelOld,
@ -498,6 +504,8 @@ namespace BMA.EHR.Placement.Service.Controllers
placementReceive.PositionOld = org.result.position;
placementReceive.PositionExecutiveOld = org.result.posExecutiveName;
placementReceive.positionExecutiveFieldOld = org.result.positionExecutiveField;
placementReceive.positionAreaOld = org.result.positionArea;
placementReceive.PositionLevelOld = org.result.posLevelName;
placementReceive.PositionTypeOld = org.result.posTypeName;
placementReceive.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
@ -674,6 +682,8 @@ namespace BMA.EHR.Placement.Service.Controllers
uppdated.posMasterNo = req.posMasterNo;
uppdated.position = req.positionName;
uppdated.PositionExecutive = req.posExecutiveName;
uppdated.positionExecutiveField = req.positionExecutiveField;
uppdated.positionArea = req.positionArea;
uppdated.positionField = req.positionField;
uppdated.posTypeId = req.posTypeId;
uppdated.posTypeName = req.posTypeName;
@ -941,7 +951,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.PositionExecutiveOld == null ? "" : (p.positionExecutiveFieldOld == null ? $"{p.PositionExecutiveOld}\n" : $"{p.PositionExecutiveOld}({p.positionExecutiveFieldOld})\n")) +
(p.child4Old == null ? "" : $"{p.child4Old}\n") +
(p.child3Old == null ? "" : $"{p.child3Old}\n") +
(p.child2Old == null ? "" : $"{p.child2Old}\n") +
@ -951,7 +961,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.PositionExecutive == null ? "" : (p.positionExecutiveField == null ? $"{p.PositionExecutive}\n" : $"{p.PositionExecutive}({p.positionExecutiveField})\n")) +
(p.child4 == null ? "" : $"{p.child4}\n") +
(p.child3 == null ? "" : $"{p.child3}\n") +
(p.child2 == null ? "" : $"{p.child2}\n") +
@ -1078,7 +1088,9 @@ namespace BMA.EHR.Placement.Service.Controllers
amountSpecial = r.amountSpecial,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
positionExecutive = "",
positionExecutive = p.PositionExecutive,
positionExecutiveField = p.positionExecutiveField,
positionArea = p.positionArea,
positionType = p.posTypeName,
positionLevel = p.posLevelName,
commandId = r.commandId,