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

Merge branch 'develop' of github.com:Frappet/bma-ehr-salary into develop

Browse source
This commit is contained in:
Kittapath 2024-03-07 15:57:01 +07:00
commit 93d4ffa7a6
2 changed files with 26 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/controllers/SalaryController.ts
View file

@ -272,7 +272,14 @@ export class Salary extends Controller {
const [salary, total] = await this.salaryRepository.findAndCount({
relations: ["posLevel_", "posType_"],
order: {
startDate: "DESC",
// startDate: "DESC",
isActive: "ASC",
posType_: {
posTypeRank: "ASC"
},
posLevel_: {
posLevelRank: "ASC"
},
},
...(keyword ? {} : { skip: (page - 1) * pageSize, take: pageSize }),
});

42
src/migration/1709801227584-update_table_salaryProfile_add_isClose.ts
View file

@ -5,12 +5,10 @@ export class UpdateTableSalaryProfileAddIsClose1709801227584 implements Migratio
public async up(queryRunner: QueryRunner): Promise<void> {
// await queryRunner.query(`ALTER TABLE \`salarys\` CHANGE \`salaryType\` \`name\` varchar(255) NOT NULL COMMENT 'ประเภทผัง'`);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` DROP COLUMN \`punish\``);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` DROP COLUMN \`retired\``);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` DROP COLUMN \`retired2\``);
await queryRunner.query(
`ALTER TABLE \`salaryPeriod\` ADD \`isClose\` tinyint NOT NULL COMMENT 'ปิดรอบ' DEFAULT 0`,
);
// await queryRunner.query(`ALTER TABLE \`salaryProfile\` DROP COLUMN \`punish\``);
// await queryRunner.query(`ALTER TABLE \`salaryProfile\` DROP COLUMN \`retired\``);
// await queryRunner.query(`ALTER TABLE \`salaryProfile\` DROP COLUMN \`retired2\``);
// await queryRunner.query(`ALTER TABLE \`salaryPeriod\` ADD \`isClose\` tinyint NOT NULL COMMENT 'ปิดรอบ' DEFAULT 0`);
await queryRunner.query(
`ALTER TABLE \`salaryProfile\` ADD \`isPunish\` tinyint NULL COMMENT 'การลงโทษทางวินัย' DEFAULT 0`,
);
@ -26,10 +24,8 @@ export class UpdateTableSalaryProfileAddIsClose1709801227584 implements Migratio
await queryRunner.query(
`ALTER TABLE \`salaryProfile\` ADD \`isReserve\` tinyint NULL COMMENT 'สำรอง' DEFAULT 0`,
);
await queryRunner.query(`ALTER TABLE \`salarys\` DROP COLUMN \`name\``);
await queryRunner.query(
`ALTER TABLE \`salarys\` ADD \`name\` varchar(255) NOT NULL COMMENT 'ชื่อผัง'`,
);
// await queryRunner.query(`ALTER TABLE \`salarys\` DROP COLUMN \`name\``);
// await queryRunner.query(`ALTER TABLE \`salarys\` ADD \`name\` varchar(255) NOT NULL COMMENT 'ชื่อผัง'`);
await queryRunner.query(
`ALTER TABLE \`salaryProfile\` CHANGE \`result\` \`result\` varchar(255) NULL COMMENT 'ผลการประเมินผลการปฏิบัติราชการ'`,
);
@ -45,25 +41,23 @@ export class UpdateTableSalaryProfileAddIsClose1709801227584 implements Migratio
await queryRunner.query(
`ALTER TABLE \`salaryProfile\` CHANGE \`result\` \`result\` varchar(255) NULL COMMENT 'ผลการประเมิน'`,
);
await queryRunner.query(`ALTER TABLE \`salarys\` DROP COLUMN \`name\``);
await queryRunner.query(
`ALTER TABLE \`salarys\` ADD \`name\` varchar(255) NOT NULL COMMENT 'ประเภทผัง'`,
);
// await queryRunner.query(`ALTER TABLE \`salarys\` DROP COLUMN \`name\``);
// await queryRunner.query(`ALTER TABLE \`salarys\` ADD \`name\` varchar(255) NOT NULL COMMENT 'ประเภทผัง'`);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` DROP COLUMN \`isReserve\``);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` DROP COLUMN \`isLeave\``);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` DROP COLUMN \`isAbsent\``);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` DROP COLUMN \`isSuspension\``);
await queryRunner.query(`ALTER TABLE \`salaryProfile\` DROP COLUMN \`isPunish\``);
await queryRunner.query(`ALTER TABLE \`salaryPeriod\` DROP COLUMN \`isClose\``);
await queryRunner.query(
`ALTER TABLE \`salaryProfile\` ADD \`retired2\` varchar(255) NULL COMMENT 'ขาดราชการ'`,
);
await queryRunner.query(
`ALTER TABLE \`salaryProfile\` ADD \`retired\` varchar(255) NULL COMMENT 'พักราชการ'`,
);
await queryRunner.query(
`ALTER TABLE \`salaryProfile\` ADD \`punish\` varchar(255) NULL COMMENT 'การลงโทษ'`,
);
// await queryRunner.query(`ALTER TABLE \`salaryPeriod\` DROP COLUMN \`isClose\``);
// await queryRunner.query(
// `ALTER TABLE \`salaryProfile\` ADD \`retired2\` varchar(255) NULL COMMENT 'ขาดราชการ'`,
// );
// await queryRunner.query(
// `ALTER TABLE \`salaryProfile\` ADD \`retired\` varchar(255) NULL COMMENT 'พักราชการ'`,
// );
// await queryRunner.query(
// `ALTER TABLE \`salaryProfile\` ADD \`punish\` varchar(255) NULL COMMENT 'การลงโทษ'`,
// );
// await queryRunner.query(`ALTER TABLE \`salarys\` CHANGE \`name\` \`salaryType\` varchar(255) NOT NULL COMMENT 'ประเภทผัง'`);
}
}