From 376da1aa7573a81a623395955f7b8acce5ec95dc Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Thu, 21 Mar 2024 14:17:21 +0700
Subject: [PATCH] gov1-03

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

diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index a1744e9..9acc361 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -1016,12 +1016,23 @@ export class ReportController extends Controller {
         type: "FULL",
       },
     });
-
+    const year = Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year)));
+    const yearIncrease1 = Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year-2)));
+    const yearIncrease2 = Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year-1)));
+    const fifteenPercent = salaryOrg?.fifteenPercent == undefined || salaryOrg?.fifteenPercent == null ? 
+      "๐" : Extension.ToThaiNumber(String(salaryOrg?.fifteenPercent));
+    const fifteenPoint = salaryOrg?.fifteenPoint == undefined || salaryOrg?.fifteenPoint == null ? 
+      ".๐๐" : "." + Extension.ToThaiNumber(String(salaryOrg?.fifteenPoint));
     return new HttpSuccess({
       template: "gov1-03",
       reportName: "gov1-03",
       data: {
-        year: Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year))),
+        year: year,
+        yearIncrease1: yearIncrease1,
+        yearIncrease2: yearIncrease2,
+        yearIncreaseSlice: yearIncrease2.slice(-2),
+        yearSlice: year.slice(-2), 
+        point: fifteenPercent + fifteenPoint,
         root: salaryProfile[0]?.root,
         profile: salaryProfile.map((item, index) => ({
           no: Extension.ToThaiNumber(String(index + 1)),
@@ -1037,7 +1048,7 @@ export class ReportController extends Controller {
             " " +
             item.lastName, // สังกัด/ชื่อ-นามสกุล
           posLevel: item.posLevel,
-          posMasterNo: Extension.ToThaiNumber(String(item.posMasterNo)),
+          posMasterNo: item.orgShortName + Extension.ToThaiNumber(String(item.posMasterNo)),
           amount:
             item.amount == undefined || item.amount == null
               ? "๐"