From 428ac7b2b4567bca49800fce15ce8ed470a77802 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Wed, 17 Apr 2024 13:42:26 +0700 Subject: [PATCH] no message --- .../DevelopmentScholarshipController.ts | 4 ++- src/entities/DevelopmentScholarship.ts | 35 ++++++++++++++----- ...-update_table_dev_add_governmentEndDate.ts | 22 ++++++++++++ ...update_table_dev_add_governmentEndDate1.ts | 14 ++++++++ 4 files changed, 66 insertions(+), 9 deletions(-) create mode 100644 src/migration/1713332483208-update_table_dev_add_governmentEndDate.ts create mode 100644 src/migration/1713334672151-update_table_dev_add_governmentEndDate1.ts diff --git a/src/controllers/DevelopmentScholarshipController.ts b/src/controllers/DevelopmentScholarshipController.ts index 520135e..830dced 100644 --- a/src/controllers/DevelopmentScholarshipController.ts +++ b/src/controllers/DevelopmentScholarshipController.ts @@ -360,10 +360,12 @@ export class DevelopmentScholarshipController extends Controller { "scholarshipYear", "scholarshipType", "fundType", + "bookNumber", + "bookDate", "governmentDate", + "governmentEndDate", "isGraduated", "graduatedDate", - "isNoGraduated", "graduatedReason", "root", ], diff --git a/src/entities/DevelopmentScholarship.ts b/src/entities/DevelopmentScholarship.ts index 7ad4156..0b5a3a8 100644 --- a/src/entities/DevelopmentScholarship.ts +++ b/src/entities/DevelopmentScholarship.ts @@ -474,14 +474,37 @@ export class DevelopmentScholarship extends EntityBase { }) isNoUseBudget: boolean; + @Column({ + nullable: true, + comment: "เลขที่หนังสือรายงานตัวกลับเข้าปฏิบัติราชการ", + default: null, + }) + bookNumber: string; + @Column({ nullable: true, type: "datetime", - comment: "กลับเข้ารับราชการตั้งแต่", + comment: " หนังสือรายงานตัวกลับเข้าปฏิบัติราชการลงวันที่", + default: null, + }) + bookDate: Date; + + @Column({ + nullable: true, + type: "datetime", + comment: "วันที่กลับเข้าปฏิบัติราชการ", default: null, }) governmentDate: Date; + @Column({ + nullable: true, + type: "datetime", + comment: "วันสิ้นสุดภาระผูกพัน", + default: null, + }) + governmentEndDate: Date; + @Column({ comment: "สำเร็จการศึกษาตามที่หลักสูตรกำหนด", default: false, @@ -496,12 +519,6 @@ export class DevelopmentScholarship extends EntityBase { }) graduatedDate: Date; - @Column({ - comment: "เสร็จสิ้นการศึกษาตามที่หลักสูตรกำหนดแล้วแต่ยังไม่สำเร็จการศึกษา", - default: false, - }) - isNoGraduated: boolean; - @Column({ nullable: true, comment: "เนื่องจาก", @@ -628,9 +645,11 @@ export class UpdateDevelopmentScholarship { } export class UpdateDevelopmentScholarshipUser { + bookNumber: string | null; + bookDate: Date | null; governmentDate: Date | null; + governmentEndDate: Date | null; isGraduated: boolean | null; graduatedDate: Date | null; - isNoGraduated: boolean | null; graduatedReason: string | null; } diff --git a/src/migration/1713332483208-update_table_dev_add_governmentEndDate.ts b/src/migration/1713332483208-update_table_dev_add_governmentEndDate.ts new file mode 100644 index 0000000..4b62df6 --- /dev/null +++ b/src/migration/1713332483208-update_table_dev_add_governmentEndDate.ts @@ -0,0 +1,22 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class UpdateTableDevAddGovernmentEndDate1713332483208 implements MigrationInterface { + name = 'UpdateTableDevAddGovernmentEndDate1713332483208' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`developmentScholarship\` ADD \`bookNumber\` varchar(255) NULL COMMENT 'เลขที่หนังสือรายงานตัวกลับเข้าปฏิบัติราชการ'`); + await queryRunner.query(`ALTER TABLE \`developmentScholarship\` ADD \`bookDate\` datetime NULL COMMENT ' หนังสือรายงานตัวกลับเข้าปฏิบัติราชการลงวันที่'`); + await queryRunner.query(`ALTER TABLE \`developmentScholarship\` ADD \`governmentEndDate\` datetime NULL COMMENT 'วันสิ้นสุดภาระผูกพัน'`); + await queryRunner.query(`ALTER TABLE \`developmentScholarship\` CHANGE \`governmentDate\` \`governmentDate\` datetime NULL COMMENT 'วันที่กลับเข้าปฏิบัติราชการ'`); + await queryRunner.query(`ALTER TABLE \`strategyChild5\` CHANGE \`strategyChild5Name\` \`strategyChild5Name\` varchar(255) NULL COMMENT 'กลยุทธ์ที่/เป้าประสงค์ที่'`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`strategyChild5\` CHANGE \`strategyChild5Name\` \`strategyChild5Name\` varchar(255) NULL COMMENT 'กลยุทธ์ที่'`); + await queryRunner.query(`ALTER TABLE \`developmentScholarship\` CHANGE \`governmentDate\` \`governmentDate\` datetime NULL COMMENT 'กลับเข้ารับราชการตั้งแต่'`); + await queryRunner.query(`ALTER TABLE \`developmentScholarship\` DROP COLUMN \`governmentEndDate\``); + await queryRunner.query(`ALTER TABLE \`developmentScholarship\` DROP COLUMN \`bookDate\``); + await queryRunner.query(`ALTER TABLE \`developmentScholarship\` DROP COLUMN \`bookNumber\``); + } + +} diff --git a/src/migration/1713334672151-update_table_dev_add_governmentEndDate1.ts b/src/migration/1713334672151-update_table_dev_add_governmentEndDate1.ts new file mode 100644 index 0000000..07d2359 --- /dev/null +++ b/src/migration/1713334672151-update_table_dev_add_governmentEndDate1.ts @@ -0,0 +1,14 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class UpdateTableDevAddGovernmentEndDate11713334672151 implements MigrationInterface { + name = 'UpdateTableDevAddGovernmentEndDate11713334672151' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`developmentScholarship\` DROP COLUMN \`isNoGraduated\``); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`developmentScholarship\` ADD \`isNoGraduated\` tinyint NOT NULL COMMENT 'เสร็จสิ้นการศึกษาตามที่หลักสูตรกำหนดแล้วแต่ยังไม่สำเร็จการศึกษา' DEFAULT '0'`); + } + +}