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/hrms-api-backend into develop

Browse source
This commit is contained in:
moss 2025-06-04 18:24:46 +07:00
commit 13709c65ef
1 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -842,6 +842,20 @@ namespace BMA.EHR.Retirement.Service.Controllers
positionTypeNew = p.posTypeId, positionTypeNew = p.posTypeId,
positionLevelNew = p.posLevelId, positionLevelNew = p.posLevelId,
positionNameNew = p.position, positionNameNew = p.position,
posmasterId = p.posmasterId,
posTypeNameNew = p.posTypeName,
posLeveNamelNew = p.posLevelName,
posNoNew = p.posMasterNo?.ToString(),
posNoAbbNew = p.child4ShortName != null ? $"{p.child4ShortName}" :
p.child3ShortName != null ? $"{p.child3ShortName}" :
p.child2ShortName != null ? $"{p.child2ShortName}" :
p.child1ShortName != null ? $"{p.child1ShortName}" :
p.rootShortName != null ? $"{p.rootShortName}" : "",
orgRootNew = p.root,
orgChild1New = p.child1,
orgChild2New = p.child2,
orgChild3New = p.child3,
orgChild4New = p.child4
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];
@ -1070,6 +1084,20 @@ namespace BMA.EHR.Retirement.Service.Controllers
positionTypeNew = p.posTypeId, positionTypeNew = p.posTypeId,
positionLevelNew = p.posLevelId, positionLevelNew = p.posLevelId,
positionNameNew = p.position, positionNameNew = p.position,
posmasterId = p.posmasterId,
posTypeNameNew = p.posTypeName,
posLevelNameNew = p.posLevelName,
posNoNew = p.posMasterNo?.ToString(),
posNoAbbNew = p.child4ShortName != null ? $"{p.child4ShortName}" :
p.child3ShortName != null ? $"{p.child3ShortName}" :
p.child2ShortName != null ? $"{p.child2ShortName}" :
p.child1ShortName != null ? $"{p.child1ShortName}" :
p.rootShortName != null ? $"{p.rootShortName}" : "",
orgRootNew = p.root,
orgChild1New = p.child1,
orgChild2New = p.child2,
orgChild3New = p.child3,
orgChild4New = p.child4
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];