From 33fc5bb82868c83148f411937f5287e4c876be9c Mon Sep 17 00:00:00 2001 From: Bright Date: Fri, 4 Jul 2025 17:08:29 +0700 Subject: [PATCH] =?UTF-8?q?Fix=20=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=87?= =?UTF-8?q?=E0=B8=B2=E0=B8=99=20=E0=B8=81.=E0=B8=9E.7/=E0=B8=81.=E0=B8=81.?= =?UTF-8?q?1=20Issue=20#1436?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/ProfileController.ts | 4 ++++ src/controllers/ProfileEmployeeController.ts | 4 ++++ src/controllers/ProfileEmployeeTempController.ts | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index 9cc51e44..a51651ba 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -1153,6 +1153,7 @@ export class ProfileController extends Controller { "commandNo", "positionCee", "amount", + "amountSpecial", "remark", ], where: { @@ -1176,6 +1177,8 @@ export class ProfileController 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 @@ -1202,6 +1205,7 @@ export class ProfileController extends Controller { position: "-", posNo: "-", salary: "-", + special: "-", rank: "-", refAll: "-", positionLevel: "-", diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts index e76b6d37..9c9ad18d 100644 --- a/src/controllers/ProfileEmployeeController.ts +++ b/src/controllers/ProfileEmployeeController.ts @@ -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: "-", diff --git a/src/controllers/ProfileEmployeeTempController.ts b/src/controllers/ProfileEmployeeTempController.ts index a2e735b2..aa990fd9 100644 --- a/src/controllers/ProfileEmployeeTempController.ts +++ b/src/controllers/ProfileEmployeeTempController.ts @@ -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: "-",