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

Merge branch 'develop'

Browse source
This commit is contained in:
DESKTOP-2S5P7D1\Windows 10 2025-01-05 22:02:13 +07:00
commit d0a4407ece
5 changed files with 82 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/AppointController.ts
View file

@ -52,7 +52,7 @@ export class AppointController extends Controller {
}
const appoint = await this.appointRepository.find({
relations: ["personal"],
relations: ["personal", "directors"],
where: { personal: conditions },
})

12
src/controllers/ReportController.ts
View file

@ -1307,8 +1307,8 @@ export class ReportController extends Controller {
return new HttpSuccess(directors)
}
@Get("repot1")
public async repot1(@Request() req: RequestWithUser,
@Get("report1")
public async report1(@Request() req: RequestWithUser,
@Query("nodeId") nodeId?: string,
@Query("node") node?: string,
@Query("startDate") startDate?: Date,
@ -1322,8 +1322,8 @@ export class ReportController extends Controller {
});
}
@Get("repot2")
public async repot2(@Request() req: RequestWithUser,
@Get("report2")
public async report2(@Request() req: RequestWithUser,
@Query("nodeId") nodeId?: string,
@Query("node") node?: string,
@Query("startDate") startDate?: Date,
@ -1337,8 +1337,8 @@ export class ReportController extends Controller {
});
}
@Get("repot3")
public async repot3(@Request() req: RequestWithUser,
@Get("report3")
public async report3(@Request() req: RequestWithUser,
@Query("nodeId") nodeId?: string,
@Query("node") node?: string,
@Query("startDate") startDate?: Date,

5
src/entities/Appoint.ts
View file

@ -59,6 +59,11 @@ export type Person = {
role: string | null
posNo?: string | null
actFullName?: string | null
prefix?: string | null
firstName?: string | null
lastName?: string | null
citizenId?: string | null
rootId?: string | null
}
export class UpdateAppoint {

40
src/entities/AppointDirector.ts
View file

@ -64,6 +64,46 @@ export class AppointDirector extends EntityBase {
})
actFullName: string
@Column({
nullable: true,
comment: "คำนำหน้าชื่อ",
length: 40,
default: null,
})
prefix: 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: "เลขประจำตัวประชาชน",
default: null,
length: 13,
})
citizenId: string;
@Column({
nullable: true,
length: 40,
comment: "คีย์นอก(FK)ของตาราง orgRoot",
default: null,
})
rootId: string;
@ManyToOne(() => Appoint, (appoint: Appoint) => appoint.directors)
@JoinColumn({ name: "appointId" })
appoint: Appoint

30
src/migration/1735205130127-add_columns_appointDirector.ts Normal file
View file

@ -0,0 +1,30 @@
import { MigrationInterface, QueryRunner } from "typeorm";
export class AddColumnsAppointDirector1735205130127 implements MigrationInterface {
name = 'AddColumnsAppointDirector1735205130127'
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`appointDirector\` ADD \`prefix\` varchar(40) NULL COMMENT 'คำนำหน้าชื่อ'`);
await queryRunner.query(`ALTER TABLE \`appointDirector\` ADD \`firstName\` varchar(255) NULL COMMENT 'ชื่อ'`);
await queryRunner.query(`ALTER TABLE \`appointDirector\` ADD \`lastName\` varchar(255) NULL COMMENT 'นามสกุล'`);
await queryRunner.query(`ALTER TABLE \`appointDirector\` ADD \`citizenId\` varchar(13) NULL COMMENT 'เลขประจำตัวประชาชน'`);
await queryRunner.query(`ALTER TABLE \`appointDirector\` ADD \`rootId\` varchar(40) NULL COMMENT 'คีย์นอก(FK)ของตาราง orgRoot'`);
await queryRunner.query(`ALTER TABLE \`appoint\` ADD UNIQUE INDEX \`IDX_46c617b30fd9def96938f43b6e\` (\`profileId\`)`);
await queryRunner.query(`CREATE UNIQUE INDEX \`REL_46c617b30fd9def96938f43b6e\` ON \`appoint\` (\`profileId\`)`);
await queryRunner.query(`ALTER TABLE \`appoint\` ADD CONSTRAINT \`FK_46c617b30fd9def96938f43b6ee\` FOREIGN KEY (\`profileId\`) REFERENCES \`personal\`(\`personal_id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`);
await queryRunner.query(`ALTER TABLE \`personal\` ADD CONSTRAINT \`FK_5abc77b4bd19c4295cabe6a3bf5\` FOREIGN KEY (\`personal_id\`) REFERENCES \`appoint\`(\`id\`) ON DELETE NO ACTION ON UPDATE NO ACTION`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`personal\` DROP FOREIGN KEY \`FK_5abc77b4bd19c4295cabe6a3bf5\``);
await queryRunner.query(`ALTER TABLE \`appoint\` DROP FOREIGN KEY \`FK_46c617b30fd9def96938f43b6ee\``);
await queryRunner.query(`DROP INDEX \`REL_46c617b30fd9def96938f43b6e\` ON \`appoint\``);
await queryRunner.query(`ALTER TABLE \`appoint\` DROP INDEX \`IDX_46c617b30fd9def96938f43b6e\``);
await queryRunner.query(`ALTER TABLE \`appointDirector\` DROP COLUMN \`rootId\``);
await queryRunner.query(`ALTER TABLE \`appointDirector\` DROP COLUMN \`citizenId\``);
await queryRunner.query(`ALTER TABLE \`appointDirector\` DROP COLUMN \`lastName\``);
await queryRunner.query(`ALTER TABLE \`appointDirector\` DROP COLUMN \`firstName\``);
await queryRunner.query(`ALTER TABLE \`appointDirector\` DROP COLUMN \`prefix\``);
}
}