คำสั่งรักษาการ

src/entities/ProfileActposition.ts

@@ -3,6 +3,7 @@ import { EntityBase } from "./base/Base";
 import { Profile } from "./Profile";
 import { ProfileActpositionHistory } from "./ProfileActpositionHistory";
 import { ProfileEmployee } from "./ProfileEmployee";
+import { Command } from "./Command";
 
 @Entity("profileActposition")
 export class ProfileActposition extends EntityBase {
@@ -50,6 +51,33 @@ export class ProfileActposition extends EntityBase {
   })
   status: boolean;
 
+  @Column({
+    nullable: true,
+    comment: "เลขที่คำสั่ง",
+    type: "text",
+    default: null,
+  })
+  refCommandNo: string;
+
+  @Column({
+    comment: "วันที่ออกคำสั่ง",
+    type: "datetime",
+    nullable: true,
+  })
+  refCommandDate: Date;
+
+  @Column({
+    nullable: true,
+    length: 40,
+    comment: "คีย์นอก(FK)ของตาราง command",
+    default: null,
+  })
+  commandId: string;
+
+  @ManyToOne(() => Command, (command) => command.profileSalarys)
+  @JoinColumn({ name: "commandId" })
+  command: Command;
+
   @Column({
     nullable: true,
     length: 40,

src/entities/ProfileAssistance.ts

@@ -3,6 +3,7 @@ import { EntityBase } from "./base/Base";
 import { Profile } from "./Profile";
 import { ProfileAssistanceHistory } from "./ProfileAssistanceHistory";
 import { ProfileEmployee } from "./ProfileEmployee";
+import { Command } from "./Command";
 
 @Entity("profileAssistance")
 export class ProfileAssistance extends EntityBase {
@@ -57,6 +58,25 @@ export class ProfileAssistance extends EntityBase {
   })
   isUpload: boolean;
 
+  @Column({
+    comment: "วันที่ออกคำสั่ง",
+    type: "datetime",
+    nullable: true,
+  })
+  refCommandDate: Date;
+
+  @Column({
+    nullable: true,
+    length: 40,
+    comment: "คีย์นอก(FK)ของตาราง command",
+    default: null,
+  })
+  commandId: string;
+
+  @ManyToOne(() => Command, (command) => command.profileSalarys)
+  @JoinColumn({ name: "commandId" })
+  command: Command;
+
   @Column({
     nullable: true,
     length: 40,
@@ -87,6 +107,8 @@ export class CreateProfileAssistance {
   dateEnd: Date | null;
   commandNo: string | null;
   document: string | null;
+  refCommandDate?: string | null;
+  commandId?: string | null;
 }
 
 export class CreateProfileAssistanceEmployee {
@@ -96,6 +118,8 @@ export class CreateProfileAssistanceEmployee {
   dateEnd: Date | null;
   commandNo: string | null;
   document: string | null;
+  refCommandDate?: string | null;
+  commandId?: string | null;
 }
 
 export type UpdateProfileAssistance = {
@@ -105,4 +129,6 @@ export type UpdateProfileAssistance = {
   commandNo?: string | null;
   document?: string | null;
   isUpload?: boolean | null;
+  refCommandDate?: string | null;
+  commandId?: string | null;
 };