From eac232edcc1d717ff64125a9b171c69a74f3a24c Mon Sep 17 00:00:00 2001 From: Kittapath Date: Fri, 5 Jul 2024 17:36:19 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=AB=E0=B8=A1?= =?UTF-8?q?=E0=B8=B2=E0=B8=A2=E0=B9=80=E0=B8=AB=E0=B8=95=E0=B8=B8=E0=B8=9E?= =?UTF-8?q?=E0=B8=B1=E0=B8=92=E0=B8=99=E0=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/DevelopmentController.ts | 2 ++ src/entities/Development.ts | 18 +++++++++++++++++ .../DevelopmentProjectTechniqueActual.ts | 4 +++- .../DevelopmentProjectTechniquePlanned.ts | 4 +++- src/migration/1720174912913-add_table_dev1.ts | 16 +++++++++++++++ src/migration/1720175549705-add_table_dev2.ts | 20 +++++++++++++++++++ 6 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 src/migration/1720174912913-add_table_dev1.ts create mode 100644 src/migration/1720175549705-add_table_dev2.ts diff --git a/src/controllers/DevelopmentController.ts b/src/controllers/DevelopmentController.ts index 8768eae..891082c 100644 --- a/src/controllers/DevelopmentController.ts +++ b/src/controllers/DevelopmentController.ts @@ -1494,6 +1494,8 @@ export class DevelopmentController extends Controller { projectDayBackActual: getDevelopment.projectDayBackActual, projectDayHoldActual: getDevelopment.projectDayHoldActual, projectNigthHoldActual: getDevelopment.projectNigthHoldActual, + reasonActual: getDevelopment.reasonActual, + reasonPlanned: getDevelopment.reasonPlanned, developmentProjectTechniqueActuals: getDevelopment.developmentProjectTechniqueActuals .map((x) => x.name) .sort(), diff --git a/src/entities/Development.ts b/src/entities/Development.ts index 1bad0b7..f41987d 100644 --- a/src/entities/Development.ts +++ b/src/entities/Development.ts @@ -260,6 +260,13 @@ export class Development extends EntityBase { }) projectNigthHoldActual: number; + @Column({ + nullable: true, + comment: "รายละเอียดอื่นๆ แผน", + default: null, + }) + reasonPlanned: string; + @OneToMany( () => DevelopmentProjectTechniquePlanned, (developmentProjectTechniquePlanned: DevelopmentProjectTechniquePlanned) => @@ -267,6 +274,13 @@ export class Development extends EntityBase { ) developmentProjectTechniquePlanneds: DevelopmentProjectTechniquePlanned[]; + @Column({ + nullable: true, + comment: "รายละเอียดอื่นๆ จริง", + default: null, + }) + reasonActual: string; + @OneToMany( () => DevelopmentProjectTechniqueActual, (developmentProjectTechniqueActual: DevelopmentProjectTechniqueActual) => @@ -672,6 +686,8 @@ export class UpdateDevelopment3 { @Column() developmentProjectTechniquePlanneds?: string[]; @Column() + reasonPlanned?: string; + @Column() isBackActual?: boolean | null; @Column() isHoldActual?: boolean | null; @@ -684,6 +700,8 @@ export class UpdateDevelopment3 { @Column() developmentProjectTechniqueActuals?: string[]; @Column() + reasonActual?: string; + @Column() strategyChildPlannedId?: string | null; @Column() strategyChildPlannedNode?: number | null; diff --git a/src/entities/DevelopmentProjectTechniqueActual.ts b/src/entities/DevelopmentProjectTechniqueActual.ts index a437e00..0fa3b08 100644 --- a/src/entities/DevelopmentProjectTechniqueActual.ts +++ b/src/entities/DevelopmentProjectTechniqueActual.ts @@ -12,7 +12,9 @@ export class DevelopmentProjectTechniqueActual extends EntityBase { // ACADEMIC_SEMINAR = การสัมมนาทางวิชาการ // WORKSHOP = การสัมมนาเชิงปฏิบัติการ // SPECIAL_LECTURE = การบรรยายพิเศษ + // LECTURE = การบรรยาย // STUDY_TRAINING = การฝึกศึกษา + // OTHER = อื่น nullable: true, comment: "เทคนิควิธีการที่ใช้ในการพัฒนา", default: null, @@ -35,5 +37,5 @@ export class DevelopmentProjectTechniqueActual extends EntityBase { } export class CreateDevelopmentProjectTechniqueActual { @Column() - name: number; + name: string; } diff --git a/src/entities/DevelopmentProjectTechniquePlanned.ts b/src/entities/DevelopmentProjectTechniquePlanned.ts index bb8d3dc..7ba3c7c 100644 --- a/src/entities/DevelopmentProjectTechniquePlanned.ts +++ b/src/entities/DevelopmentProjectTechniquePlanned.ts @@ -12,7 +12,9 @@ export class DevelopmentProjectTechniquePlanned extends EntityBase { // ACADEMIC_SEMINAR = การสัมมนาทางวิชาการ // WORKSHOP = การสัมมนาเชิงปฏิบัติการ // SPECIAL_LECTURE = การบรรยายพิเศษ + // LECTURE = การบรรยาย // STUDY_TRAINING = การฝึกศึกษา + // OTHER = อื่น nullable: true, comment: "เทคนิควิธีการที่ใช้ในการพัฒนา", default: null, @@ -35,5 +37,5 @@ export class DevelopmentProjectTechniquePlanned extends EntityBase { } export class CreateDevelopmentProjectTechniquePlanned { @Column() - name: number; + name: string; } diff --git a/src/migration/1720174912913-add_table_dev1.ts b/src/migration/1720174912913-add_table_dev1.ts new file mode 100644 index 0000000..9b89534 --- /dev/null +++ b/src/migration/1720174912913-add_table_dev1.ts @@ -0,0 +1,16 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class AddTableDev11720174912913 implements MigrationInterface { + name = 'AddTableDev11720174912913' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`developmentProjectTechniquePlanned\` ADD \`detail\` varchar(255) NULL COMMENT 'รายละเอียด'`); + await queryRunner.query(`ALTER TABLE \`developmentProjectTechniqueActual\` ADD \`detail\` varchar(255) NULL COMMENT 'รายละเอียด'`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`developmentProjectTechniqueActual\` DROP COLUMN \`detail\``); + await queryRunner.query(`ALTER TABLE \`developmentProjectTechniquePlanned\` DROP COLUMN \`detail\``); + } + +} diff --git a/src/migration/1720175549705-add_table_dev2.ts b/src/migration/1720175549705-add_table_dev2.ts new file mode 100644 index 0000000..4204f05 --- /dev/null +++ b/src/migration/1720175549705-add_table_dev2.ts @@ -0,0 +1,20 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class AddTableDev21720175549705 implements MigrationInterface { + name = 'AddTableDev21720175549705' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`developmentProjectTechniquePlanned\` DROP COLUMN \`detail\``); + await queryRunner.query(`ALTER TABLE \`developmentProjectTechniqueActual\` DROP COLUMN \`detail\``); + await queryRunner.query(`ALTER TABLE \`development\` ADD \`reasonPlanned\` varchar(255) NULL COMMENT 'รายละเอียดอื่นๆ แผน'`); + await queryRunner.query(`ALTER TABLE \`development\` ADD \`reasonActual\` varchar(255) NULL COMMENT 'รายละเอียดอื่นๆ จริง'`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`development\` DROP COLUMN \`reasonActual\``); + await queryRunner.query(`ALTER TABLE \`development\` DROP COLUMN \`reasonPlanned\``); + await queryRunner.query(`ALTER TABLE \`developmentProjectTechniqueActual\` ADD \`detail\` varchar(255) NULL COMMENT 'รายละเอียด'`); + await queryRunner.query(`ALTER TABLE \`developmentProjectTechniquePlanned\` ADD \`detail\` varchar(255) NULL COMMENT 'รายละเอียด'`); + } + +}