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

Merge branch 'develop' into develop-Bright

Browse source
This commit is contained in:
Bright 2024-04-05 17:19:59 +07:00
commit 45b3777d33
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/controllers/ReportController.ts
View file

@ -2281,7 +2281,7 @@ export class ReportController extends Controller {
no: Extension.ToThaiNumber((index + 1).toLocaleString()), no: Extension.ToThaiNumber((index + 1).toLocaleString()),
fullName: fullName, fullName: fullName,
position: profile.position, position: profile.position,
posLevel: `${profile.posTypeShort} ${profile.posLevel}`, posLevel: profile.posLevel ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`: null,
posNumber: posNumber:
Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()), Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null, amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
@ -2362,7 +2362,7 @@ export class ReportController extends Controller {
no: Extension.ToThaiNumber((index + 1).toLocaleString()), no: Extension.ToThaiNumber((index + 1).toLocaleString()),
fullName: fullName, fullName: fullName,
position: profile.position, position: profile.position,
posLevel: `${profile.posTypeShort} ${profile.posLevel}`, posLevel: profile.posLevel ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`: null,
posNumber: posNumber:
Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()), Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null, amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
@ -2444,7 +2444,7 @@ export class ReportController extends Controller {
no: Extension.ToThaiNumber((index + 1).toLocaleString()), no: Extension.ToThaiNumber((index + 1).toLocaleString()),
fullName: fullName, fullName: fullName,
position: profile.position, position: profile.position,
posLevel: `${profile.posTypeShort} ${profile.posLevel}`, posLevel: profile.posLevel ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`: null,
posNumber: posNumber:
Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()), Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null, amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
@ -2522,7 +2522,7 @@ export class ReportController extends Controller {
no: Extension.ToThaiNumber((index + 1).toLocaleString()), no: Extension.ToThaiNumber((index + 1).toLocaleString()),
fullName: fullName, fullName: fullName,
position: profile.position, position: profile.position,
posLevel: `${profile.posTypeShort} ${profile.posLevel}`, posLevel: profile.posLevel ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`: null,
posNumber: posNumber:
Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()), Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null, amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,