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

แก้ query total

Browse source
This commit is contained in:
Kittapath 2024-04-26 12:40:23 +07:00
parent 07f5b3d570
commit 5b818556ca
4 changed files with 99 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

76
src/controllers/SalaryRankController.ts
View file

@ -14,7 +14,7 @@ import {
Get,
Query,
} from "tsoa";
import { Like } from "typeorm";
import { Brackets, Like } from "typeorm";
import { AppDataSource } from "../database/data-source";
import HttpSuccess from "../interfaces/http-success";
import HttpStatusCode from "../interfaces/http-status";
@ -122,56 +122,30 @@ export class SalaryRanksController extends Controller {
@Query("pageSize") pageSize: number = 10,
@Query("keyword") keyword?: string,
) {
let whereClause: any = {};
if (keyword != undefined && keyword !== "") {
whereClause = {
where: [
{ salary: Like(`%${keyword}%`) },
{ salaryHalf: Like(`%${keyword}%`) },
{ salaryHalfSpecial: Like(`%${keyword}%`) },
{ salaryFull: Like(`%${keyword}%`) },
{ salaryFullSpecial: Like(`%${keyword}%`) },
{ salaryFullHalf: Like(`%${keyword}%`) },
{ salaryFullHalfSpecial: Like(`%${keyword}%`) },
],
};
}
const [salaryRank, total] = await this.salaryRankRepository.findAndCount({
...whereClause,
where: {
salaryId: id,
},
select: [
"id",
"salary",
"salaryHalf",
"salaryHalfSpecial",
"salaryFull",
"salaryFullSpecial",
"salaryFullHalf",
"salaryFullHalfSpecial",
"isNext",
],
order: {
salary: "DESC",
salaryHalf: "DESC",
},
...(keyword ? {} : { skip: (page - 1) * pageSize, take: pageSize }),
});
// if (keyword != undefined && keyword !== "") {
// const filteredSalaryRank = salaryRank.filter(
// (x) =>
// x.salary?.toString().includes(keyword) ||
// x.salaryHalf?.toString().includes(keyword) ||
// x.salaryHalfSpecial?.toString().includes(keyword) ||
// x.salaryFull?.toString().includes(keyword) ||
// x.salaryFullSpecial?.toString().includes(keyword) ||
// x.salaryFullHalf?.toString().includes(keyword) ||
// x.salaryFullHalfSpecial?.toString().includes(keyword),
// );
// const slicedData = filteredSalaryRank.slice((page - 1) * pageSize, page * pageSize);
// return new HttpSuccess({ data: slicedData, total: filteredSalaryRank.length });
// }
const [salaryRank, total] = await AppDataSource.getRepository(SalaryRanks)
.createQueryBuilder("salaryRank")
.andWhere(
new Brackets((qb) => {
qb.andWhere(`salaryRank.salaryId LIKE :id`, { id: id }).andWhere(
new Brackets((qb) => {
qb.orWhere("salaryRank.salary LIKE :keyword", { keyword: `%${keyword}%` })
.orWhere("salaryRank.salaryHalf LIKE :keyword", { keyword: `%${keyword}%` })
.orWhere("salaryRank.salaryHalfSpecial LIKE :keyword", { keyword: `%${keyword}%` })
.orWhere("salaryRank.salaryFull LIKE :keyword", { keyword: `%${keyword}%` })
.orWhere("salaryRank.salaryFullSpecial LIKE :keyword", { keyword: `%${keyword}%` })
.orWhere("salaryRank.salaryFullHalf LIKE :keyword", { keyword: `%${keyword}%` })
.orWhere("salaryRank.salaryFullHalfSpecial LIKE :keyword", {
keyword: `%${keyword}%`,
});
}),
);
}),
)
.orderBy("salaryRank.salary", "DESC")
.addOrderBy("salaryRank.salaryHalf", "DESC")
.skip((page - 1) * pageSize)
.take(pageSize)
.getManyAndCount();
return new HttpSuccess({ data: salaryRank, total });
}