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

no message

Browse source
This commit is contained in:
Kittapath 2024-04-03 16:14:00 +07:00
parent da6b3dcc4e
commit 682010fe66
5 changed files with 72 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/controllers/DevelopmentController.ts
View file

@ -63,7 +63,7 @@ export class DevelopmentController extends Controller {
"โครงการ/หลักสูตรการฝึกอบรม: " +
requestBody.projectName +
" ปีงบประมาณ: " +
requestBody.year +
(requestBody.year + 543) +
" มีอยู่ในระบบแล้ว",
);
}
@ -225,7 +225,7 @@ export class DevelopmentController extends Controller {
"โครงการ/หลักสูตรการฝึกอบรม: " +
requestBody.projectName +
" ปีงบประมาณ: " +
requestBody.year +
(requestBody.year + 543) +
" มีอยู่ในระบบแล้ว",
);
}
@ -443,6 +443,15 @@ export class DevelopmentController extends Controller {
if (!getDevelopment) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลโครงการ/หลักสูตรการฝึกอบรมนี้");
}
return new HttpSuccess(getDevelopment);
let _getDevelopment: any = getDevelopment;
_getDevelopment.actualPeoples = getDevelopment.developmentActualPeoples;
_getDevelopment.plannedPeoples = getDevelopment.developmentPlannedPeoples;
_getDevelopment.actualGoals = getDevelopment.developmentActualGoals;
_getDevelopment.plannedGoals = getDevelopment.developmentPlannedGoals;
delete _getDevelopment.developmentActualPeoples;
delete _getDevelopment.developmentPlannedPeoples;
delete _getDevelopment.developmentActualGoals;
delete _getDevelopment.developmentPlannedGoals;
return new HttpSuccess(_getDevelopment);
}
}

24
src/entities/Development.ts
View file

@ -265,6 +265,22 @@ export class Development extends EntityBase {
})
addressAcademic: string;
@Column({
nullable: true,
type: "datetime",
comment: "วันเริ่มต้นการศึกษาดูงาน",
default: null,
})
dateStudyStart: Date;
@Column({
nullable: true,
type: "datetime",
comment: "วันสิ้นสุดการศึกษาดูงาน",
default: null,
})
dateStudyEnd: Date;
@Column({
nullable: true,
comment: "จังหวัด(ข้อมูลวิชาการ)",
@ -376,6 +392,10 @@ export class CreateDevelopment {
@Column()
provinceActualId: string | null;
@Column()
dateStudyStart: Date | null;
@Column()
dateStudyEnd: Date | null;
@Column()
actualPeoples: CreateActualPeople[];
@Column()
plannedPeoples: CreatePlannedPeople[];
@ -461,6 +481,10 @@ export class UpdateDevelopment {
@Column()
provinceActualId: string | null;
@Column()
dateStudyStart: Date | null;
@Column()
dateStudyEnd: Date | null;
@Column()
actualPeoples: CreateActualPeople[];
@Column()
plannedPeoples: CreatePlannedPeople[];

8
src/entities/DevelopmentHistory.ts
View file

@ -137,11 +137,11 @@ export class DevelopmentHistory extends EntityBase {
@Column({
nullable: true,
type: "datetime",
comment: "คำสั่งลงวันที่/หนังสืออนุมัติลงวันที่",
default: null,
length: 255,
})
dateOrder: string;
dateOrder: Date;
}
export class CreateDevelopmentHistory {
@Column()
@ -167,7 +167,7 @@ export class CreateDevelopmentHistory {
@Column()
order: string | null;
@Column()
dateOrder: string | null;
dateOrder: Date | null;
}
export class UpdateDevelopmentHistory {
@ -194,5 +194,5 @@ export class UpdateDevelopmentHistory {
@Column()
order: string | null;
@Column()
dateOrder: string | null;
dateOrder: Date | null;
}

16
src/migration/1712135164363-update_table_development_add_dateStudyStart.ts Normal file
View file

@ -0,0 +1,16 @@
import { MigrationInterface, QueryRunner } from "typeorm";
export class UpdateTableDevelopmentAddDateStudyStart1712135164363 implements MigrationInterface {
name = 'UpdateTableDevelopmentAddDateStudyStart1712135164363'
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`development\` ADD \`dateStudyStart\` datetime NULL COMMENT 'วันเริ่มต้นการศึกษาดูงาน'`);
await queryRunner.query(`ALTER TABLE \`development\` ADD \`dateStudyEnd\` datetime NULL COMMENT 'วันสิ้นสุดการศึกษาดูงาน'`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`development\` DROP COLUMN \`dateStudyEnd\``);
await queryRunner.query(`ALTER TABLE \`development\` DROP COLUMN \`dateStudyStart\``);
}
}

16
src/migration/1712135296648-update_table_development_add_dateStudyStart1.ts Normal file
View file

@ -0,0 +1,16 @@
import { MigrationInterface, QueryRunner } from "typeorm";
export class UpdateTableDevelopmentAddDateStudyStart11712135296648 implements MigrationInterface {
name = 'UpdateTableDevelopmentAddDateStudyStart11712135296648'
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`developmentHistory\` DROP COLUMN \`dateOrder\``);
await queryRunner.query(`ALTER TABLE \`developmentHistory\` ADD \`dateOrder\` datetime NULL COMMENT 'คำสั่งลงวันที่/หนังสืออนุมัติลงวันที่'`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`developmentHistory\` DROP COLUMN \`dateOrder\``);
await queryRunner.query(`ALTER TABLE \`developmentHistory\` ADD \`dateOrder\` varchar(255) NULL COMMENT 'คำสั่งลงวันที่/หนังสืออนุมัติลงวันที่'`);
}
}