แก้apiข้อมูลหลัก

src/entities/ProfileEmployee.ts

@@ -5,13 +5,17 @@ import { EmployeePosType } from "./EmployeePosType";
 import { EmployeePosMaster } from "./EmployeePosMaster";
 import { ProfileSalaryEmployee } from "./ProfileSalaryEmployee";
 import { ProfileDisciplineEmployee } from "./ProfileDisciplineEmployee";
-import { BloodGroup } from "./BloodGroup";
-import { Relationship } from "./Relationship";
-import { Gender } from "./Gender";
-import { Religion } from "./Religion";
 
 @Entity("profileEmployee")
 export class ProfileEmployee extends EntityBase {
+  @Column({
+    nullable: true,
+    comment: "ยศ",
+    length: 40,
+    default: null,
+  })
+  rank: string;
+
   @Column({
     nullable: true,
     comment: "คำนำหน้าชื่อ",
@@ -147,10 +151,7 @@ export class ProfileEmployee extends EntityBase {
     length: 40,
     default: null,
   })
-  genderId: string;
-
-  @ManyToOne(() => Gender, (v) => v.profileEmployee)
-  gender: Gender;
+  gender: string;
 
   @Column({
     nullable: true,
@@ -158,10 +159,7 @@ export class ProfileEmployee extends EntityBase {
     length: 40,
     default: null,
   })
-  relationshipId: string;
-
-  @ManyToOne(() => Relationship, (v) => v.profileEmployee)
-  relationship: Relationship;
+  relationship: string;
 
   @Column({
     nullable: true,
@@ -169,10 +167,7 @@ export class ProfileEmployee extends EntityBase {
     length: 255,
     default: null,
   })
-  religionId: string;
-
-  @ManyToOne(() => Religion, (v) => v.profile)
-  religion: Religion;
+  religion: string;
 
   @Column({
     nullable: true,
@@ -180,10 +175,7 @@ export class ProfileEmployee extends EntityBase {
     length: 40,
     default: null,
   })
-  bloodGroupId: string;
-
-  @ManyToOne(() => BloodGroup, (v) => v.profileEmployee)
-  bloodGroup: BloodGroup;
+  bloodGroup: string;
 
   @OneToMany(() => EmployeePosMaster, (v) => v.current_holder)
   current_holders: EmployeePosMaster[];
@@ -222,6 +214,7 @@ export class ProfileEmployeeHistory extends ProfileEmployee {
 }
 
 export class CreateProfileEmployee {
+  rank: string;
   prefix: string;
   firstName: string;
   lastName: string;
@@ -233,15 +226,16 @@ export class CreateProfileEmployee {
   ethnicity: string | null;
   telephoneNumber: string | null;
   citizenId: string;
-  religionId: string | null;
+  religion: string | null;
   posLevelId: string | null;
   posTypeId: string | null;
-  genderId: string | null;
-  relationshipId: string | null;
-  bloodGroupId: string | null;
+  gender: string | null;
+  relationship: string | null;
+  bloodGroup: string | null;
 }
 
 export type UpdateProfileEmployee = {
+  rank?: string | null;
   prefix?: string | null;
   firstName?: string | null;
   lastName?: string | null;
@@ -253,10 +247,10 @@ export type UpdateProfileEmployee = {
   ethnicity?: string | null;
   telephoneNumber?: string | null;
   citizenId?: string;
-  religionId: string | null;
+  religion: string | null;
   posLevelId?: string | null;
   posTypeId?: string | null;
-  genderId?: string | null;
-  relationshipId?: string | null;
-  bloodGroupId?: string | null;
+  gender?: string | null;
+  relationship?: string | null;
+  bloodGroup?: string | null;
 };