From b4db2a594b416c9cf847c71ca3e5e3d9859f00f9 Mon Sep 17 00:00:00 2001 From: Bright Date: Fri, 7 Jun 2024 09:31:53 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9F=E0=B8=B4=E0=B8=A5=E0=B8=94=E0=B9=8C?= =?UTF-8?q?=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B8=A5?= =?UTF-8?q?=E0=B8=B9=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=8A?= =?UTF-8?q?=E0=B8=B1=E0=B9=88=E0=B8=A7=E0=B8=84=E0=B8=A3=E0=B8=B2=E0=B8=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/entities/ProfileEmployee.ts | 85 ++++++++++++++++++++++++++++++++- 1 file changed, 84 insertions(+), 1 deletion(-) diff --git a/src/entities/ProfileEmployee.ts b/src/entities/ProfileEmployee.ts index 21f3855b..7483b258 100644 --- a/src/entities/ProfileEmployee.ts +++ b/src/entities/ProfileEmployee.ts @@ -467,11 +467,81 @@ export class ProfileEmployee extends EntityBase { @Column({ nullable: true, - comment: "สถานะลูกจ่างชั่วคราว", + comment: "สถานะลูกจ้างชั่วคราว", default: null, }) statusTemp: string; + @Column({ + nullable: true, + comment: "กลุ่มงาน", + default: null, + }) + positionEmployeeGroupId: string; + + @Column({ + nullable: true, + comment: "สายงาน", + default: null, + }) + positionEmployeeLineId: string; + + @Column({ + nullable: true, + comment: "ชื่อตำแหน่งทางสายงาน", + default: null, + }) + positionEmployeePositionId: string; + + @Column({ + nullable: true, + comment: "สังกัด", + default: null, + }) + employeeOc: string; + + @Column({ + nullable: true, + comment: "ประเภทบุคคล", + default: null, + }) + employeeTypeIndividual: string; + + @Column({ + nullable: true, + comment: "ค่าจ้าง", + default: null, + }) + employeeWage: string; + + @Column({ + nullable: true, + comment: "เงินเพิ่มการครองชีพชั่วคราว", + default: null, + }) + employeeMoneyIncrease: string; + + @Column({ + nullable: true, + comment: "เงินช่วยเหลือการครองชีพชั่วคราว", + default: null, + }) + employeeMoneyAllowance: string; + + @Column({ + nullable: true, + comment: "เงินสมทบประกันสังคม(ลูกจ้าง)", + default: null, + }) + employeeMoneyEmployee: string; + + @Column({ + nullable: true, + comment: "เงินสมทบประกันสังคม(นายจ้าง)", + default: null, + }) + employeeMoneyEmployer: string; + @OneToMany(() => EmployeePosMaster, (v) => v.current_holder) current_holders: EmployeePosMaster[]; @@ -688,6 +758,19 @@ export class CreateProfileEmployee { employeeClass?: string | null; } +export class CreateInformationProfileEmployeeTemp { + positionEmployeeGroupId?: string | null; + positionEmployeeLineId?: string | null; + positionEmployeePositionId?: string | null; + employeeOc?: string | null; + employeeTypeIndividual?: string | null; + employeeWage?: string | null; + employeeMoneyIncrease?: string | null; + employeeMoneyAllowance?: string | null; + employeeMoneyEmployee?: string | null; + employeeMoneyEmployer?: string | null; +} + export type UpdateProfileEmployee = { prefix: string; rank?: string | null;