From 1deee019b2b760edd070bbb622d490da6a7a98f2 Mon Sep 17 00:00:00 2001 From: kittapath Date: Tue, 1 Oct 2024 10:31:25 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=9F=E0=B8=B4?= =?UTF-8?q?=E0=B8=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/DevelopmentController.ts | 43 +++++++++------ src/entities/Development.ts | 55 ++++++++++++++++++- ...update_development_add_isReasonActual70.ts | 24 ++++++++ 3 files changed, 102 insertions(+), 20 deletions(-) create mode 100644 src/migration/1727753251629-update_development_add_isReasonActual70.ts diff --git a/src/controllers/DevelopmentController.ts b/src/controllers/DevelopmentController.ts index c476bc3..154e511 100644 --- a/src/controllers/DevelopmentController.ts +++ b/src/controllers/DevelopmentController.ts @@ -2189,9 +2189,15 @@ export class DevelopmentController extends Controller { reasonActual70: getDevelopment.reasonActual70, reasonActual20: getDevelopment.reasonActual20, reasonActual10: getDevelopment.reasonActual10, + isReasonActual70: getDevelopment.isReasonActual70, + isReasonActual20: getDevelopment.isReasonActual20, + isReasonActual10: getDevelopment.isReasonActual10, reasonPlanned70: getDevelopment.reasonPlanned70, reasonPlanned20: getDevelopment.reasonPlanned20, reasonPlanned10: getDevelopment.reasonPlanned10, + isReasonPlanned70: getDevelopment.isReasonPlanned70, + isReasonPlanned20: getDevelopment.isReasonPlanned20, + isReasonPlanned10: getDevelopment.isReasonPlanned10, developmentProjectTechniqueActuals: getDevelopment.developmentProjectTechniqueActuals .map((x) => x.name) .sort(), @@ -2244,6 +2250,9 @@ export class DevelopmentController extends Controller { reasonActual70: getDevelopment.reasonActual70, reasonActual20: getDevelopment.reasonActual20, reasonActual10: getDevelopment.reasonActual10, + isReasonActual70: getDevelopment.isReasonActual70, + isReasonActual20: getDevelopment.isReasonActual20, + isReasonActual10: getDevelopment.isReasonActual10, developmentProjectTechniqueActuals: getDevelopment.developmentProjectTechniqueActuals .map((x) => x.name) .sort(), @@ -2484,20 +2493,20 @@ export class DevelopmentController extends Controller { .PostData(request, "/org/profile/development", { type: "DEVELOP", profileId: x.profileId, - name: "", - target: "", - // achievement10: x.development.achievement10, - // achievement5: x.development.achievement5, - // achievement0: x.development.achievement0, + name: x.development.projectName, + achievement10: null, + achievement5: null, + achievement0: null, kpiDevelopmentId: x.development.id, reasonDevelopment70: x.development.reasonActual70, reasonDevelopment20: x.development.reasonActual20, reasonDevelopment10: x.development.reasonActual10, - isDevelopment70: false, - isDevelopment20: false, - isDevelopment10: false, - // summary: x.development.summary, - // point: x.development.point, + isDevelopment70: x.development.isReasonActual70, + isDevelopment20: x.development.isReasonActual20, + isDevelopment10: x.development.isReasonActual10, + developmentTarget: null, + developmentResults: null, + developmentReport: null, developmentProjects: x.development.developmentProjectTechniqueActuals.map( (x) => x.name, ), @@ -2513,11 +2522,10 @@ export class DevelopmentController extends Controller { .PostData(request, "/org/profile-employee/development", { type: "DEVELOP", profileEmployeeId: x.profileId, - name: "", - target: "", - // achievement10: x.development.achievement10, - // achievement5: x.development.achievement5, - // achievement0: x.development.achievement0, + name: x.development.projectName, + achievement10: null, + achievement5: null, + achievement0: null, kpiDevelopmentId: x.development.id, reasonDevelopment70: x.development.reasonActual70, reasonDevelopment20: x.development.reasonActual20, @@ -2525,8 +2533,9 @@ export class DevelopmentController extends Controller { isDevelopment70: false, isDevelopment20: false, isDevelopment10: false, - // summary: x.development.summary, - // point: x.development.point, + developmentTarget: null, + developmentResults: null, + developmentReport: null, developmentProjects: x.development.developmentProjectTechniqueActuals.map( (x) => x.name, ), diff --git a/src/entities/Development.ts b/src/entities/Development.ts index eb4b00e..0604367 100644 --- a/src/entities/Development.ts +++ b/src/entities/Development.ts @@ -294,6 +294,25 @@ export class Development extends EntityBase { }) reasonPlanned10: string; + @Column({ + comment: "รายละเอียดอื่นๆ 70 แผน", + default: false, + }) + isReasonPlanned70: boolean; + + @Column({ + comment: "รายละเอียดอื่นๆ 20 แผน", + default: false, + }) + isReasonPlanned20: boolean; + + @Column({ + nullable: true, + comment: "รายละเอียดอื่นๆ 10 แผน", + default: null, + }) + isReasonPlanned10: string; + @OneToMany( () => DevelopmentProjectTechniquePlanned, (developmentProjectTechniquePlanned: DevelopmentProjectTechniquePlanned) => @@ -322,6 +341,25 @@ export class Development extends EntityBase { }) reasonActual10: string; + @Column({ + comment: "รายละเอียดอื่นๆ 70 จริง", + default: false, + }) + isReasonActual70: boolean; + + @Column({ + comment: "รายละเอียดอื่นๆ 20 จริง", + default: false, + }) + isReasonActual20: boolean; + + @Column({ + nullable: true, + comment: "รายละเอียดอื่นๆ 10 จริง", + default: null, + }) + isReasonActual10: string; + @OneToMany( () => DevelopmentProjectTechniqueActual, (developmentProjectTechniqueActual: DevelopmentProjectTechniqueActual) => @@ -775,6 +813,12 @@ export class UpdateDevelopment3 { @Column() reasonPlanned10?: string; @Column() + isReasonPlanned70?: string; + @Column() + isReasonPlanned20?: string; + @Column() + isReasonPlanned10?: string; + @Column() isBackActual?: boolean | null; @Column() isHoldActual?: boolean | null; @@ -793,6 +837,12 @@ export class UpdateDevelopment3 { @Column() reasonActual10?: string; @Column() + isReasonActual70?: boolean; + @Column() + isReasonActual20?: boolean; + @Column() + isReasonActual10?: boolean; + @Column() strategyChildPlannedId?: string | null; @Column() strategyChildPlannedNode?: number | null; @@ -810,7 +860,6 @@ export class UpdateDevelopment4 { @Column() projectEvaluation: string | null; //end - } export class UpdateDevelopment5 { //new @@ -866,7 +915,7 @@ export class UpdateDevelopment8_1 { //end } -export class UpdateDevelopment8{ +export class UpdateDevelopment8 { @Column() expect: string | null; -} \ No newline at end of file +} diff --git a/src/migration/1727753251629-update_development_add_isReasonActual70.ts b/src/migration/1727753251629-update_development_add_isReasonActual70.ts new file mode 100644 index 0000000..32c8f84 --- /dev/null +++ b/src/migration/1727753251629-update_development_add_isReasonActual70.ts @@ -0,0 +1,24 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class UpdateDevelopmentAddIsReasonActual701727753251629 implements MigrationInterface { + name = 'UpdateDevelopmentAddIsReasonActual701727753251629' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`development\` ADD \`isReasonPlanned70\` tinyint NOT NULL COMMENT 'รายละเอียดอื่นๆ 70 แผน' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`development\` ADD \`isReasonPlanned20\` tinyint NOT NULL COMMENT 'รายละเอียดอื่นๆ 20 แผน' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`development\` ADD \`isReasonPlanned10\` varchar(255) NULL COMMENT 'รายละเอียดอื่นๆ 10 แผน'`); + await queryRunner.query(`ALTER TABLE \`development\` ADD \`isReasonActual70\` tinyint NOT NULL COMMENT 'รายละเอียดอื่นๆ 70 จริง' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`development\` ADD \`isReasonActual20\` tinyint NOT NULL COMMENT 'รายละเอียดอื่นๆ 20 จริง' DEFAULT 0`); + await queryRunner.query(`ALTER TABLE \`development\` ADD \`isReasonActual10\` varchar(255) NULL COMMENT 'รายละเอียดอื่นๆ 10 จริง'`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`development\` DROP COLUMN \`isReasonActual10\``); + await queryRunner.query(`ALTER TABLE \`development\` DROP COLUMN \`isReasonActual20\``); + await queryRunner.query(`ALTER TABLE \`development\` DROP COLUMN \`isReasonActual70\``); + await queryRunner.query(`ALTER TABLE \`development\` DROP COLUMN \`isReasonPlanned10\``); + await queryRunner.query(`ALTER TABLE \`development\` DROP COLUMN \`isReasonPlanned20\``); + await queryRunner.query(`ALTER TABLE \`development\` DROP COLUMN \`isReasonPlanned70\``); + } + +}