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-09-09 17:54:08 +07:00
parent fb6a82be14
commit 9eae970ff3
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2118,8 +2118,8 @@ namespace BMA.EHR.Placement.Service.Controllers
currentProvinceId = p.RegistSame == true ? p.RegistProvinceId : p.CurrentProvinceId,
currentDistrictId = p.RegistSame == true ? p.RegistDistrictId : p.CurrentDistrictId,
currentSubDistrictId = p.RegistSame == true ? p.RegistSubDistrictId : p.CurrentSubDistrictId,
currentZipCode = p.RegistSame == true
? p.RegistZipCode == null ? null : p.RegistZipCode
currentZipCode = p.RegistSame == true
? p.RegistZipCode == null ? null : p.RegistZipCode
: p.CurrentZipCode == null ? null : p.CurrentZipCode,
amount = r.amount,
amountSpecial = r.amountSpecial,
@ -2344,8 +2344,10 @@ namespace BMA.EHR.Placement.Service.Controllers
{
No = r.Sequence.ToString().ToThaiNumber(),
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
// Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" :
// p.PlacementEducations.FirstOrDefault().Degree,
Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" :
p.PlacementEducations.FirstOrDefault().Degree,
$"{p.PlacementEducations.FirstOrDefault().Degree} {p.PlacementEducations.FirstOrDefault().Field}",
OldOc = (p.positionNameOld == null ? "" : $"{p.positionNameOld}\n") +
(p.PositionExecutiveOld == null ? "" : (p.positionExecutiveFieldOld == null ? $"{p.PositionExecutiveOld}\n" : $"{p.PositionExecutiveOld}({p.positionExecutiveFieldOld})\n")) +
(p.child4Old == null ? "" : $"{p.child4Old}\n") +
@ -2578,8 +2580,10 @@ namespace BMA.EHR.Placement.Service.Controllers
{
No = r.Sequence.ToString().ToThaiNumber(),
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
// Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" :
// p.PlacementEducations.FirstOrDefault().Degree,
Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" :
p.PlacementEducations.FirstOrDefault().Degree,
$"{p.PlacementEducations.FirstOrDefault().Degree} {p.PlacementEducations.FirstOrDefault().Field}",
OldOc = (p.positionNameOld == null ? "" : $"{p.positionNameOld}\n") +
(p.PositionExecutiveOld == null ? "" : (p.positionExecutiveFieldOld == null ? $"{p.PositionExecutiveOld}\n" : $"{p.PositionExecutiveOld}({p.positionExecutiveFieldOld})\n")) +
(p.child4Old == null ? "" : $"{p.child4Old}\n") +
@ -2801,8 +2805,10 @@ namespace BMA.EHR.Placement.Service.Controllers
{
No = r.Sequence.ToString().ToThaiNumber(),
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
// Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" :
// p.PlacementEducations.FirstOrDefault().Degree,
Education = p.PlacementEducations == null || p.PlacementEducations.Count == 0 ? "-" :
p.PlacementEducations.FirstOrDefault().Degree,
$"{p.PlacementEducations.FirstOrDefault().Degree} {p.PlacementEducations.FirstOrDefault().Field}",
OldOc = (p.positionNameOld == null ? "" : $"{p.positionNameOld}\n") +
(p.PositionExecutiveOld == null ? "" : (p.positionExecutiveFieldOld == null ? $"{p.PositionExecutiveOld}\n" : $"{p.PositionExecutiveOld}({p.positionExecutiveFieldOld})\n")) +
(p.child4Old == null ? "" : $"{p.child4Old}\n") +