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

Merge branch 'develop' into adiDev

Browse source
This commit is contained in:
Adisak 2025-10-17 17:39:29 +07:00
commit 76d09eaa03
1 changed files with 58 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

72
src/controllers/CommandController.ts
View file

@ -1954,27 +1954,71 @@ 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");
let profileTemp = {
org: "-",
position: "-",
posLevel: "-",
posNo: "-",
};
if (commandCode == "C-PM-21") {
profileTemp.position = profile?.positionTemp ?? "-";
profileTemp.posLevel = profile?.posLevelNameTemp ?? "-";
profileTemp.org = (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)
if (profile?.nodeTemp) {
switch (profile?.nodeTemp) {
case "4":
profileTemp.posNo = `${profile.child4ShortNameTemp} ${profile?.posMasterNoTemp}`;
break
case "3":
profileTemp.posNo = `${profile.child3ShortNameTemp} ${profile?.posMasterNoTemp}`;
break
case "2":
profileTemp.posNo = `${profile.child2ShortNameTemp} ${profile?.posMasterNoTemp}`;
break
case "1":
profileTemp.posNo = `${profile.child1ShortNameTemp} ${profile?.posMasterNoTemp}`;
break
case "0":
profileTemp.posNo = `${profile.rootShortNameTemp} ${profile?.posMasterNoTemp}`;
break
default: break;
}
}
}
return { return {
no: Extension.ToThaiNumber((idx + 1).toString()), no: Extension.ToThaiNumber((idx + 1).toString()),
org: profile?.isLeave == false org: 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
: profileTemp.org,
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: commandCode != "C-PM-21"
posLevel: ? profile?.position
profile?.posType && profile?.posLevel ? profile?.position
: "-"
: profileTemp.position,
posLevel: commandCode != "C-PM-21"
? profile?.posType && profile?.posLevel
? Extension.ToThaiNumber( ? Extension.ToThaiNumber(
`${profile?.posType.posTypeShortName} ${profile?.posLevel.posLevelName}`, `${profile?.posType.posTypeShortName} ${profile?.posLevel.posLevelName}`,
) )
: "-", : "-"
posNo: shortName : Extension.ToThaiNumber(profileTemp.posLevel),
? Extension.ToThaiNumber(shortName) posNo: commandCode != "C-PM-21"
: "-", ? shortName
? Extension.ToThaiNumber(shortName)
: "-"
: Extension.ToThaiNumber(profileTemp.posNo),
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))