From 4077900079fc8b13566c0e36502b0faabf4053a3 Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Tue, 17 Dec 2024 10:41:22 +0700
Subject: [PATCH] thai number 984(1)

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

diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index af0a5e2a..18b67a65 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -46,7 +46,7 @@ export class ReportController extends Controller {
   @Get("registry-officer")
   async registryOfficer(
     @Query() rootId: string,
-    @Query() year?: number,
+    @Query() year: number,
     @Query() ageMin?: number,
     @Query() ageMax?: number,
   ) {
@@ -135,13 +135,15 @@ export class ReportController extends Controller {
     
     const result = Object.values(groupedData).map((item: any) => ({
         ...item , 
-        count: item.count 
+        count: Extension.ToThaiNumber(item.count.toString()),
     }));
     
     return new HttpSuccess({
       template: "registry-officer",
       reportName: "xlsx-report",
       data: {
+        year: Extension.ToThaiNumber(year.toString()),
+        date: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())),
         list: result 
       },
     });
@@ -155,7 +157,7 @@ export class ReportController extends Controller {
   @Get("registry-emp")
   async registryEmp(
     @Query() rootId: string,
-    @Query() year?: number,
+    @Query() year: number,
     @Query() ageMin?: number,
     @Query() ageMax?: number,
   ) {
@@ -227,7 +229,7 @@ export class ReportController extends Controller {
           status: item.status && item.status != ""?item.status:"-",
           posType: item.posType && item.posType != ""?item.posType:"-",
           positionName: item.positionName && item.positionName != ""?item.positionName:"-",
-          posLevel: item.posLevel,
+          posLevel: Extension.ToThaiNumber(item.posLevel.toString()),
           period: "-",
           count: 0,
         };
@@ -239,13 +241,15 @@ export class ReportController extends Controller {
 
     const result = Object.values(groupedData).map((item: any) => ({
       ...item , 
-      count: item.count 
+      count: Extension.ToThaiNumber(item.count.toString())
     }));
     
     return new HttpSuccess({
       template: "registry-emp",
       reportName: "xlsx-report",
       data: {
+        year: Extension.ToThaiNumber(year.toString()),
+        date: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())),
         list: result 
       },
     });