From d175165cea8bb22a991cc683642bdb8fb1b15eb9 Mon Sep 17 00:00:00 2001 From: kittapath Date: Thu, 19 Sep 2024 15:57:01 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20=E0=B8=95?= =?UTF-8?q?=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87=20?= =?UTF-8?q?=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87=E0=B8=AA=E0=B8=A3=E0=B9=89?= =?UTF-8?q?=E0=B8=B2=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/CommandController.ts | 4 ++++ src/controllers/CommandTypeController.ts | 6 +++++- src/controllers/EmployeePositionController.ts | 4 ++-- src/controllers/PositionController.ts | 4 ++-- src/entities/CommandType.ts | 20 +++++++++++++++++++ src/entities/EmployeePosMaster.ts | 9 --------- src/entities/PosMaster.ts | 3 --- ...344-update_commandType_add_isAttachment.ts | 18 +++++++++++++++++ 8 files changed, 51 insertions(+), 17 deletions(-) create mode 100644 src/migration/1726736124344-update_commandType_add_isAttachment.ts diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts index c09c9445..6a15956c 100644 --- a/src/controllers/CommandController.ts +++ b/src/controllers/CommandController.ts @@ -183,6 +183,8 @@ export class CommandController extends Controller { detailHeader: command.detailHeader, detailBody: command.detailBody, detailFooter: command.detailFooter, + commandAffectDate: command.commandAffectDate, + commandExcecuteDate: command.commandExcecuteDate, commandTypeName: command.commandType?.name || null, commandSysId: command.commandType?.commandSysId || null, }; @@ -207,6 +209,8 @@ export class CommandController extends Controller { detailHeader: string | null; detailBody: string | null; detailFooter: string | null; + commandAffectDate: Date | null; + commandExcecuteDate: Date | null; }, @Request() request: RequestWithUser, ) { diff --git a/src/controllers/CommandTypeController.ts b/src/controllers/CommandTypeController.ts index b887b087..12973079 100644 --- a/src/controllers/CommandTypeController.ts +++ b/src/controllers/CommandTypeController.ts @@ -54,6 +54,8 @@ export class CommandTypeController extends Controller { "detailHeader", "detailBody", "detailFooter", + "subtitle", + "isAttachment", "createdAt", "lastUpdatedAt", "createdFullName", @@ -114,6 +116,8 @@ export class CommandTypeController extends Controller { "detailHeader", "detailBody", "detailFooter", + "subtitle", + "isAttachment", ], }); if (!_commandType) { @@ -201,7 +205,7 @@ export class CommandTypeController extends Controller { _commandType.lastUpdateUserId = request.user.sub; _commandType.lastUpdateFullName = request.user.name; _commandType.lastUpdatedAt = new Date(); - this.commandTypeRepository.merge(_commandType, requestBody); + Object.assign(_commandType, requestBody); await this.commandTypeRepository.save(_commandType); return new HttpSuccess(_commandType.id); } diff --git a/src/controllers/EmployeePositionController.ts b/src/controllers/EmployeePositionController.ts index 1dc17ee8..75d06716 100644 --- a/src/controllers/EmployeePositionController.ts +++ b/src/controllers/EmployeePositionController.ts @@ -633,8 +633,8 @@ export class EmployeePositionController extends Controller { let _null: any = null; posMaster.posMasterNo = requestBody.posMasterNo; posMaster.isDirector = requestBody.isDirector; - posMaster.isStaff = requestBody.isStaff; - posMaster.positionSign = requestBody.positionSign == null ? _null : requestBody.positionSign; + // posMaster.isStaff = requestBody.isStaff == null?_null:requestBody.isStaff; + // posMaster.positionSign = requestBody.positionSign == null ? _null : requestBody.positionSign; // posMaster.isOfficer = requestBody.isOfficer; posMaster.posMasterNoPrefix = requestBody.posMasterNoPrefix; posMaster.posMasterNoSuffix = requestBody.posMasterNoSuffix; diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts index d1b371f9..646276cf 100644 --- a/src/controllers/PositionController.ts +++ b/src/controllers/PositionController.ts @@ -840,9 +840,9 @@ export class PositionController extends Controller { } let _null: any = null; posMaster.isDirector = requestBody.isDirector; - posMaster.isStaff = requestBody.isStaff; + posMaster.isStaff = requestBody.isStaff == null || requestBody.isStaff == undefined ? _null : requestBody.isStaff; // posMaster.isOfficer = requestBody.isOfficer; - posMaster.positionSign = requestBody.positionSign == null ? _null : requestBody.positionSign; + posMaster.positionSign = requestBody.positionSign == null || requestBody.positionSign == undefined ? _null : requestBody.positionSign; posMaster.posMasterNo = requestBody.posMasterNo; posMaster.posMasterNoPrefix = requestBody.posMasterNoPrefix; posMaster.posMasterNoSuffix = requestBody.posMasterNoSuffix; diff --git a/src/entities/CommandType.ts b/src/entities/CommandType.ts index d85a2a53..86a34ba3 100644 --- a/src/entities/CommandType.ts +++ b/src/entities/CommandType.ts @@ -74,6 +74,20 @@ export class CommandType extends EntityBase { }) isActive: boolean; + @Column({ + comment: "สถานะบัญชีแนบท้าย", + default: true, + }) + isAttachment: boolean; + + @Column({ + nullable: true, + comment: "คำอธิบาย", + type: "text", + default: null, + }) + subtitle: string; + @OneToMany(() => Command, (command) => command.commandType) commands: Command[]; @@ -99,6 +113,12 @@ export class CreateCommandType { @Column() commandSysId: string; + + @Column() + subtitle: string | null; + + @Column() + isAttachment: boolean; } export type UpdateCommandType = Partial; diff --git a/src/entities/EmployeePosMaster.ts b/src/entities/EmployeePosMaster.ts index bb2c8881..59028072 100644 --- a/src/entities/EmployeePosMaster.ts +++ b/src/entities/EmployeePosMaster.ts @@ -266,15 +266,6 @@ export class CreateEmployeePosMaster { @Column() isDirector: boolean; - - @Column() - isStaff: boolean; - - // @Column() - // isOfficer: boolean; - - @Column() - positionSign: string | null; } export type UpdateEmployeePosMaster = Partial; diff --git a/src/entities/PosMaster.ts b/src/entities/PosMaster.ts index 4935b2f6..2c8a2a41 100644 --- a/src/entities/PosMaster.ts +++ b/src/entities/PosMaster.ts @@ -277,9 +277,6 @@ export class CreatePosMaster { @Column() isStaff: boolean; - // @Column() - // isOfficer: boolean; - @Column() positionSign: string | null; } diff --git a/src/migration/1726736124344-update_commandType_add_isAttachment.ts b/src/migration/1726736124344-update_commandType_add_isAttachment.ts new file mode 100644 index 00000000..92d34239 --- /dev/null +++ b/src/migration/1726736124344-update_commandType_add_isAttachment.ts @@ -0,0 +1,18 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class UpdateCommandTypeAddIsAttachment1726736124344 implements MigrationInterface { + name = 'UpdateCommandTypeAddIsAttachment1726736124344' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`commandType\` ADD \`isAttachment\` tinyint NOT NULL COMMENT 'สถานะบัญชีแนบท้าย' DEFAULT 1`); + await queryRunner.query(`ALTER TABLE \`commandType\` ADD \`subtitle\` text NULL COMMENT 'คำอธิบาย'`); + // await queryRunner.query(`ALTER TABLE \`HR_POSITION_OFFICER\` ADD \`FLAG_PERSON_TYPE\` text NULL`); + } + + public async down(queryRunner: QueryRunner): Promise { + // await queryRunner.query(`ALTER TABLE \`HR_POSITION_OFFICER\` DROP COLUMN \`FLAG_PERSON_TYPE\``); + await queryRunner.query(`ALTER TABLE \`commandType\` DROP COLUMN \`subtitle\``); + await queryRunner.query(`ALTER TABLE \`commandType\` DROP COLUMN \`isAttachment\``); + } + +}