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

list

Browse source
This commit is contained in:
AdisakKanthawilang 2024-04-05 10:19:28 +07:00
parent de746486d1
commit 14f5a082ca
1 changed files with 7 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/controllers/DevelopmentScholarshipController.ts
View file

@ -144,8 +144,8 @@ export class DevelopmentScholarshipController extends Controller {
@Query("pageSize") pageSize: number = 10, @Query("pageSize") pageSize: number = 10,
@Query("keyword") keyword?: string, @Query("keyword") keyword?: string,
@Query("year") year?: number, @Query("year") year?: number,
@Query("scholarshipType") scholarshipType?: string,
) { ) {
const type = "OFFICER";
const [development, total] = await AppDataSource.getRepository(DevelopmentScholarship) const [development, total] = await AppDataSource.getRepository(DevelopmentScholarship)
.createQueryBuilder("developmentScholarship") .createQueryBuilder("developmentScholarship")
.leftJoinAndSelect("developmentScholarship.posLevel", "posLevel") .leftJoinAndSelect("developmentScholarship.posLevel", "posLevel")
@ -154,30 +154,14 @@ export class DevelopmentScholarshipController extends Controller {
year != 0 && year != null && year != undefined year != 0 && year != null && year != undefined
? "developmentScholarship.scholarshipYear = :scholarshipYear" ? "developmentScholarship.scholarshipYear = :scholarshipYear"
: "1=1", : "1=1",
{ year: year }, { scholarshipYear: year },
) )
.andWhere("developmentScholarship.type = :type", { type: type }) .andWhere("developmentScholarship.scholarshipType = :scholarshipType", { scholarshipType: scholarshipType })
.andWhere( .andWhere(
new Brackets((qb) => { new Brackets((qb) => {
qb.where( qb.where(
keyword != null && keyword != "" keyword != null && keyword != ""
? "developmentScholarship.prefix LIKE :keyword" ? `CONCAT(developmentScholarship.prefix, developmentScholarship.firstName," ",developmentScholarship.lastName) like '%${keyword}%'`
: "1=1",
{
keyword: `%${keyword}%`,
},
)
.orWhere(
keyword != null && keyword != ""
? "developmentScholarship.firstName LIKE :keyword"
: "1=1",
{
keyword: `%${keyword}%`,
},
)
.orWhere(
keyword != null && keyword != ""
? "developmentScholarship.lastName LIKE :keyword"
: "1=1", : "1=1",
{ {
keyword: `%${keyword}%`, keyword: `%${keyword}%`,
@ -193,7 +177,7 @@ export class DevelopmentScholarshipController extends Controller {
) )
.orWhere( .orWhere(
keyword != null && keyword != "" keyword != null && keyword != ""
? "developmentScholarship.position LIKE :keyword" ? "developmentScholarship.posExecutive LIKE :keyword"
: "1=1", : "1=1",
{ {
keyword: `%${keyword}%`, keyword: `%${keyword}%`,