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

no message

Browse source
This commit is contained in:
Kittapath 2024-07-09 12:53:00 +07:00
parent dda2b64bc2
commit 61a0b889f0
1 changed files with 6 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/controllers/ReportController.ts
View file

@ -1470,17 +1470,13 @@ export class ReportController extends Controller {
profile: salaryProfileGroup1
? salaryProfileGroup1.map((item: any, index: any) => ({
no: Extension.ToThaiNumber(String(index + 1)),
fullname:
affiliation:
(item.child4 == undefined && item.child4 == null ? "" : item.child4 + "/") +
(item.child3 == undefined && item.child3 == null ? "" : item.child3 + "/") +
(item.child2 == undefined && item.child2 == null ? "" : item.child2 + "/") +
(item.child1 == undefined && item.child1 == null ? "" : item.child1 + "/") +
(item.root == undefined && item.root == null ? "" : item.root) +
"/" +
item.prefix +
item.firstName +
" " +
item.lastName, // สังกัด/ชื่อ-นามสกุล
(item.root == undefined && item.root == null ? "" : item.root),
fullName: item.prefix + item.firstName + " " + item.lastName,
posLevel: item.posLevel,
posMasterNo:
Extension.ToThaiNumber(item.orgShortName) +
@ -1550,17 +1546,13 @@ export class ReportController extends Controller {
profileGroup2: salaryProfileGroup2
? salaryProfileGroup2.map((item, index) => ({
no: Extension.ToThaiNumber(String(index + 1)),
fullname:
affiliation:
(item.child4 == undefined && item.child4 == null ? "" : item.child4 + "/") +
(item.child3 == undefined && item.child3 == null ? "" : item.child3 + "/") +
(item.child2 == undefined && item.child2 == null ? "" : item.child2 + "/") +
(item.child1 == undefined && item.child1 == null ? "" : item.child1 + "/") +
(item.root == undefined && item.root == null ? "" : item.root) +
"/" +
item.prefix +
item.firstName +
" " +
item.lastName, // สังกัด/ชื่อ-นามสกุล
(item.root == undefined && item.root == null ? "" : item.root),
fullName: item.prefix + item.firstName + " " + item.lastName,
posLevel: item.posLevel,
posMasterNo:
Extension.ToThaiNumber(item.orgShortName) +