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

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

@ -207,6 +207,8 @@ namespace BMA.EHR.Placement.Service.Controllers
p.child4ShortNameOld,
p.PositionOld,
p.PositionExecutiveOld,
p.positionExecutiveFieldOld,
p.positionAreaOld,
p.posMasterNoOld,
p.posTypeOldId,
p.posTypeNameOld,
@ -283,6 +285,8 @@ namespace BMA.EHR.Placement.Service.Controllers
p.OrganizationPositionOld,
p.PositionOld,
p.PositionExecutiveOld,
p.positionExecutiveFieldOld,
p.positionAreaOld,
PlacementTransferDocs = p.PlacementTransferDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
})
.FirstOrDefaultAsync();
@ -338,6 +342,8 @@ namespace BMA.EHR.Placement.Service.Controllers
data.OrganizationPositionOld,
data.PositionOld,
data.PositionExecutiveOld,
data.positionExecutiveFieldOld,
data.positionAreaOld,
Docs = placementTransferDocs,
};
@ -407,6 +413,8 @@ namespace BMA.EHR.Placement.Service.Controllers
p.OrganizationPositionOld,
p.PositionOld,
p.PositionExecutiveOld,
p.positionExecutiveFieldOld,
p.positionAreaOld,
PlacementTransferDocs = p.PlacementTransferDocs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
})
.FirstOrDefaultAsync();
@ -462,6 +470,8 @@ namespace BMA.EHR.Placement.Service.Controllers
data.OrganizationPositionOld,
data.PositionOld,
data.PositionExecutiveOld,
data.positionExecutiveFieldOld,
data.positionAreaOld,
Docs = placementTransferDocs,
};
@ -538,6 +548,8 @@ namespace BMA.EHR.Placement.Service.Controllers
placementTransfer.AmountOld = org.result.salary;
placementTransfer.PositionOld = org.result.position;
placementTransfer.PositionExecutiveOld = org.result.posExecutiveName;
placementTransfer.positionExecutiveFieldOld = org.result.positionExecutiveField;
placementTransfer.positionAreaOld = org.result.positionArea;
placementTransfer.PositionLevelOld = org.result.posLevelName;
placementTransfer.PositionTypeOld = org.result.posTypeName;
placementTransfer.PositionNumberOld = org.result.nodeShortName + " " + org.result.posMasterNo;
@ -877,7 +889,9 @@ namespace BMA.EHR.Placement.Service.Controllers
amountSpecial = r.amountSpecial,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
positionExecutive = "",
positionExecutive = p.PositionExecutiveOld,
positionExecutiveField = p.positionExecutiveFieldOld,
positionArea = p.positionAreaOld,
positionType = p.PositionTypeOld,
positionLevel = p.PositionLevelOld,
commandId = r.commandId,