From fb7ccb0a3b545e7ad8fcf7a36982a4163367d19c Mon Sep 17 00:00:00 2001 From: Kittapath Date: Tue, 6 Aug 2024 10:42:45 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?= =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B9=80=E0=B8=A0=E0=B8=97=E0=B9=82?= =?UTF-8?q?=E0=B8=84=E0=B8=A3=E0=B8=87=E0=B8=81=E0=B8=B2=E0=B8=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../KpiUserDevelopmentController.ts | 3 ++ src/entities/kpiUserDevelopment.ts | 33 +++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/src/controllers/KpiUserDevelopmentController.ts b/src/controllers/KpiUserDevelopmentController.ts index 021b0d4..40d3140 100644 --- a/src/controllers/KpiUserDevelopmentController.ts +++ b/src/controllers/KpiUserDevelopmentController.ts @@ -241,6 +241,9 @@ export class KpiUserDevelopmentController extends Controller { reasonDevelopment70: getKpiUserDevelopment.reasonDevelopment70, reasonDevelopment20: getKpiUserDevelopment.reasonDevelopment20, reasonDevelopment10: getKpiUserDevelopment.reasonDevelopment10, + selectType: getKpiUserDevelopment.selectType, + selectTypeYear: getKpiUserDevelopment.selectTypeYear, + selectTypeId: getKpiUserDevelopment.selectTypeId, developmentProjects: getKpiUserDevelopment.developmentProjects.map((x) => x.name).sort(), }; diff --git a/src/entities/kpiUserDevelopment.ts b/src/entities/kpiUserDevelopment.ts index d53af29..0b352c0 100644 --- a/src/entities/kpiUserDevelopment.ts +++ b/src/entities/kpiUserDevelopment.ts @@ -95,6 +95,27 @@ export class KpiUserDevelopment extends EntityBase { }) reasonDevelopment10: string; + @Column({ + nullable: true, + comment: "ประเภทข้อมูลพัฒนา", + default: null, + }) + selectType: string; + + @Column({ + nullable: true, + comment: "ปีพัฒนา", + default: null, + }) + selectTypeYear: string; + + @Column({ + nullable: true, + comment: "id พัฒนา", + default: null, + }) + selectTypeId: string; + @OneToMany( () => DevelopmentProject, (developmentProject: DevelopmentProject) => developmentProject.kpiUserDevelopment, @@ -126,6 +147,12 @@ export class CreateKpiUserDevelopment { @Column() target: string | null; @Column() + selectType: string | null; + @Column() + selectTypeYear: string | null; + @Column() + selectTypeId: string | null; + @Column() achievement10?: string | null; @Column() achievement5?: string | null; @@ -155,6 +182,12 @@ export class UpdateKpiUserDevelopment { @Column() target: string | null; @Column() + selectType: string | null; + @Column() + selectTypeYear: string | null; + @Column() + selectTypeId: string | null; + @Column() achievement10?: string | null; @Column() achievement5?: string | null;