From 0266dab4ac2210c4e6ff1f6bef19a3d43323a3d1 Mon Sep 17 00:00:00 2001
From: mamoss <>
Date: Tue, 13 May 2025 13:07:52 +0700
Subject: [PATCH] kk1 date

---
 src/controllers/ProfileController.ts         | 28 +++++++++++++-------
 src/controllers/ProfileEmployeeController.ts | 28 +++++++++++++-------
 2 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts
index 76b1bec9..7ad8c139 100644
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@@ -1150,6 +1150,7 @@ export class ProfileController extends Controller {
         "positionLevel",
         "positionSalaryAmount",
         "commandNo",
+        "positionCee",
         "amount",
         "remark",
       ],
@@ -1176,12 +1177,11 @@ export class ProfileController extends Controller {
               item.amount != null ? Extension.ToThaiNumber(item.amount.toLocaleString()) : null,
             rank: item.positionLevel != null ? Extension.ToThaiNumber(item.positionLevel) : null,
             refAll: item.remark ? Extension.ToThaiNumber(item.remark) : null,
-            positionLevel:
-              item.positionLevel != null
-                ? Extension.ToThaiNumber(item.positionLevel)
-                : item.positionCee != null
-                  ? Extension.ToThaiNumber(item.positionCee)
-                  : null,
+            positionLevel: item.positionLevel
+              ? Extension.ToThaiNumber(item.positionLevel)
+              : item.positionCee
+                ? Extension.ToThaiNumber(item.positionCee)
+                : null,
             positionType: item.positionType ?? null,
             positionAmount:
               item.positionSalaryAmount == null
@@ -1364,7 +1364,7 @@ export class ProfileController extends Controller {
             childrenFirstName: item.childrenFirstName,
             childrenLastName: item.childrenLastName,
             childrenFullName: `${item.childrenPrefix}${item.childrenFirstName} ${item.childrenLastName}`,
-            childrenLive: item.childrenLive == true ? "ถึงแก่กรรม" : "มีชีวิต",
+            childrenLive: item.childrenLive == false ? "ถึงแก่กรรม" : "มีชีวิต",
           }))
         : [
             {
@@ -1424,7 +1424,11 @@ export class ProfileController extends Controller {
                 : "",
             position: item.positionName,
             posType: item.positionType,
-            posLevel: item.positionLevel ? Extension.ToThaiNumber(item.positionLevel) : "",
+            posLevel: item.positionLevel
+              ? Extension.ToThaiNumber(item.positionLevel)
+              : item.positionCee
+                ? Extension.ToThaiNumber(item.positionCee)
+                : null,
             amount: item.amount ? Extension.ToThaiNumber(Number(item.amount).toLocaleString()) : "",
             positionSalaryAmount: item.positionSalaryAmount
               ? Extension.ToThaiNumber(Number(item.positionSalaryAmount).toLocaleString())
@@ -1530,7 +1534,7 @@ export class ProfileController extends Controller {
     const assessments =
       assessments_raw.length > 0
         ? assessments_raw.map((item) => ({
-            year: item.year ? Extension.ToThaiNumber(item.year + 543) : "",
+            year: item.year ? Extension.ToThaiNumber((parseInt(item.year) + 543).toString()) : "",
             period: item.period && item.period == "APR" ? "เมษายน" : "ตุลาคม",
             point1: item.point1 ? Extension.ToThaiNumber(item.point1.toString()) : "",
             point1Total: item.point1Total
@@ -1589,7 +1593,11 @@ export class ProfileController extends Controller {
               : "",
             commandNo: item.commandNo ? Extension.ToThaiNumber(item.commandNo) : "",
             position: item.positionName,
-            posLevel: item.positionLevel ? Extension.ToThaiNumber(item.positionLevel) : "",
+            posLevel: item.positionLevel
+              ? Extension.ToThaiNumber(item.positionLevel)
+              : item.positionCee
+                ? Extension.ToThaiNumber(item.positionCee)
+                : null,
             amount: item.amount ? Extension.ToThaiNumber(Number(item.amount).toLocaleString()) : "",
           }))
         : [
diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts
index 7dd398ba..af3dd153 100644
--- a/src/controllers/ProfileEmployeeController.ts
+++ b/src/controllers/ProfileEmployeeController.ts
@@ -1148,6 +1148,7 @@ export class ProfileEmployeeController extends Controller {
         "positionLevel",
         "positionSalaryAmount",
         "commandNo",
+        "positionCee",
         "amount",
         "remark",
       ],
@@ -1174,12 +1175,11 @@ export class ProfileEmployeeController extends Controller {
               item.amount != null ? Extension.ToThaiNumber(item.amount.toLocaleString()) : null,
             rank: item.positionLevel != null ? Extension.ToThaiNumber(item.positionLevel) : null,
             refAll: item.remark ? Extension.ToThaiNumber(item.remark) : null,
-            positionLevel:
-              item.positionLevel != null
-                ? Extension.ToThaiNumber(item.positionLevel)
-                : item.positionCee != null
-                  ? Extension.ToThaiNumber(item.positionCee)
-                  : null,
+            positionLevel: item.positionLevel
+              ? Extension.ToThaiNumber(item.positionLevel)
+              : item.positionCee
+                ? Extension.ToThaiNumber(item.positionCee)
+                : null,
             positionType: item.positionType ?? null,
             positionAmount:
               item.positionSalaryAmount == null
@@ -1362,7 +1362,7 @@ export class ProfileEmployeeController extends Controller {
             childrenFirstName: item.childrenFirstName,
             childrenLastName: item.childrenLastName,
             childrenFullName: `${item.childrenPrefix}${item.childrenFirstName} ${item.childrenLastName}`,
-            childrenLive: item.childrenLive == true ? "ถึงแก่กรรม" : "มีชีวิต",
+            childrenLive: item.childrenLive == false ? "ถึงแก่กรรม" : "มีชีวิต",
           }))
         : [
             {
@@ -1422,7 +1422,11 @@ export class ProfileEmployeeController extends Controller {
                 : "",
             position: item.positionName,
             posType: item.positionType,
-            posLevel: item.positionLevel ? Extension.ToThaiNumber(item.positionLevel) : "",
+            posLevel: item.positionLevel
+              ? Extension.ToThaiNumber(item.positionLevel)
+              : item.positionCee
+                ? Extension.ToThaiNumber(item.positionCee)
+                : null,
             amount: item.amount ? Extension.ToThaiNumber(Number(item.amount).toLocaleString()) : "",
             positionSalaryAmount: item.positionSalaryAmount
               ? Extension.ToThaiNumber(Number(item.positionSalaryAmount).toLocaleString())
@@ -1528,7 +1532,7 @@ export class ProfileEmployeeController extends Controller {
     const assessments =
       assessments_raw.length > 0
         ? assessments_raw.map((item) => ({
-            year: item.year ? Extension.ToThaiNumber(item.year + 543) : "",
+            year: item.year ? Extension.ToThaiNumber((parseInt(item.year) + 543).toString()) : "",
             period: item.period && item.period == "APR" ? "เมษายน" : "ตุลาคม",
             point1: item.point1 ? Extension.ToThaiNumber(item.point1.toString()) : "",
             point1Total: item.point1Total
@@ -1587,7 +1591,11 @@ export class ProfileEmployeeController extends Controller {
               : "",
             commandNo: item.commandNo ? Extension.ToThaiNumber(item.commandNo) : "",
             position: item.positionName,
-            posLevel: item.positionLevel ? Extension.ToThaiNumber(item.positionLevel) : "",
+            posLevel: item.positionLevel
+              ? Extension.ToThaiNumber(item.positionLevel)
+              : item.positionCee
+                ? Extension.ToThaiNumber(item.positionCee)
+                : null,
             amount: item.amount ? Extension.ToThaiNumber(Number(item.amount).toLocaleString()) : "",
           }))
         : [