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

Fix รายงาน ก.พ.7/ก.ก.1 Issue #1436

Browse source
This commit is contained in:
Bright 2025-07-04 17:08:29 +07:00
parent 2b53e433ba
commit 33fc5bb828
3 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/ProfileController.ts
View file

@ -1153,6 +1153,7 @@ export class ProfileController extends Controller {
"commandNo", "commandNo",
"positionCee", "positionCee",
"amount", "amount",
"amountSpecial",
"remark", "remark",
], ],
where: { where: {
@ -1176,6 +1177,8 @@ export class ProfileController extends Controller {
: null, : null,
salary: salary:
item.amount != null ? Extension.ToThaiNumber(item.amount.toLocaleString()) : null, 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, rank: item.positionLevel != null ? Extension.ToThaiNumber(item.positionLevel) : null,
refAll: item.remark ? Extension.ToThaiNumber(item.remark) : null, refAll: item.remark ? Extension.ToThaiNumber(item.remark) : null,
positionLevel: item.positionLevel positionLevel: item.positionLevel
@ -1202,6 +1205,7 @@ export class ProfileController extends Controller {
position: "-", position: "-",
posNo: "-", posNo: "-",
salary: "-", salary: "-",
special: "-",
rank: "-", rank: "-",
refAll: "-", refAll: "-",
positionLevel: "-", positionLevel: "-",

4
src/controllers/ProfileEmployeeController.ts
View file

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

4
src/controllers/ProfileEmployeeTempController.ts
View file

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