diff --git a/src/controllers/SalaryPeriodController.ts b/src/controllers/SalaryPeriodController.ts index f788db0..fc6253c 100644 --- a/src/controllers/SalaryPeriodController.ts +++ b/src/controllers/SalaryPeriodController.ts @@ -1643,7 +1643,7 @@ export class SalaryPeriodController extends Controller { }), ); await Promise.all( - orgProfiles.map(async (profile: any) => { + orgProfileEmployees.map(async (profile: any) => { const salaryOrgNew = await this.salaryOrgEmployeeRepository.findOne({ where: { salaryPeriodId: salaryPeriod.id, @@ -1979,7 +1979,6 @@ export class SalaryPeriodController extends Controller { } } total = 1000; - let orgProfileEmployees: any; let _orgProfileEmployees = await new CallAPI().PostData( request, "org/unauthorize/profile/salary/employee/gen", @@ -1991,7 +1990,7 @@ export class SalaryPeriodController extends Controller { period: salaryPeriod.period, }, ); - orgProfileEmployees = _orgProfileEmployees.data; + let orgProfileEmployees = _orgProfileEmployees.data; total = _orgProfileEmployees.total; if (total > 1000) { const page = Math.ceil(total / 1000); @@ -2113,7 +2112,7 @@ export class SalaryPeriodController extends Controller { }), ); await Promise.all( - orgProfiles.map(async (profile: any) => { + orgProfileEmployees.map(async (profile: any) => { const salaryOrgNew = await this.salaryOrgEmployeeRepository.findOne({ where: { salaryPeriodId: salaryPeriod.id, diff --git a/src/entities/SalaryProfileEmployee.ts b/src/entities/SalaryProfileEmployee.ts index 8e1ee76..797840f 100644 --- a/src/entities/SalaryProfileEmployee.ts +++ b/src/entities/SalaryProfileEmployee.ts @@ -10,6 +10,14 @@ export class SalaryProfileEmployee extends EntityBase { }) salaryOrgId: string; + @Column({ + type: "double", + nullable: true, + comment: "ขั้นเงินเดือน", + default: null, + }) + salaryLevel: number | null; + @Column({ nullable: true, comment: "คำนำหน้า", diff --git a/src/migration/1710744556698-update_table_salayprofile_add_salarylevel.ts b/src/migration/1710744556698-update_table_salayprofile_add_salarylevel.ts new file mode 100644 index 0000000..c64ef4a --- /dev/null +++ b/src/migration/1710744556698-update_table_salayprofile_add_salarylevel.ts @@ -0,0 +1,14 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class UpdateTableSalayprofileAddSalarylevel1710744556698 implements MigrationInterface { + name = 'UpdateTableSalayprofileAddSalarylevel1710744556698' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`salaryProfileEmployee\` ADD \`salaryLevel\` double NULL COMMENT 'ขั้นเงินเดือน'`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`salaryProfileEmployee\` DROP COLUMN \`salaryLevel\``); + } + +}