hrms-bangkok/hrms-api-development
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

แก้หมายเหตุพัฒนา

Browse source
This commit is contained in:
Kittapath 2024-07-05 17:36:19 +07:00
parent fdd9c510cc
commit eac232edcc
6 changed files with 62 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/DevelopmentController.ts
View file

@ -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(),

18
src/entities/Development.ts
View file

@ -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;

4
src/entities/DevelopmentProjectTechniqueActual.ts
View file

@ -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;
}

4
src/entities/DevelopmentProjectTechniquePlanned.ts
View file

@ -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;
}

16
src/migration/1720174912913-add_table_dev1.ts Normal file
View file

@ -0,0 +1,16 @@
import { MigrationInterface, QueryRunner } from "typeorm";
export class AddTableDev11720174912913 implements MigrationInterface {
name = 'AddTableDev11720174912913'
public async up(queryRunner: QueryRunner): Promise<void> {
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<void> {
await queryRunner.query(`ALTER TABLE \`developmentProjectTechniqueActual\` DROP COLUMN \`detail\``);
await queryRunner.query(`ALTER TABLE \`developmentProjectTechniquePlanned\` DROP COLUMN \`detail\``);
}
}

20
src/migration/1720175549705-add_table_dev2.ts Normal file
View file

@ -0,0 +1,20 @@
import { MigrationInterface, QueryRunner } from "typeorm";
export class AddTableDev21720175549705 implements MigrationInterface {
name = 'AddTableDev21720175549705'
public async up(queryRunner: QueryRunner): Promise<void> {
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<void> {
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 'รายละเอียด'`);
}
}