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

แก้ฟิว ออกคำสั่ง

Browse source
This commit is contained in:
kittapath 2024-10-02 13:50:36 +07:00
parent ba8d78b11c
commit 2af2f32cf7
3 changed files with 39 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/controllers/CommandController.ts
View file

@ -276,10 +276,7 @@ export class CommandController extends Controller {
.map((x) => ({
id: x.id,
citizenId: x.citizenId,
prefix: x.prefix,
firstName: x.firstName,
lastName: x.lastName,
// profileId: x.profileId,
fullName: x.fullName,
order: x.order,
remarkVertical: x.remarkVertical,
remarkHorizontal: x.remarkHorizontal,
@ -992,9 +989,7 @@ export class CommandController extends Controller {
persons: {
refId: string;
citizenId: string;
prefix: string;
firstName: string;
lastName: string;
fullName: string;
}[];
},
@Request() request: RequestWithUser,
@ -1102,7 +1097,7 @@ export class CommandController extends Controller {
case "C-PM-06":
return "/placemant/appointment/slip/report/";
case "C-PM-07":
return "/xxxxxx/";
return "/placemant/appointment/move/report/";
case "C-PM-08":
return "/xxxxxx/";
case "C-PM-09":

32
src/entities/CommandRecive.ts
View file

@ -14,27 +14,27 @@ export class CommandRecive extends EntityBase {
@Column({
nullable: true,
comment: "คำนำหน้า",
comment: "ชื่อ-สกุล",
length: 255,
default: null,
})
prefix: string;
fullName: string;
@Column({
nullable: true,
comment: "ชื่อ",
length: 255,
default: null,
})
firstName: string;
// @Column({
// nullable: true,
// comment: "ชื่อ",
// length: 255,
// default: null,
// })
// firstName: string;
@Column({
nullable: true,
comment: "สกุล",
length: 255,
default: null,
})
lastName: string;
// @Column({
// nullable: true,
// comment: "สกุล",
// length: 255,
// default: null,
// })
// lastName: string;
@Column({
nullable: true,

20
src/migration/1727851675456-update_ProfileDevelopment2.ts Normal file
View file

@ -0,0 +1,20 @@
import { MigrationInterface, QueryRunner } from "typeorm";
export class UpdateProfileDevelopment21727851675456 implements MigrationInterface {
name = 'UpdateProfileDevelopment21727851675456'
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`commandRecive\` DROP COLUMN \`firstName\``);
await queryRunner.query(`ALTER TABLE \`commandRecive\` DROP COLUMN \`lastName\``);
await queryRunner.query(`ALTER TABLE \`commandRecive\` DROP COLUMN \`prefix\``);
await queryRunner.query(`ALTER TABLE \`commandRecive\` ADD \`fullName\` varchar(255) NULL COMMENT 'ชื่อ-สกุล'`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`commandRecive\` DROP COLUMN \`fullName\``);
await queryRunner.query(`ALTER TABLE \`commandRecive\` ADD \`prefix\` varchar(255) NULL COMMENT 'คำนำหน้า'`);
await queryRunner.query(`ALTER TABLE \`commandRecive\` ADD \`lastName\` varchar(255) NULL COMMENT 'สกุล'`);
await queryRunner.query(`ALTER TABLE \`commandRecive\` ADD \`firstName\` varchar(255) NULL COMMENT 'ชื่อ'`);
}
}