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:
AdisakKanthawilang 2025-07-11 16:47:52 +07:00
commit 027cbe2814
10 changed files with 520 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/ProfileEmployeeController.ts
View file

@ -1150,6 +1150,7 @@ export class ProfileEmployeeController extends Controller {
"commandNo",
"positionCee",
"amount",
"amountSpecial",
"remark",
],
where: {
@ -1173,6 +1174,8 @@ export class ProfileEmployeeController extends Controller {
: null,
salary:
item.amount != null ? Extension.ToThaiNumber(item.amount.toLocaleString()) : null,
special:
item.amountSpecial != null ? Extension.ToThaiNumber(item.amountSpecial.toLocaleString()) : null,
rank: item.positionLevel != null ? Extension.ToThaiNumber(item.positionLevel) : null,
refAll: item.remark ? Extension.ToThaiNumber(item.remark) : null,
positionLevel: item.positionLevel
@ -1199,6 +1202,7 @@ export class ProfileEmployeeController extends Controller {
position: "-",
posNo: "-",
salary: "-",
special: "-",
rank: "-",
refAll: "-",
positionLevel: "-",