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

no message

Browse source
This commit is contained in:
Kittapath 2024-04-26 17:37:21 +07:00
parent 5b818556ca
commit 1aab6c82b9
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/controllers/ReportController.ts
View file

@ -6547,6 +6547,7 @@ export class ReportController extends Controller {
prefix: item.prefix,
firstName: item.firstName,
lastName: item.lastName,
profileId: item.profileId,
}));
return new HttpSuccess(_salaryRank);
@ -6592,6 +6593,7 @@ export class ReportController extends Controller {
prefix: item.prefix,
firstName: item.firstName,
lastName: item.lastName,
profileId: item.profileId,
}));
return new HttpSuccess(_salaryRank);
@ -6631,6 +6633,7 @@ export class ReportController extends Controller {
prefix: item.prefix,
firstName: item.firstName,
lastName: item.lastName,
profileId: item.profileId,
}));
return new HttpSuccess(_salaryRank);
@ -6669,6 +6672,7 @@ export class ReportController extends Controller {
prefix: item.prefix,
firstName: item.firstName,
lastName: item.lastName,
profileId: item.profileId,
}));
return new HttpSuccess(_salaryRank);
@ -6707,6 +6711,7 @@ export class ReportController extends Controller {
prefix: item.prefix,
firstName: item.firstName,
lastName: item.lastName,
profileId: item.profileId,
}));
return new HttpSuccess(_salaryRank);

12
src/controllers/SalaryController.ts
View file

@ -280,18 +280,18 @@ export class SalaryController extends Controller {
) {
const [salary, total] = await AppDataSource.getRepository(Salarys)
.createQueryBuilder("salary")
.leftJoinAndSelect("salary.posType", "posType")
.leftJoinAndSelect("salary.posLevel", "posLevel")
.leftJoinAndSelect("salary.posType_", "posType_")
.leftJoinAndSelect("salary.posLevel_", "posLevel_")
.andWhere(
new Brackets((qb) => {
qb.orWhere("salary.name LIKE :keyword", { keyword: `%${keyword}%` })
.orWhere("posType.posTypeName LIKE :keyword", { keyword: `%${keyword}%` })
.orWhere("posLevel.posLevelName LIKE :keyword", { keyword: `%${keyword}%` });
.orWhere("posType_.posTypeName LIKE :keyword", { keyword: `%${keyword}%` })
.orWhere("posLevel_.posLevelName LIKE :keyword", { keyword: `%${keyword}%` });
}),
)
.orderBy("salary.isActive", "DESC")
.addOrderBy("posType.posTypeRank", "DESC")
.addOrderBy("posLevel.posLevelRank", "DESC")
.addOrderBy("posType_.posTypeRank", "DESC")
.addOrderBy("posLevel_.posLevelRank", "DESC")
.skip((page - 1) * pageSize)
.take(pageSize)
.getManyAndCount();

2
src/controllers/SalaryEmployeeController.ts
View file

@ -219,8 +219,6 @@ export class SalaryEmployeeController extends Controller {
) {
const [salaryEmployee, total] = await AppDataSource.getRepository(SalaryEmployee)
.createQueryBuilder("salaryEmployee")
.leftJoinAndSelect("salaryEmployee.posType", "posType")
.leftJoinAndSelect("salaryEmployee.posLevel", "posLevel")
.andWhere(
new Brackets((qb) => {
qb.orWhere("salaryEmployee.name LIKE :keyword", { keyword: `%${keyword}%` }).orWhere(