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

เพิ่มคำนวนเงินเดือนตำแหน่ง ฉ

Browse source
This commit is contained in:
Kittapath 2024-04-02 14:34:32 +07:00
parent 822035838d
commit 7a0fec256c
4 changed files with 39 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/controllers/SalaryPeriodController.ts
View file

@ -372,6 +372,7 @@ export class SalaryPeriodController extends Controller {
where: { where: {
posTypeId: Level.posTypeId, posTypeId: Level.posTypeId,
posLevelId: Level.id, posLevelId: Level.id,
isSpecial: salaryProfile.isSpecial == false ? false : true,
isActive: true, isActive: true,
}, },
}); });
@ -683,6 +684,7 @@ export class SalaryPeriodController extends Controller {
where: { where: {
posTypeId: Level.posTypeId, posTypeId: Level.posTypeId,
posLevelId: Level.id, posLevelId: Level.id,
isSpecial: salaryProfile.isSpecial == false ? false : true,
isActive: true, isActive: true,
}, },
}); });
@ -1054,6 +1056,7 @@ export class SalaryPeriodController extends Controller {
where: { where: {
posTypeId: posLevel.posTypeId, posTypeId: posLevel.posTypeId,
posLevelId: posLevel.id, posLevelId: posLevel.id,
isSpecial: salaryProfile.isSpecial == false ? false : true,
isActive: true, isActive: true,
}, },
}); });

10
src/entities/SalaryProfile.ts
View file

@ -294,6 +294,13 @@ export class SalaryProfile extends EntityBase {
}) })
isNext: boolean; isNext: boolean;
@Column({
nullable: true,
comment: "ฉ",
default: null,
})
isSpecial: boolean;
@ManyToOne(() => SalaryOrg, (salaryOrg) => salaryOrg.salaryProfiles) @ManyToOne(() => SalaryOrg, (salaryOrg) => salaryOrg.salaryProfiles)
@JoinColumn({ name: "salaryOrgId" }) @JoinColumn({ name: "salaryOrgId" })
salaryOrg: SalaryOrg; salaryOrg: SalaryOrg;
@ -395,4 +402,7 @@ export class CreateSalaryProfile {
@Column() @Column()
isRetired: boolean; isRetired: boolean;
@Column()
isSpecial: boolean;
} }

10
src/entities/SalaryProfileEmployee.ts
View file

@ -346,6 +346,13 @@ export class SalaryProfileEmployee extends EntityBase {
}) })
isNext: boolean; isNext: boolean;
@Column({
nullable: true,
comment: "ฉ",
default: null,
})
isSpecial: boolean;
@ManyToOne(() => SalaryOrgEmployee, (salaryOrg) => salaryOrg.salaryProfiles) @ManyToOne(() => SalaryOrgEmployee, (salaryOrg) => salaryOrg.salaryProfiles)
@JoinColumn({ name: "salaryOrgId" }) @JoinColumn({ name: "salaryOrgId" })
salaryOrg: SalaryOrgEmployee; salaryOrg: SalaryOrgEmployee;
@ -456,4 +463,7 @@ export class CreateSalaryProfileEmployee {
@Column() @Column()
isRetired: boolean; isRetired: boolean;
@Column()
isSpecial: boolean;
} }

16
src/migration/1712043041340-update_table_salaryProfileEmployee_add_isSpecial.ts Normal file
View file

@ -0,0 +1,16 @@
import { MigrationInterface, QueryRunner } from "typeorm";
export class UpdateTableSalaryProfileEmployeeAddIsSpecial1712043041340 implements MigrationInterface {
name = 'UpdateTableSalaryProfileEmployeeAddIsSpecial1712043041340'
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`salaryProfileEmployee\` ADD \`isSpecial\` tinyint NULL COMMENT 'ฉ'`);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` ADD \`isSpecial\` tinyint NULL COMMENT 'ฉ'`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`salaryProfile\` DROP COLUMN \`isSpecial\``);
await queryRunner.query(`ALTER TABLE \`salaryProfileEmployee\` DROP COLUMN \`isSpecial\``);
}
}