From 3e686addec93e60bcf1f1dafc1e72a47ee239ac0 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Mon, 15 Jul 2024 21:27:38 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?= =?UTF-8?q?=20=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=A5=E0=B8=B0=E0=B9=80?= =?UTF-8?q?=E0=B8=AD=E0=B8=B5=E0=B8=A2=E0=B8=94=E0=B8=AD=E0=B8=B7=E0=B9=88?= =?UTF-8?q?=E0=B8=99=E0=B9=86=2070=20=E0=B8=88=E0=B8=A3=E0=B8=B4=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/DevelopmentController.ts | 8 +++- src/entities/Development.ts | 48 +++++++++++++++++++++--- 2 files changed, 48 insertions(+), 8 deletions(-) diff --git a/src/controllers/DevelopmentController.ts b/src/controllers/DevelopmentController.ts index 8cbb1ec..fd98192 100644 --- a/src/controllers/DevelopmentController.ts +++ b/src/controllers/DevelopmentController.ts @@ -1494,8 +1494,12 @@ export class DevelopmentController extends Controller { projectDayBackActual: getDevelopment.projectDayBackActual, projectDayHoldActual: getDevelopment.projectDayHoldActual, projectNigthHoldActual: getDevelopment.projectNigthHoldActual, - reasonActual: getDevelopment.reasonActual, - reasonPlanned: getDevelopment.reasonPlanned, + reasonActual70: getDevelopment.reasonActual70, + reasonActual20: getDevelopment.reasonActual20, + reasonActual10: getDevelopment.reasonActual10, + reasonPlanned70: getDevelopment.reasonPlanned70, + reasonPlanned20: getDevelopment.reasonPlanned20, + reasonPlanned10: getDevelopment.reasonPlanned10, developmentProjectTechniqueActuals: getDevelopment.developmentProjectTechniqueActuals .map((x) => x.name) .sort(), diff --git a/src/entities/Development.ts b/src/entities/Development.ts index f41987d..f65b06e 100644 --- a/src/entities/Development.ts +++ b/src/entities/Development.ts @@ -262,10 +262,24 @@ export class Development extends EntityBase { @Column({ nullable: true, - comment: "รายละเอียดอื่นๆ แผน", + comment: "รายละเอียดอื่นๆ 70 แผน", default: null, }) - reasonPlanned: string; + reasonPlanned70: string; + + @Column({ + nullable: true, + comment: "รายละเอียดอื่นๆ 20 แผน", + default: null, + }) + reasonPlanned20: string; + + @Column({ + nullable: true, + comment: "รายละเอียดอื่นๆ 10 แผน", + default: null, + }) + reasonPlanned10: string; @OneToMany( () => DevelopmentProjectTechniquePlanned, @@ -276,10 +290,24 @@ export class Development extends EntityBase { @Column({ nullable: true, - comment: "รายละเอียดอื่นๆ จริง", + comment: "รายละเอียดอื่นๆ 70 จริง", default: null, }) - reasonActual: string; + reasonActual70: string; + + @Column({ + nullable: true, + comment: "รายละเอียดอื่นๆ 20 จริง", + default: null, + }) + reasonActual20: string; + + @Column({ + nullable: true, + comment: "รายละเอียดอื่นๆ 10 จริง", + default: null, + }) + reasonActual10: string; @OneToMany( () => DevelopmentProjectTechniqueActual, @@ -686,7 +714,11 @@ export class UpdateDevelopment3 { @Column() developmentProjectTechniquePlanneds?: string[]; @Column() - reasonPlanned?: string; + reasonPlanned70?: string; + @Column() + reasonPlanned20?: string; + @Column() + reasonPlanned10?: string; @Column() isBackActual?: boolean | null; @Column() @@ -700,7 +732,11 @@ export class UpdateDevelopment3 { @Column() developmentProjectTechniqueActuals?: string[]; @Column() - reasonActual?: string; + reasonActual70?: string; + @Column() + reasonActual20?: string; + @Column() + reasonActual10?: string; @Column() strategyChildPlannedId?: string | null; @Column()