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/ProfileEmployeeTempController.ts
View file

@ -670,6 +670,7 @@ export class ProfileEmployeeTempController extends Controller {
"positionSalaryAmount",
"commandNo",
"amount",
"amountSpecial",
"remark",
],
where: { profileEmployeeId: id },
@ -686,6 +687,8 @@ export class ProfileEmployeeTempController extends Controller {
PosNo: item.posNo != null ? Extension.ToThaiNumber(item.posNo) : 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:
@ -709,6 +712,7 @@ export class ProfileEmployeeTempController extends Controller {
Position: "-",
PosNo: "-",
Salary: "-",
Special: "-",
Rank: "-",
RefAll: "-",
PositionLevel: "-",