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

#1718

Browse source
This commit is contained in:
AdisakKanthawilang 2025-08-14 15:36:16 +07:00
parent 16e331c6aa
commit a8d01c42d8
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/controllers/ReportController.ts
View file

@ -4102,8 +4102,10 @@ export class ReportController extends Controller {
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString())
: "-",
amount: profile.positionSalaryAmount
? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
amount: profile.positionSalaryAmount && profile.positionSalaryAmount != 0
? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
: profile.amount && profile.amount != 0
? Extension.ToThaiNumber(profile.amount.toLocaleString())
: "-",
precentTwo:
profile.positionSalaryAmountPer == 0.02
@ -5611,7 +5613,9 @@ export class ReportController extends Controller {
fullName: fullName,
affiliation: affiliation,
position: profile.position,
posLevel: profile.posLevel ? Extension.ToThaiNumber(profile.posLevel.toString()) : null,
posLevel: profile.posLevel
? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`
: null,
posNumber:
Extension.ToThaiNumber(profile.orgShortName) +
" " +
@ -6531,8 +6535,8 @@ export class ReportController extends Controller {
affiliation: affiliation,
position: position,
posLevel: profile.posLevel
? Extension.ToThaiNumber(profile.posLevel.toLocaleString())
: "-",
? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`
: "-",
posNumber:
Extension.ToThaiNumber(profile.orgShortName) +
" " +