no message
This commit is contained in:
parent
5421b6f111
commit
9b3028eb8a
2 changed files with 62 additions and 2 deletions
|
|
@ -51,7 +51,9 @@ export class SalaryProfile extends EntityBase {
|
||||||
posMasterNoPrefix: string;
|
posMasterNoPrefix: string;
|
||||||
|
|
||||||
@Column({
|
@Column({
|
||||||
|
nullable: true,
|
||||||
comment: "เลขที่ตำแหน่ง เป็นตัวเลข",
|
comment: "เลขที่ตำแหน่ง เป็นตัวเลข",
|
||||||
|
default: null,
|
||||||
})
|
})
|
||||||
posMasterNo: number;
|
posMasterNo: number;
|
||||||
|
|
||||||
|
|
@ -80,53 +82,67 @@ export class SalaryProfile extends EntityBase {
|
||||||
position: string;
|
position: string;
|
||||||
|
|
||||||
@Column({
|
@Column({
|
||||||
|
nullable: true,
|
||||||
comment: "ประเภทตำแหน่ง",
|
comment: "ประเภทตำแหน่ง",
|
||||||
length: 100,
|
length: 100,
|
||||||
|
default: null,
|
||||||
})
|
})
|
||||||
posType: string;
|
posType: string;
|
||||||
|
|
||||||
@Column({
|
@Column({
|
||||||
|
nullable: true,
|
||||||
comment: "ระดับตำแหน่ง",
|
comment: "ระดับตำแหน่ง",
|
||||||
length: 100,
|
length: 100,
|
||||||
|
default: null,
|
||||||
})
|
})
|
||||||
posLevel: string;
|
posLevel: string;
|
||||||
|
|
||||||
@Column({
|
@Column({
|
||||||
|
nullable: true,
|
||||||
comment: "ตำแหน่งทางการบริหาร",
|
comment: "ตำแหน่งทางการบริหาร",
|
||||||
length: 255,
|
length: 255,
|
||||||
|
default: null,
|
||||||
})
|
})
|
||||||
posExecutive: string;
|
posExecutive: string;
|
||||||
|
|
||||||
@Column({
|
@Column({
|
||||||
|
nullable: true,
|
||||||
comment: "เงินเดือนฐาน",
|
comment: "เงินเดือนฐาน",
|
||||||
|
default: null,
|
||||||
})
|
})
|
||||||
amount: number;
|
amount: number;
|
||||||
|
|
||||||
@Column({
|
@Column({
|
||||||
|
nullable: true,
|
||||||
comment: "เงินพิเศษ",
|
comment: "เงินพิเศษ",
|
||||||
|
default: null,
|
||||||
})
|
})
|
||||||
amountSpecial: number;
|
amountSpecial: number;
|
||||||
|
|
||||||
@Column({
|
@Column({
|
||||||
|
nullable: true,
|
||||||
comment: "จำนวนเงินที่ใช้เลื่อน",
|
comment: "จำนวนเงินที่ใช้เลื่อน",
|
||||||
|
default: null,
|
||||||
})
|
})
|
||||||
amountUse: number;
|
amountUse: number;
|
||||||
|
|
||||||
@Column({
|
@Column({
|
||||||
|
nullable: true,
|
||||||
comment: "เงินเดือนหลังเลื่อน",
|
comment: "เงินเดือนหลังเลื่อน",
|
||||||
|
default: null,
|
||||||
})
|
})
|
||||||
positionSalaryAmount: number;
|
positionSalaryAmount: number;
|
||||||
|
|
||||||
@Column({
|
@Column({
|
||||||
nullable: true,
|
|
||||||
comment:
|
comment:
|
||||||
"ประเภทการเลื่อน(ขั้น) PENDING->รายชื่อคนครอง NONE->ไม่ได้เลื่อน HAFT->ครึ่งขั้น FULL->1ขั้น FULLHAFT->1.5ขั้น",
|
"ประเภทการเลื่อน(ขั้น) PENDING->รายชื่อคนครอง NONE->ไม่ได้เลื่อน HAFT->ครึ่งขั้น FULL->1ขั้น FULLHAFT->1.5ขั้น",
|
||||||
length: 20,
|
length: 20,
|
||||||
default: null,
|
default: "PENDING",
|
||||||
})
|
})
|
||||||
type: string;
|
type: string;
|
||||||
|
|
||||||
@Column({
|
@Column({
|
||||||
|
nullable: true,
|
||||||
comment: "",
|
comment: "",
|
||||||
length: 40,
|
length: 40,
|
||||||
})
|
})
|
||||||
|
|
@ -141,6 +157,7 @@ export class SalaryProfile extends EntityBase {
|
||||||
root: string;
|
root: string;
|
||||||
|
|
||||||
@Column({
|
@Column({
|
||||||
|
nullable: true,
|
||||||
comment: "",
|
comment: "",
|
||||||
length: 40,
|
length: 40,
|
||||||
})
|
})
|
||||||
|
|
@ -155,6 +172,7 @@ export class SalaryProfile extends EntityBase {
|
||||||
child1: string;
|
child1: string;
|
||||||
|
|
||||||
@Column({
|
@Column({
|
||||||
|
nullable: true,
|
||||||
comment: "",
|
comment: "",
|
||||||
length: 40,
|
length: 40,
|
||||||
})
|
})
|
||||||
|
|
@ -169,6 +187,7 @@ export class SalaryProfile extends EntityBase {
|
||||||
child2: string;
|
child2: string;
|
||||||
|
|
||||||
@Column({
|
@Column({
|
||||||
|
nullable: true,
|
||||||
comment: "",
|
comment: "",
|
||||||
length: 40,
|
length: 40,
|
||||||
})
|
})
|
||||||
|
|
@ -183,6 +202,7 @@ export class SalaryProfile extends EntityBase {
|
||||||
child3: string;
|
child3: string;
|
||||||
|
|
||||||
@Column({
|
@Column({
|
||||||
|
nullable: true,
|
||||||
comment: "",
|
comment: "",
|
||||||
length: 40,
|
length: 40,
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,40 @@
|
||||||
|
import { MigrationInterface, QueryRunner } from "typeorm";
|
||||||
|
|
||||||
|
export class UpdateTableSalaryPeriodAddFifteenPoint11709006642536 implements MigrationInterface {
|
||||||
|
name = 'UpdateTableSalaryPeriodAddFifteenPoint11709006642536'
|
||||||
|
|
||||||
|
public async up(queryRunner: QueryRunner): Promise<void> {
|
||||||
|
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`posMasterNo\` \`posMasterNo\` int NULL COMMENT 'เลขที่ตำแหน่ง เป็นตัวเลข'`);
|
||||||
|
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`posType\` \`posType\` varchar(100) NULL COMMENT 'ประเภทตำแหน่ง'`);
|
||||||
|
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`posLevel\` \`posLevel\` varchar(100) NULL COMMENT 'ระดับตำแหน่ง'`);
|
||||||
|
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`posExecutive\` \`posExecutive\` varchar(255) NULL COMMENT 'ตำแหน่งทางการบริหาร'`);
|
||||||
|
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`amount\` \`amount\` int NULL COMMENT 'เงินเดือนฐาน'`);
|
||||||
|
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`amountSpecial\` \`amountSpecial\` int NULL COMMENT 'เงินพิเศษ'`);
|
||||||
|
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`amountUse\` \`amountUse\` int NULL COMMENT 'จำนวนเงินที่ใช้เลื่อน'`);
|
||||||
|
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`positionSalaryAmount\` \`positionSalaryAmount\` int NULL COMMENT 'เงินเดือนหลังเลื่อน'`);
|
||||||
|
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`type\` \`type\` varchar(20) NOT NULL COMMENT 'ประเภทการเลื่อน(ขั้น) PENDING->รายชื่อคนครอง NONE->ไม่ได้เลื่อน HAFT->ครึ่งขั้น FULL->1ขั้น FULLHAFT->1.5ขั้น' DEFAULT 'PENDING'`);
|
||||||
|
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`rootId\` \`rootId\` varchar(40) NULL`);
|
||||||
|
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`child1Id\` \`child1Id\` varchar(40) NULL`);
|
||||||
|
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`child2Id\` \`child2Id\` varchar(40) NULL`);
|
||||||
|
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`child3Id\` \`child3Id\` varchar(40) NULL`);
|
||||||
|
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`child4Id\` \`child4Id\` varchar(40) NULL`);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async down(queryRunner: QueryRunner): Promise<void> {
|
||||||
|
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`child4Id\` \`child4Id\` varchar(40) NOT NULL`);
|
||||||
|
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`child3Id\` \`child3Id\` varchar(40) NOT NULL`);
|
||||||
|
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`child2Id\` \`child2Id\` varchar(40) NOT NULL`);
|
||||||
|
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`child1Id\` \`child1Id\` varchar(40) NOT NULL`);
|
||||||
|
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`rootId\` \`rootId\` varchar(40) NOT NULL`);
|
||||||
|
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`type\` \`type\` varchar(20) NULL COMMENT 'ประเภทการเลื่อน(ขั้น) PENDING->รายชื่อคนครอง NONE->ไม่ได้เลื่อน HAFT->ครึ่งขั้น FULL->1ขั้น FULLHAFT->1.5ขั้น'`);
|
||||||
|
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`positionSalaryAmount\` \`positionSalaryAmount\` int NOT NULL COMMENT 'เงินเดือนหลังเลื่อน'`);
|
||||||
|
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`amountUse\` \`amountUse\` int NOT NULL COMMENT 'จำนวนเงินที่ใช้เลื่อน'`);
|
||||||
|
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`amountSpecial\` \`amountSpecial\` int NOT NULL COMMENT 'เงินพิเศษ'`);
|
||||||
|
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`amount\` \`amount\` int NOT NULL COMMENT 'เงินเดือนฐาน'`);
|
||||||
|
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`posExecutive\` \`posExecutive\` varchar(255) NOT NULL COMMENT 'ตำแหน่งทางการบริหาร'`);
|
||||||
|
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`posLevel\` \`posLevel\` varchar(100) NOT NULL COMMENT 'ระดับตำแหน่ง'`);
|
||||||
|
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`posType\` \`posType\` varchar(100) NOT NULL COMMENT 'ประเภทตำแหน่ง'`);
|
||||||
|
await queryRunner.query(`ALTER TABLE \`salaryProfile\` CHANGE \`posMasterNo\` \`posMasterNo\` int NOT NULL COMMENT 'เลขที่ตำแหน่ง เป็นตัวเลข'`);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue