เพิ่มฟิวคุณสมบัติบุคคล

This commit is contained in:
Kittapath 2024-03-07 15:28:23 +07:00
parent aff5aa452e
commit 33a5cf2a57
2 changed files with 106 additions and 44 deletions

View file

@ -233,38 +233,45 @@ export class SalaryProfile extends EntityBase {
@Column({
nullable: true,
comment: "ผลการประเมิน",
comment: "ผลการประเมินผลการปฏิบัติราชการ",
default: null,
})
result: string;
@Column({
nullable: true,
comment: "ระยะเวลา",
comment: "ระยะเวลาการปฏิบัติราชการในรอบครึ่งปี",
default: null,
})
duration: string;
@Column({
nullable: true,
comment: "การลงโทษ",
default: null,
comment: "การลงโทษทางวินัย",
default: false,
})
punish: string;
isPunish: boolean;
@Column({
nullable: true,
comment: "พักราชการ",
default: null,
default: false,
})
retired: string;
isSuspension: boolean;
@Column({
nullable: true,
comment: "ขาดราชการ",
default: null,
default: false,
})
retired2: string;
isAbsent: boolean;
@Column({
nullable: true,
comment: "วันลา",
default: false,
})
isLeave: boolean;
@Column({
nullable: true,
@ -273,6 +280,13 @@ export class SalaryProfile extends EntityBase {
})
isRetired: boolean;
@Column({
nullable: true,
comment: "สำรอง",
default: false,
})
isReserve: boolean;
@ManyToOne(() => SalaryOrg, (salaryOrg) => salaryOrg.salaryProfiles)
@JoinColumn({ name: "salaryOrgId" })
salaryOrg: SalaryOrg;
@ -361,13 +375,16 @@ export class CreateSalaryProfile {
duration: string | null;
@Column()
punish: string | null;
isPunish: boolean;
@Column()
retired: string | null;
isSuspension: boolean;
@Column()
retired2: string | null;
isAbsent: boolean;
@Column()
isLeave: boolean;
@Column()
isRetired: boolean;