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

fix #1836 ปรับให้แสดงตามตำแหน่งที่บรรจุ

Browse source
This commit is contained in:
harid 2025-10-09 14:49:55 +07:00
parent 6328de1a5c
commit c500ff4b7a
1 changed files with 10 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/controllers/CommandController.ts
View file

@ -1954,20 +1954,13 @@ export class CommandController extends Controller {
const orgLeave = _OrgLeave.filter((x: any) => x !== undefined && x !== null).join("\n"); const orgLeave = _OrgLeave.filter((x: any) => x !== undefined && x !== null).join("\n");
return { return {
no: Extension.ToThaiNumber((idx + 1).toString()), no: Extension.ToThaiNumber((idx + 1).toString()),
org: org: profile?.isLeave == false
commandCode != "C-PM-21" ? (_child4 == null ? "" : _child4 + "\n") +
? profile?.isLeave == false (_child3 == null ? "" : _child3 + "\n") +
? (_child4 == null ? "" : _child4 + "\n") + (_child2 == null ? "" : _child2 + "\n") +
(_child3 == null ? "" : _child3 + "\n") + (_child1 == null ? "" : _child1 + "\n") +
(_child2 == null ? "" : _child2 + "\n") + (_root == null ? "" : _root)
(_child1 == null ? "" : _child1 + "\n") + : orgLeave,
(_root == null ? "" : _root)
: orgLeave
: (profile?.child4Temp == null ? "" : profile?.child4Temp + "\n") +
(profile?.child3Temp == null ? "" : profile?.child3Temp + "\n") +
(profile?.child2Temp == null ? "" : profile?.child2Temp + "\n") +
(profile?.child1Temp == null ? "" : profile?.child1Temp + "\n") +
(profile?.rootTemp == null ? "" : profile?.rootTemp),
fullName: `${x.prefix}${x.firstName} ${x.lastName}`, fullName: `${x.prefix}${x.firstName} ${x.lastName}`,
citizenId: Extension.ToThaiNumber(x.citizenId), citizenId: Extension.ToThaiNumber(x.citizenId),
position: profile?.position ? profile?.position : "-", position: profile?.position ? profile?.position : "-",
@ -1977,14 +1970,9 @@ export class CommandController extends Controller {
`${profile?.posType.posTypeShortName} ${profile?.posLevel.posLevelName}`, `${profile?.posType.posTypeShortName} ${profile?.posLevel.posLevelName}`,
) )
: "-", : "-",
posNo: posNo: shortName
commandCode != "C-PM-21" ? Extension.ToThaiNumber(shortName)
? shortName : "-",
? Extension.ToThaiNumber(shortName)
: "-"
: Extension.ToThaiNumber(
`${profile?.rootShortNameTemp} ${profile?.posMasterNoTemp}`,
),
amount: x.amount ? Extension.ToThaiNumber(x.amount.toLocaleString()) : "-", amount: x.amount ? Extension.ToThaiNumber(x.amount.toLocaleString()) : "-",
dateRetire: profile?.dateRetire dateRetire: profile?.dateRetire
? Extension.ToThaiNumber(Extension.ToThaiShortDate_monthYear(profile?.dateRetire)) ? Extension.ToThaiNumber(Extension.ToThaiShortDate_monthYear(profile?.dateRetire))