From 95fc3e13caf77638d3304d5ec67e5a74618718d3 Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Tue, 20 Feb 2024 17:09:52 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/SalaryController.ts |  5 +++++
 src/entities/Salarys.ts             | 10 +++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/controllers/SalaryController.ts b/src/controllers/SalaryController.ts
index f8522d1..c5a7dd1 100644
--- a/src/controllers/SalaryController.ts
+++ b/src/controllers/SalaryController.ts
@@ -92,6 +92,7 @@ export class Salary extends Controller {
         salarys.isActive = false;
       }
       salarys.salaryType = salarys.salaryType.toUpperCase();
+      salarys.isSpecial = salarys.isSpecial;
       salarys.createdUserId = request.user.sub;
       salarys.createdFullName = request.user.name;
       salarys.lastUpdateUserId = request.user.sub;
@@ -242,6 +243,7 @@ export class Salary extends Controller {
         where: { id: id },
         select: [
           "salaryType",
+          "isSpecial",
           "posTypeId",
           "posLevelId",
           "isActive",
@@ -285,6 +287,7 @@ export class Salary extends Controller {
         const filteredSalary = salary.filter(
           (x) =>
             x.salaryType?.toString().includes(keyword) ||
+            x.isSpecial?.toString().includes(keyword) || //new 20.02.67
             x.posLevel_?.posLevelName?.toString().includes(keyword) ||
             x.posType_?.posTypeName?.toString().includes(keyword) ||
             x.isActive?.toString().includes(keyword) ||
@@ -297,6 +300,7 @@ export class Salary extends Controller {
         const formattedData = filteredSalary.map((item) => ({
           id: item.id,
           salaryType: item.salaryType,
+          isSpecial: item.isSpecial,
           posTypeId: item.posType_?.id,
           posType: item.posType_?.posTypeName,
           posLevelId: item.posLevel_?.id,
@@ -318,6 +322,7 @@ export class Salary extends Controller {
       const formattedData = salary.map((item) => ({
         id: item.id,
         salaryType: item.salaryType,
+        isSpecial: item.isSpecial,
         posTypeId: item.posType_?.id,
         posType: item.posType_?.posTypeName,
         posLevelId: item.posLevel_?.id,
diff --git a/src/entities/Salarys.ts b/src/entities/Salarys.ts
index 7b99919..6c76deb 100644
--- a/src/entities/Salarys.ts
+++ b/src/entities/Salarys.ts
@@ -61,6 +61,12 @@ export class Salarys extends EntityBase {
   })
   details: string;
 
+  @Column({
+    comment: "ฉ",
+    default: false,
+  })
+  isSpecial: boolean;
+
   @OneToMany(() => SalaryRanks, (salaryRanks) => salaryRanks.salarys_)
   salaryRanks_: SalaryRanks[];
 
@@ -98,7 +104,9 @@ export class CreateSalary {
 
   @Column()
   details?: string;
-  
+
+  @Column()
+  isSpecial: boolean;
 }
   
 export type UpdateSalary = Partial<CreateSalary> ;
\ No newline at end of file