เพิ่มฟิว isretire

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,
+      chosen: salaryOrg.quantityUsed,
-      remaining:
+      remaining: salaryOrg.remainQuota,
-        salaryOrg.fifteenPercent -
+      currentAmount: salaryOrg.currentAmount,
-        salaryOrg.salaryProfiles.filter((x) => x.posType == "FULL").length,
+      sixPercentAmount: salaryOrg.sixPercentAmount,
+      spentAmount: salaryOrg.spentAmount,
+      sixPercentSpentAmount: salaryOrg.sixPercentAmount - salaryOrg.spentAmount,
+      useAmount: salaryOrg.useAmount,
+      remainingAmount: salaryOrg.remainingAmount,
     };
     return new HttpSuccess(data);
   }

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;
 }

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\``);
+    }
+
+}