คอมเม้นผู้บังคับบัญชา

src/entities/kpiUserEvaluation.ts

@@ -5,6 +5,7 @@ import { KpiUserSpecial } from "./kpiUserSpecial";
 import { KpiUserRole } from "./kpiUserRole";
 import { KpiUserPlanned } from "./kpiUserPlanned";
 import { KpiUserCapacity } from "./kpiUserCapacity";
+import { KpiUserEvaluationReason } from "./kpiUserEvaluationReason";
 @Entity("kpiUserEvaluation")
 export class KpiUserEvaluation extends EntityBase {
   @Column({
@@ -31,14 +32,6 @@ export class KpiUserEvaluation extends EntityBase {
   })
   lastName: string;
 
-  @Column({
-    nullable: true,
-    length: 40,
-    comment: "คีย์นอก(FK)ของตาราง kpiPeriodId",
-    default: null,
-  })
-  kpiPeriodId: string;
-
   @Column({
     nullable: true,
     length: 40,
@@ -91,6 +84,46 @@ export class KpiUserEvaluation extends EntityBase {
   })
   evaluationResults: string;
 
+  @Column({
+    type: "double",
+    nullable: true,
+    default: null,
+    comment: "งานตามแผนปฏิบัติราชการประจำปี ร้อยละ",
+  })
+  plannedPoint: number;
+
+  @Column({
+    type: "double",
+    nullable: true,
+    default: null,
+    comment: "งานตามหน้าที่ความรับผิดชอบหลัก ร้อยละ",
+  })
+  rolePoint: number;
+
+  @Column({
+    type: "double",
+    nullable: true,
+    default: null,
+    comment: "งานที่ได้รับมอบหมายพิเศษ ร้อยละ",
+  })
+  specialPoint: number;
+
+  @Column({
+    type: "double",
+    nullable: true,
+    default: null,
+    comment: "สมรรถนะ ร้อยละ",
+  })
+  capacityPoint: number;
+
+  @Column({
+    nullable: true,
+    length: 40,
+    comment: "คีย์นอก(FK)ของตาราง kpiPeriodId",
+    default: null,
+  })
+  kpiPeriodId: string;
+
   @ManyToOne(() => KpiPeriod, (kpiPeriod) => kpiPeriod.kpiUserEvaluations)
   @JoinColumn({ name: "kpiPeriodId" })
   kpiPeriod: KpiPeriod;
@@ -106,6 +139,12 @@ export class KpiUserEvaluation extends EntityBase {
 
   @OneToMany(() => KpiUserSpecial, (kpiUserSpecial) => kpiUserSpecial.kpiUserEvaluation)
   kpiUserSpecials: KpiUserSpecial[];
+
+  @OneToMany(
+    () => KpiUserEvaluationReason,
+    (kpiUserEvaluationReason) => kpiUserEvaluationReason.kpiUserEvaluation,
+  )
+  kpiUserEvaluationReasons: KpiUserEvaluationReason[];
 }
 
 export class createKpiUserEvaluation {
@@ -148,3 +187,14 @@ export class updateKpiUserCheckEvaluation {
   @Column()
   commanderHighId: string | null;
 }
+
+export class updateKpiUserPointEvaluation {
+  @Column()
+  plannedPoint: number | null;
+  @Column()
+  rolePoint: number | null;
+  @Column()
+  specialPoint: number | null;
+  @Column()
+  capacityPoint: number | null;
+}

src/entities/kpiUserEvaluationReason.ts

@@ -0,0 +1,56 @@
+import { Entity, Column, OneToMany, ManyToOne, JoinColumn } from "typeorm";
+import { EntityBase } from "./base/Base";
+import { KpiPeriod } from "./kpiPeriod";
+import { KpiUserSpecial } from "./kpiUserSpecial";
+import { KpiUserRole } from "./kpiUserRole";
+import { KpiUserPlanned } from "./kpiUserPlanned";
+import { KpiUserCapacity } from "./kpiUserCapacity";
+import { KpiUserEvaluation } from "./kpiUserEvaluation";
+@Entity("kpiUserEvaluationReason")
+export class KpiUserEvaluationReason extends EntityBase {
+  @Column({
+    nullable: true,
+    comment: "หมายเหตุ",
+    length: 255,
+    default: null,
+  })
+  reason: string;
+
+  @Column({
+    nullable: true,
+    comment: "หัวข้อ",
+    length: 255,
+    default: null,
+  })
+  topic: string;
+
+  @Column({
+    nullable: true,
+    comment: "ประเภท",
+    length: 255,
+    default: null,
+  })
+  type: string;
+
+  @Column({
+    nullable: true,
+    length: 40,
+    comment: "คีย์นอก(FK)ของตาราง kpiPeriodId",
+    default: null,
+  })
+  kpiUserEvaluationId: string;
+
+  @ManyToOne(
+    () => KpiUserEvaluation,
+    (kpiUserEvaluation) => kpiUserEvaluation.kpiUserEvaluationReasons,
+  )
+  @JoinColumn({ name: "kpiUserEvaluationId" })
+  kpiUserEvaluation: KpiUserEvaluation;
+}
+
+export class updateKpiUserReasonEvaluation {
+  @Column()
+  reason: string | null;
+  @Column()
+  topic: string | null;
+}