เพิ่มขั้นเงินเดือน
This commit is contained in:
parent
85ba718bbd
commit
23754e849c
4 changed files with 24 additions and 0 deletions
|
|
@ -397,6 +397,7 @@ export class OrganizationUnauthorizeController extends Controller {
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
return {
|
return {
|
||||||
|
salaryLevel: item.current_holder.salaryLevel,
|
||||||
prefix: item.current_holder.prefix,
|
prefix: item.current_holder.prefix,
|
||||||
firstName: item.current_holder.firstName,
|
firstName: item.current_holder.firstName,
|
||||||
lastName: item.current_holder.lastName,
|
lastName: item.current_holder.lastName,
|
||||||
|
|
|
||||||
|
|
@ -1049,6 +1049,7 @@ export class ProfileEmployeeController extends Controller {
|
||||||
);
|
);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
salaryLevel: item.current_holder.salaryLevel,
|
||||||
prefix: item.current_holder.prefix,
|
prefix: item.current_holder.prefix,
|
||||||
firstName: item.current_holder.firstName,
|
firstName: item.current_holder.firstName,
|
||||||
lastName: item.current_holder.lastName,
|
lastName: item.current_holder.lastName,
|
||||||
|
|
|
||||||
|
|
@ -141,6 +141,14 @@ export class ProfileEmployee extends EntityBase {
|
||||||
})
|
})
|
||||||
birthDate: Date;
|
birthDate: Date;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
type: "double",
|
||||||
|
nullable: true,
|
||||||
|
comment: "ขั้นเงินเดือน",
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
salaryLevel: number | null;
|
||||||
|
|
||||||
@OneToMany(() => EmployeePosMaster, (posMaster) => posMaster.current_holder)
|
@OneToMany(() => EmployeePosMaster, (posMaster) => posMaster.current_holder)
|
||||||
current_holders: EmployeePosMaster[];
|
current_holders: EmployeePosMaster[];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,14 @@
|
||||||
|
import { MigrationInterface, QueryRunner } from "typeorm";
|
||||||
|
|
||||||
|
export class UpdateTableSalaryprofileAddSalarylevel1710744584780 implements MigrationInterface {
|
||||||
|
name = 'UpdateTableSalaryprofileAddSalarylevel1710744584780'
|
||||||
|
|
||||||
|
public async up(queryRunner: QueryRunner): Promise<void> {
|
||||||
|
await queryRunner.query(`ALTER TABLE \`profileEmployee\` ADD \`salaryLevel\` double NULL COMMENT 'ขั้นเงินเดือน'`);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async down(queryRunner: QueryRunner): Promise<void> {
|
||||||
|
await queryRunner.query(`ALTER TABLE \`profileEmployee\` DROP COLUMN \`salaryLevel\``);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue