From 8358ed87731055f10175abcefc5f34cdff68d362 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Thu, 29 Feb 2024 11:29:05 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=9F=E0=B8=B4=E0=B8=A7=20isretire?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/SalaryPeriodController.ts     | 12 +++++++----
 src/entities/SalaryProfile.ts                 | 20 ++++++++++++++-----
 ...pdate_table_salaryProfile_add_isretired.ts | 14 +++++++++++++
 3 files changed, 37 insertions(+), 9 deletions(-)
 create mode 100644 src/migration/1709180884777-update_table_salaryProfile_add_isretired.ts

diff --git a/src/controllers/SalaryPeriodController.ts b/src/controllers/SalaryPeriodController.ts
index 017e40d..7e4f050 100644
--- a/src/controllers/SalaryPeriodController.ts
+++ b/src/controllers/SalaryPeriodController.ts
@@ -121,10 +121,14 @@ export class SalaryPeriodController extends Controller {
     const data = {
       total: salaryOrg.total,
       fifteenPercent: salaryOrg.fifteenPercent,
-      chosen: salaryOrg.salaryProfiles.filter((x) => x.posType == "FULL").length,
-      remaining:
-        salaryOrg.fifteenPercent -
-        salaryOrg.salaryProfiles.filter((x) => x.posType == "FULL").length,
+      chosen: salaryOrg.quantityUsed,
+      remaining: salaryOrg.remainQuota,
+      currentAmount: salaryOrg.currentAmount,
+      sixPercentAmount: salaryOrg.sixPercentAmount,
+      spentAmount: salaryOrg.spentAmount,
+      sixPercentSpentAmount: salaryOrg.sixPercentAmount - salaryOrg.spentAmount,
+      useAmount: salaryOrg.useAmount,
+      remainingAmount: salaryOrg.remainingAmount,
     };
     return new HttpSuccess(data);
   }
diff --git a/src/entities/SalaryProfile.ts b/src/entities/SalaryProfile.ts
index 47606f2..7b72baf 100644
--- a/src/entities/SalaryProfile.ts
+++ b/src/entities/SalaryProfile.ts
@@ -269,6 +269,13 @@ export class SalaryProfile extends EntityBase {
   })
   retired2: string;
 
+  @Column({
+    nullable: true,
+    comment: "เกษียญ",
+    default: false,
+  })
+  isRetired: boolean;
+
   @ManyToOne(() => SalaryOrg, (salaryOrg) => salaryOrg.salaryProfiles)
   @JoinColumn({ name: "salaryOrgId" })
   salaryOrg: SalaryOrg;
@@ -351,17 +358,20 @@ export class CreateSalaryProfile {
   child4: string | null;
 
   @Column()
-  result: boolean;
+  result: string;
 
   @Column()
-  duration: boolean;
+  duration: string;
 
   @Column()
-  punish: boolean;
+  punish: string;
 
   @Column()
-  retired: boolean;
+  retired: string;
 
   @Column()
-  retired2: boolean;
+  retired2: string;
+
+  @Column()
+  isRetired: boolean;
 }
diff --git a/src/migration/1709180884777-update_table_salaryProfile_add_isretired.ts b/src/migration/1709180884777-update_table_salaryProfile_add_isretired.ts
new file mode 100644
index 0000000..a24ef56
--- /dev/null
+++ b/src/migration/1709180884777-update_table_salaryProfile_add_isretired.ts
@@ -0,0 +1,14 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class UpdateTableSalaryProfileAddIsretired1709180884777 implements MigrationInterface {
+    name = 'UpdateTableSalaryProfileAddIsretired1709180884777'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`salaryProfile\` ADD \`isRetired\` tinyint NULL COMMENT 'เกษียญ' DEFAULT 0`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`salaryProfile\` DROP COLUMN \`isRetired\``);
+    }
+
+}