From 2a650659bdfce6520cdb630eb7a7bf98eb35c9b1 Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Tue, 9 Apr 2024 11:54:57 +0700
Subject: [PATCH] fix report

---
 src/controllers/ReportController.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index fc3d268..d9adde3 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -2408,7 +2408,6 @@ export class ReportController extends Controller {
       relations: ["salaryOrg", "salaryOrg.salaryPeriod"],
       where: {
         type: In(["HAFT", "FULL", "FULLHAFT"]),
-        isNext: false,
         salaryOrg: {
           snapshot: "SNAP2",
           rootId: rootId,
@@ -2529,10 +2528,14 @@ export class ReportController extends Controller {
         positionSalaryAmount: profile.positionSalaryAmount
           ? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
           : null,
-        amountSpecial:
+        amountSpecialFormated:
           profile.amountSpecial > 0
             ? "(" + Extension.ToThaiNumber(profile.amountSpecial.toString()) + ")"
             : "",
+        amountSpecial:
+          profile.amountSpecial > 0
+            ? Extension.ToThaiNumber(profile.amountSpecial.toString())
+            : "",
         score: null, //สรุปผลการประเมินฯ ระดับและคะแนน
         reason: null,
       };
@@ -4923,7 +4926,7 @@ export class ReportController extends Controller {
         no: Extension.ToThaiNumber((index + 1).toLocaleString()),
         fullName: fullName,
         position: profile.position,
-        posLevel: profile.posLevel,
+        posLevel: profile.posLevel ? Extension.ToThaiNumber(profile.posLevel.toLocaleString()):null,
       };
     });