เลื่อนเงินเดือนลูกจ้าง
This commit is contained in:
parent
b54834ab9f
commit
c5721faa70
4 changed files with 25 additions and 0 deletions
|
|
@ -398,6 +398,7 @@ export class OrganizationUnauthorizeController extends Controller {
|
||||||
);
|
);
|
||||||
return {
|
return {
|
||||||
salaryLevel: item.current_holder.salaryLevel,
|
salaryLevel: item.current_holder.salaryLevel,
|
||||||
|
group: item.current_holder.group,
|
||||||
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,
|
||||||
|
|
|
||||||
|
|
@ -1003,6 +1003,7 @@ export class ProfileEmployeeController extends Controller {
|
||||||
|
|
||||||
return {
|
return {
|
||||||
salaryLevel: item.current_holder.salaryLevel,
|
salaryLevel: item.current_holder.salaryLevel,
|
||||||
|
group: item.current_holder.group,
|
||||||
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,
|
||||||
|
|
|
||||||
|
|
@ -118,6 +118,13 @@ export class ProfileEmployee extends EntityBase {
|
||||||
})
|
})
|
||||||
salaryLevel: number | null;
|
salaryLevel: number | null;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
nullable: true,
|
||||||
|
comment: "กลุ่มบัญชีการจ้าง",
|
||||||
|
default: null,
|
||||||
|
})
|
||||||
|
group: number;
|
||||||
|
|
||||||
@Column({
|
@Column({
|
||||||
nullable: true,
|
nullable: true,
|
||||||
comment: "เชื้อชาติ",
|
comment: "เชื้อชาติ",
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
import { MigrationInterface, QueryRunner } from "typeorm";
|
||||||
|
|
||||||
|
export class UpdateTableProfileemployeeAddGroup1711033351014 implements MigrationInterface {
|
||||||
|
name = 'UpdateTableProfileemployeeAddGroup1711033351014'
|
||||||
|
|
||||||
|
public async up(queryRunner: QueryRunner): Promise<void> {
|
||||||
|
await queryRunner.query(`ALTER TABLE \`profileEmployee\` ADD \`group\` int NULL COMMENT 'กลุ่มบัญชีการจ้าง'`);
|
||||||
|
await queryRunner.query(`ALTER TABLE \`profileEmployeeHistory\` ADD \`group\` int NULL COMMENT 'กลุ่มบัญชีการจ้าง'`);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async down(queryRunner: QueryRunner): Promise<void> {
|
||||||
|
await queryRunner.query(`ALTER TABLE \`profileEmployeeHistory\` DROP COLUMN \`group\``);
|
||||||
|
await queryRunner.query(`ALTER TABLE \`profileEmployee\` DROP COLUMN \`group\``);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue