hrms-bangkok/hrms-api-salary
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into develop-Bright

Browse source
This commit is contained in:
Bright 2024-02-27 10:35:42 +07:00
commit d0185cc46a
2 changed files with 25 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/entities/SalaryOrg.ts
View file

@ -1,4 +1,4 @@
import { Entity, Column, ManyToOne, JoinColumn, OneToOne, OneToMany } from "typeorm";
import { Entity, Column, ManyToOne, JoinColumn, OneToOne, OneToMany, Double } from "typeorm";
import { EntityBase } from "./base/Base";
import { SalaryPeriod } from "./SalaryPeriod";
import { SalaryProfile } from "./SalaryProfile";
@ -28,10 +28,17 @@ export class SalaryOrg extends EntityBase {
total: number;
@Column({
comment: "15%ของจำนวนคน",
comment: "15%ของจำนวนคน(จำนวนเต็ม)",
})
fifteenPercent: number;
@Column({
comment: "15%ของจำนวนคน(จุดทศนิยม)",
type: "double",
default: 0,
})
fifteenPoint: Double;
@Column({
comment: "กลุ่ม GROUP1->กลุ่ม1 GROUP2->กลุ่ม2",
length: 10,

16
src/migration/1709004502447-update_table_salaryPeriod_add_fifteenPoint.ts Normal file
View file

@ -0,0 +1,16 @@
import { MigrationInterface, QueryRunner } from "typeorm";
export class UpdateTableSalaryPeriodAddFifteenPoint1709004502447 implements MigrationInterface {
name = 'UpdateTableSalaryPeriodAddFifteenPoint1709004502447'
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`salaryOrg\` ADD \`fifteenPoint\` double NOT NULL COMMENT '15%ของจำนวนคน(จุดทศนิยม)' DEFAULT '0'`);
await queryRunner.query(`ALTER TABLE \`salaryOrg\` CHANGE \`fifteenPercent\` \`fifteenPercent\` int NOT NULL COMMENT '15%ของจำนวนคน(จำนวนเต็ม)'`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`salaryOrg\` CHANGE \`fifteenPercent\` \`fifteenPercent\` int NOT NULL COMMENT '15%ของจำนวนคน'`);
await queryRunner.query(`ALTER TABLE \`salaryOrg\` DROP COLUMN \`fifteenPoint\``);
}
}