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 23:48:11 +07:00
parent 3d0994b29b
commit 2d4df884d7
13 changed files with 129 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

72
.github/workflows/release_Retirement.yaml vendored
View file

@ -68,40 +68,40 @@ jobs:
docker compose pull docker compose pull
docker compose up -d docker compose up -d
echo "${{ steps.gen_ver.outputs.image_ver }}"> success echo "${{ steps.gen_ver.outputs.image_ver }}"> success
- name: Notify Discord Success # - name: Notify Discord Success
if: success() # if: success()
run: | # run: |
curl -H "Content-Type: application/json" \ # curl -H "Content-Type: application/json" \
-X POST \ # -X POST \
-d '{ # -d '{
"embeds": [{ # "embeds": [{
"title": "✅ Deployment Success!", # "title": "✅ Deployment Success!",
"description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Deployed by: `${{github.actor}}`", # "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Deployed by: `${{github.actor}}`",
"color": 3066993, # "color": 3066993,
"footer": { # "footer": {
"text": "Release Notification", # "text": "Release Notification",
"icon_url": "https://example.com/success-icon.png" # "icon_url": "https://example.com/success-icon.png"
}, # },
"timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'" # "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
}] # }]
}' \ # }' \
${{ secrets.DISCORD_WEBHOOK }} # ${{ secrets.DISCORD_WEBHOOK }}
- name: Notify Discord Failure # - name: Notify Discord Failure
if: failure() # if: failure()
run: | # run: |
curl -H "Content-Type: application/json" \ # curl -H "Content-Type: application/json" \
-X POST \ # -X POST \
-d '{ # -d '{
"embeds": [{ # "embeds": [{
"title": "❌ Deployment Failed!", # "title": "❌ Deployment Failed!",
"description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Attempted by: `${{github.actor}}`", # "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Attempted by: `${{github.actor}}`",
"color": 15158332, # "color": 15158332,
"footer": { # "footer": {
"text": "Release Notification", # "text": "Release Notification",
"icon_url": "https://example.com/failure-icon.png" # "icon_url": "https://example.com/failure-icon.png"
}, # },
"timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'" # "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
}] # }]
}' \ # }' \
${{ secrets.DISCORD_WEBHOOK }} # ${{ secrets.DISCORD_WEBHOOK }}

72
.github/workflows/release_discipline.yaml vendored
View file

@ -68,40 +68,40 @@ jobs:
docker compose pull docker compose pull
docker compose up -d docker compose up -d
echo "${{ steps.gen_ver.outputs.image_ver }}"> success echo "${{ steps.gen_ver.outputs.image_ver }}"> success
- name: Notify Discord Success # - name: Notify Discord Success
if: success() # if: success()
run: | # run: |
curl -H "Content-Type: application/json" \ # curl -H "Content-Type: application/json" \
-X POST \ # -X POST \
-d '{ # -d '{
"embeds": [{ # "embeds": [{
"title": "✅ Deployment Success!", # "title": "✅ Deployment Success!",
"description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Deployed by: `${{github.actor}}`", # "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Deployed by: `${{github.actor}}`",
"color": 3066993, # "color": 3066993,
"footer": { # "footer": {
"text": "Release Notification", # "text": "Release Notification",
"icon_url": "https://example.com/success-icon.png" # "icon_url": "https://example.com/success-icon.png"
}, # },
"timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'" # "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
}] # }]
}' \ # }' \
${{ secrets.DISCORD_WEBHOOK }} # ${{ secrets.DISCORD_WEBHOOK }}
- name: Notify Discord Failure # - name: Notify Discord Failure
if: failure() # if: failure()
run: | # run: |
curl -H "Content-Type: application/json" \ # curl -H "Content-Type: application/json" \
-X POST \ # -X POST \
-d '{ # -d '{
"embeds": [{ # "embeds": [{
"title": "❌ Deployment Failed!", # "title": "❌ Deployment Failed!",
"description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Attempted by: `${{github.actor}}`", # "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Attempted by: `${{github.actor}}`",
"color": 15158332, # "color": 15158332,
"footer": { # "footer": {
"text": "Release Notification", # "text": "Release Notification",
"icon_url": "https://example.com/failure-icon.png" # "icon_url": "https://example.com/failure-icon.png"
}, # },
"timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'" # "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
}] # }]
}' \ # }' \
${{ secrets.DISCORD_WEBHOOK }} # ${{ secrets.DISCORD_WEBHOOK }}

72
.github/workflows/release_placement.yaml vendored
View file

@ -68,40 +68,40 @@ jobs:
docker compose pull docker compose pull
docker compose up -d docker compose up -d
echo "${{ steps.gen_ver.outputs.image_ver }}"> success echo "${{ steps.gen_ver.outputs.image_ver }}"> success
- name: Notify Discord Success # - name: Notify Discord Success
if: success() # if: success()
run: | # run: |
curl -H "Content-Type: application/json" \ # curl -H "Content-Type: application/json" \
-X POST \ # -X POST \
-d '{ # -d '{
"embeds": [{ # "embeds": [{
"title": "✅ Deployment Success!", # "title": "✅ Deployment Success!",
"description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Deployed by: `${{github.actor}}`", # "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Deployed by: `${{github.actor}}`",
"color": 3066993, # "color": 3066993,
"footer": { # "footer": {
"text": "Release Notification", # "text": "Release Notification",
"icon_url": "https://example.com/success-icon.png" # "icon_url": "https://example.com/success-icon.png"
}, # },
"timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'" # "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
}] # }]
}' \ # }' \
${{ secrets.DISCORD_WEBHOOK }} # ${{ secrets.DISCORD_WEBHOOK }}
- name: Notify Discord Failure # - name: Notify Discord Failure
if: failure() # if: failure()
run: | # run: |
curl -H "Content-Type: application/json" \ # curl -H "Content-Type: application/json" \
-X POST \ # -X POST \
-d '{ # -d '{
"embeds": [{ # "embeds": [{
"title": "❌ Deployment Failed!", # "title": "❌ Deployment Failed!",
"description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Attempted by: `${{github.actor}}`", # "description": "**Details:**\n- Image: `${{env.IMAGE_NAME}}`\n- Version: `${{ steps.gen_ver.outputs.image_ver }}`\n- Attempted by: `${{github.actor}}`",
"color": 15158332, # "color": 15158332,
"footer": { # "footer": {
"text": "Release Notification", # "text": "Release Notification",
"icon_url": "https://example.com/failure-icon.png" # "icon_url": "https://example.com/failure-icon.png"
}, # },
"timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'" # "timestamp": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'"
}] # }]
}' \ # }' \
${{ secrets.DISCORD_WEBHOOK }} # ${{ secrets.DISCORD_WEBHOOK }}

10
BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
View file

@ -925,7 +925,7 @@ namespace BMA.EHR.Placement.Service.Controllers
orgChild4 = p.child4, orgChild4 = p.child4,
commandNo = r.commandNo, commandNo = r.commandNo,
commandYear = r.commandYear, commandYear = r.commandYear,
posNo = p.posMasterNo, posNo = p.posMasterNo?.ToString(),
posNoAbb = p.node == 4 ? $"{p.child4ShortName}" : posNoAbb = p.node == 4 ? $"{p.child4ShortName}" :
p.node == 3 ? $"{p.child3ShortName}" : p.node == 3 ? $"{p.child3ShortName}" :
p.node == 2 ? $"{p.child2ShortName}" : p.node == 2 ? $"{p.child2ShortName}" :
@ -1149,7 +1149,7 @@ namespace BMA.EHR.Placement.Service.Controllers
orgChild4 = p.child4, orgChild4 = p.child4,
commandNo = r.commandNo, commandNo = r.commandNo,
commandYear = r.commandYear, commandYear = r.commandYear,
posNo = p.posMasterNo, posNo = p.posMasterNo?.ToString(),
posNoAbb = p.node == 4 ? $"{p.child4ShortName}" : posNoAbb = p.node == 4 ? $"{p.child4ShortName}" :
p.node == 3 ? $"{p.child3ShortName}" : p.node == 3 ? $"{p.child3ShortName}" :
p.node == 2 ? $"{p.child2ShortName}" : p.node == 2 ? $"{p.child2ShortName}" :
@ -1363,7 +1363,7 @@ namespace BMA.EHR.Placement.Service.Controllers
orgChild4 = p.child4, orgChild4 = p.child4,
commandNo = r.commandNo, commandNo = r.commandNo,
commandYear = r.commandYear, commandYear = r.commandYear,
posNo = p.posMasterNo, posNo = p.posMasterNo?.ToString(),
posNoAbb = p.node == 4 ? $"{p.child4ShortName}" : posNoAbb = p.node == 4 ? $"{p.child4ShortName}" :
p.node == 3 ? $"{p.child3ShortName}" : p.node == 3 ? $"{p.child3ShortName}" :
p.node == 2 ? $"{p.child2ShortName}" : p.node == 2 ? $"{p.child2ShortName}" :
@ -1582,7 +1582,7 @@ namespace BMA.EHR.Placement.Service.Controllers
orgChild4 = p.child4, orgChild4 = p.child4,
commandNo = r.commandNo, commandNo = r.commandNo,
commandYear = r.commandYear, commandYear = r.commandYear,
posNo = p.posMasterNo, posNo = p.posMasterNo?.ToString(),
posNoAbb = p.node == 4 ? $"{p.child4ShortName}" : posNoAbb = p.node == 4 ? $"{p.child4ShortName}" :
p.node == 3 ? $"{p.child3ShortName}" : p.node == 3 ? $"{p.child3ShortName}" :
p.node == 2 ? $"{p.child2ShortName}" : p.node == 2 ? $"{p.child2ShortName}" :
@ -1818,7 +1818,7 @@ namespace BMA.EHR.Placement.Service.Controllers
orgChild4 = p.child4, orgChild4 = p.child4,
commandNo = r.commandNo, commandNo = r.commandNo,
commandYear = r.commandYear, commandYear = r.commandYear,
posNo = p.posMasterNo, posNo = p.posMasterNo?.ToString(),
posNoAbb = p.node == 4 ? $"{p.child4ShortName}" : posNoAbb = p.node == 4 ? $"{p.child4ShortName}" :
p.node == 3 ? $"{p.child3ShortName}" : p.node == 3 ? $"{p.child3ShortName}" :
p.node == 2 ? $"{p.child2ShortName}" : p.node == 2 ? $"{p.child2ShortName}" :

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

@ -1825,7 +1825,7 @@ namespace BMA.EHR.Placement.Service.Controllers
orgChild4 = p.child4, orgChild4 = p.child4,
commandNo = r.commandNo, commandNo = r.commandNo,
commandYear = r.commandYear, commandYear = r.commandYear,
posNo = p.posMasterNo, posNo = p.posMasterNo?.ToString(),
posNoAbb = p.node == 4 ? $"{p.child4ShortName}" : posNoAbb = p.node == 4 ? $"{p.child4ShortName}" :
p.node == 3 ? $"{p.child3ShortName}" : p.node == 3 ? $"{p.child3ShortName}" :
p.node == 2 ? $"{p.child2ShortName}" : p.node == 2 ? $"{p.child2ShortName}" :
@ -2152,7 +2152,7 @@ namespace BMA.EHR.Placement.Service.Controllers
orgChild4 = p.child4, orgChild4 = p.child4,
commandNo = r.commandNo, commandNo = r.commandNo,
commandYear = r.commandYear, commandYear = r.commandYear,
posNo = p.posMasterNo, posNo = p.posMasterNo?.ToString(),
posNoAbb = p.node == 4 ? $"{p.child4ShortName}" : posNoAbb = p.node == 4 ? $"{p.child4ShortName}" :
p.node == 3 ? $"{p.child3ShortName}" : p.node == 3 ? $"{p.child3ShortName}" :
p.node == 2 ? $"{p.child2ShortName}" : p.node == 2 ? $"{p.child2ShortName}" :
@ -2421,7 +2421,7 @@ namespace BMA.EHR.Placement.Service.Controllers
orgChild4 = p.child4, orgChild4 = p.child4,
commandNo = r.commandNo, commandNo = r.commandNo,
commandYear = r.commandYear, commandYear = r.commandYear,
posNo = p.posMasterNo, posNo = p.posMasterNo?.ToString(),
posNoAbb = p.node == 4 ? $"{p.child4ShortName}" : posNoAbb = p.node == 4 ? $"{p.child4ShortName}" :
p.node == 3 ? $"{p.child3ShortName}" : p.node == 3 ? $"{p.child3ShortName}" :
p.node == 2 ? $"{p.child2ShortName}" : p.node == 2 ? $"{p.child2ShortName}" :
@ -2661,7 +2661,7 @@ namespace BMA.EHR.Placement.Service.Controllers
orgChild4 = p.child4, orgChild4 = p.child4,
commandNo = r.commandNo, commandNo = r.commandNo,
commandYear = r.commandYear, commandYear = r.commandYear,
posNo = p.posMasterNo, posNo = p.posMasterNo?.ToString(),
posNoAbb = p.node == 4 ? $"{p.child4ShortName}" : posNoAbb = p.node == 4 ? $"{p.child4ShortName}" :
p.node == 3 ? $"{p.child3ShortName}" : p.node == 3 ? $"{p.child3ShortName}" :
p.node == 2 ? $"{p.child2ShortName}" : p.node == 2 ? $"{p.child2ShortName}" :
@ -2886,7 +2886,7 @@ namespace BMA.EHR.Placement.Service.Controllers
orgChild4 = p.child4, orgChild4 = p.child4,
commandNo = r.commandNo, commandNo = r.commandNo,
commandYear = r.commandYear, commandYear = r.commandYear,
posNo = p.posMasterNo, posNo = p.posMasterNo?.ToString(),
posNoAbb = p.node == 4 ? $"{p.child4ShortName}" : posNoAbb = p.node == 4 ? $"{p.child4ShortName}" :
p.node == 3 ? $"{p.child3ShortName}" : p.node == 3 ? $"{p.child3ShortName}" :
p.node == 2 ? $"{p.child2ShortName}" : p.node == 2 ? $"{p.child2ShortName}" :

2
BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
View file

@ -696,7 +696,7 @@ namespace BMA.EHR.Placement.Service.Controllers
dateEnd = p.DateEnd, dateEnd = p.DateEnd,
commandNo = r.commandNo, commandNo = r.commandNo,
commandYear = r.commandYear, commandYear = r.commandYear,
posNo = p.posMasterNoOld, posNo = p.posMasterNoOld?.ToString(),
posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" : posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" :
p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" : p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" :
p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" : p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" :

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

@ -1092,7 +1092,7 @@ namespace BMA.EHR.Placement.Service.Controllers
orgChild4 = p.child4, orgChild4 = p.child4,
commandNo = r.commandNo, commandNo = r.commandNo,
commandYear = r.commandYear, commandYear = r.commandYear,
posNo = p.posMasterNo, posNo = p.posMasterNo?.ToString(),
posNoAbb = p.node == 4 ? $"{p.child4ShortName}" : posNoAbb = p.node == 4 ? $"{p.child4ShortName}" :
p.node == 3 ? $"{p.child3ShortName}" : p.node == 3 ? $"{p.child3ShortName}" :
p.node == 2 ? $"{p.child2ShortName}" : p.node == 2 ? $"{p.child2ShortName}" :

2
BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs
View file

@ -523,7 +523,7 @@ namespace BMA.EHR.Placement.Service.Controllers
dateEnd = p.DateRepatriation, dateEnd = p.DateRepatriation,
commandNo = r.commandNo, commandNo = r.commandNo,
commandYear = r.commandYear, commandYear = r.commandYear,
posNo = p.posMasterNoOld, posNo = p.posMasterNoOld?.ToString(),
posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" : posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" :
p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" : p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" :
p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" : p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" :

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

@ -895,7 +895,7 @@ namespace BMA.EHR.Placement.Service.Controllers
officerOrg = p.Organization, officerOrg = p.Organization,
commandNo = r.commandNo, commandNo = r.commandNo,
commandYear = r.commandYear, commandYear = r.commandYear,
posNo = p.posMasterNoOld, posNo = p.posMasterNoOld?.ToString(),
posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" : posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" :
p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" : p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" :
p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" : p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" :

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

@ -720,7 +720,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
orgChild4 = p.child4Old, orgChild4 = p.child4Old,
commandNo = r.commandNo, commandNo = r.commandNo,
commandYear = r.commandYear, commandYear = r.commandYear,
posNo = p.posMasterNoOld, posNo = p.posMasterNoOld?.ToString(),
posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" : posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" :
p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" : p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" :
p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" : p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" :
@ -940,7 +940,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
orgChild4 = p.child4Old, orgChild4 = p.child4Old,
commandNo = r.commandNo, commandNo = r.commandNo,
commandYear = r.commandYear, commandYear = r.commandYear,
posNo = p.posMasterNoOld, posNo = p.posMasterNoOld?.ToString(),
posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" : posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" :
p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" : p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" :
p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" : p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" :

2
BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
View file

@ -573,7 +573,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
orgChild4 = p.child4Old, orgChild4 = p.child4Old,
commandNo = r.commandNo, commandNo = r.commandNo,
commandYear = r.commandYear, commandYear = r.commandYear,
posNo = p.posMasterNoOld, posNo = p.posMasterNoOld?.ToString(),
posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" : posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" :
p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" : p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" :
p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" : p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" :

4
BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
View file

@ -2251,7 +2251,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
orgChild4 = p.child4Old, orgChild4 = p.child4Old,
commandNo = r.commandNo, commandNo = r.commandNo,
commandYear = r.commandYear, commandYear = r.commandYear,
posNo = p.posMasterNoOld, posNo = p.posMasterNoOld?.ToString(),
posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" : posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" :
p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" : p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" :
p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" : p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" :
@ -2450,7 +2450,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
orgChild4 = p.child4Old, orgChild4 = p.child4Old,
commandNo = r.commandNo, commandNo = r.commandNo,
commandYear = r.commandYear, commandYear = r.commandYear,
posNo = p.posMasterNoOld, posNo = p.posMasterNoOld?.ToString(),
posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" : posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" :
p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" : p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" :
p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" : p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" :

4
BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
View file

@ -1694,7 +1694,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
orgChild4 = p.child4Old, orgChild4 = p.child4Old,
commandNo = r.commandNo, commandNo = r.commandNo,
commandYear = r.commandYear, commandYear = r.commandYear,
posNo = p.posMasterNoOld, posNo = p.posMasterNoOld?.ToString(),
posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" : posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" :
p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" : p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" :
p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" : p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" :
@ -1893,7 +1893,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
orgChild4 = p.child4Old, orgChild4 = p.child4Old,
commandNo = r.commandNo, commandNo = r.commandNo,
commandYear = r.commandYear, commandYear = r.commandYear,
posNo = p.posMasterNoOld, posNo = p.posMasterNoOld?.ToString(),
posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" : posNoAbb = p.child4ShortNameOld != null ? $"{p.child4ShortNameOld}" :
p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" : p.child3ShortNameOld != null ? $"{p.child3ShortNameOld}" :
p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" : p.child2ShortNameOld != null ? $"{p.child2ShortNameOld}" :