From d9c3c3860f9e11c16f82ae756dc34a474a0aa6bc Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Fri, 24 Jan 2025 17:24:48 +0700
Subject: [PATCH] fix

---
 src/controllers/FileController.ts   | 10 ++++++++--
 src/controllers/ReportController.ts |  6 +++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/controllers/FileController.ts b/src/controllers/FileController.ts
index 606ea4f..a5610c0 100644
--- a/src/controllers/FileController.ts
+++ b/src/controllers/FileController.ts
@@ -385,10 +385,16 @@ export class SubFileController extends Controller {
     @Path() group: string,
     @Path() id: string,
     @Path() subId: string,
-  ) {
+  ) { 
     if (name !== "ระบบประเมิน") {
-      return await s3ListFile(name, group, id);
+      return await s3ListFile(name, group, id, subId).catch((e) => {
+        console.error(e);
+        throw new Error("เกิดข้อผิดพลาดกับระบบจัดการไฟล์");
+      });
     }
+    // if (name !== "ระบบประเมิน") {
+    //   return await s3ListFile(name, group, id);
+    // }
     const list = await listFile([name, group, id, subId]);
     if (!list) throw new Error("เกิดข้อผิดพลาดกับระบบจัดการไฟล์");
     return list;
diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index 7c0606f..a7337cf 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -4522,7 +4522,11 @@ export class ReportController extends Controller {
           ? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
           : "-",
         score: profile.result?Extension.ToThaiNumber(profile.result):"-",
-        reason: profile.remark,
+        // reason: profile.remark,
+        reason:`${profile.type === "FULL" ? "หนึ่งขั้น" : ""}\n` +
+        `${profile.type === "FULLHAFT" ? "หนึ่งขั้นครึ่ง" : ""}\n` +
+        `${profile.amountSpecial > 0 ? "ได้รับค่าตอบแทนพิเศษ\n" : ""}` +
+        `${profile.isNext === true ? "(ได้รับเงินเดือนสูงกว่าขั้นสูงฯ)" : ""}`, // หมายเหตุ
       };
     });