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

ออกคำสั่งใหม่

Browse source
This commit is contained in:
kittapath 2025-02-21 19:11:20 +07:00
parent 12aceb5e00
commit e092604b97
15 changed files with 592 additions and 407 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1048,8 +1048,8 @@ namespace BMA.EHR.Placement.Service.Controllers
isProbation = false,
isLeave = false,
dateRetire = (DateTime?)null,
dateAppoint = r.commandAffectDate,
dateStart = r.commandAffectDate,
dateAppoint = r.commandDateAffect,
dateStart = r.commandDateAffect,
govAgeAbsent = 0,
govAgePlus = 0,
birthDate = p.DateOfBirth == null ? (DateTime?)null : p.DateOfBirth,
@ -1076,29 +1076,34 @@ namespace BMA.EHR.Placement.Service.Controllers
},
bodySalarys = new
{
profileId = string.Empty,
date = r.commandAffectDate,
profileId = p.profileId,
amount = r.amount,
amountSpecial = r.amountSpecial,
commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.posMasterNo == null ? "" :
p.node == 4 ? $"{p.child4ShortName}{p.posMasterNo}" :
p.node == 3 ? $"{p.child3ShortName}{p.posMasterNo}" :
p.node == 2 ? $"{p.child2ShortName}{p.posMasterNo}" :
p.node == 1 ? $"{p.child1ShortName}{p.posMasterNo}" :
p.node == 0 ? $"{p.rootShortName}{p.posMasterNo}" : "",
position = p.position == null ? string.Empty : p.position,
positionLine = string.Empty,
positionPathSide = string.Empty,
positionExecutive = string.Empty,
positionType = p.posTypeName == null ? string.Empty : p.posTypeName,
positionLevel = p.posLevelName == null ? string.Empty : p.posLevelName,
refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}",
templateDoc = r.templateDoc,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
positionExecutive = "",
positionType = p.posTypeName,
positionLevel = p.posLevelName,
commandId = r.commandId,
orgRoot = p.root,
orgChild1 = p.child1,
orgChild2 = p.child2,
orgChild3 = p.child3,
orgChild4 = p.child4,
commandNo = r.commandNo,
commandYear = r.commandYear,
posNo = p.posMasterNo,
posNoAbb = p.node == 4 ? $"{p.child4ShortName}" :
p.node == 3 ? $"{p.child3ShortName}" :
p.node == 2 ? $"{p.child2ShortName}" :
p.node == 1 ? $"{p.child1ShortName}" :
p.node == 0 ? $"{p.rootShortName}" : "",
commandDateAffect = r.commandDateAffect,
commandDateSign = r.commandDateSign,
positionName = p.position,
commandCode = r.commandCode,
commandName = r.commandName,
remark = r.remark,
},
bodyPosition = new
{