list
This commit is contained in:
parent
de746486d1
commit
14f5a082ca
1 changed files with 7 additions and 23 deletions
|
|
@ -144,8 +144,8 @@ export class DevelopmentScholarshipController extends Controller {
|
|||
@Query("pageSize") pageSize: number = 10,
|
||||
@Query("keyword") keyword?: string,
|
||||
@Query("year") year?: number,
|
||||
@Query("scholarshipType") scholarshipType?: string,
|
||||
) {
|
||||
const type = "OFFICER";
|
||||
const [development, total] = await AppDataSource.getRepository(DevelopmentScholarship)
|
||||
.createQueryBuilder("developmentScholarship")
|
||||
.leftJoinAndSelect("developmentScholarship.posLevel", "posLevel")
|
||||
|
|
@ -154,30 +154,14 @@ export class DevelopmentScholarshipController extends Controller {
|
|||
year != 0 && year != null && year != undefined
|
||||
? "developmentScholarship.scholarshipYear = :scholarshipYear"
|
||||
: "1=1",
|
||||
{ year: year },
|
||||
{ scholarshipYear: year },
|
||||
)
|
||||
.andWhere("developmentScholarship.type = :type", { type: type })
|
||||
.andWhere("developmentScholarship.scholarshipType = :scholarshipType", { scholarshipType: scholarshipType })
|
||||
.andWhere(
|
||||
new Brackets((qb) => {
|
||||
qb.where(
|
||||
keyword != null && keyword != ""
|
||||
? "developmentScholarship.prefix LIKE :keyword"
|
||||
: "1=1",
|
||||
{
|
||||
keyword: `%${keyword}%`,
|
||||
},
|
||||
)
|
||||
.orWhere(
|
||||
new Brackets((qb) => {
|
||||
qb.where(
|
||||
keyword != null && keyword != ""
|
||||
? "developmentScholarship.firstName LIKE :keyword"
|
||||
: "1=1",
|
||||
{
|
||||
keyword: `%${keyword}%`,
|
||||
},
|
||||
)
|
||||
.orWhere(
|
||||
keyword != null && keyword != ""
|
||||
? "developmentScholarship.lastName LIKE :keyword"
|
||||
? `CONCAT(developmentScholarship.prefix, developmentScholarship.firstName," ",developmentScholarship.lastName) like '%${keyword}%'`
|
||||
: "1=1",
|
||||
{
|
||||
keyword: `%${keyword}%`,
|
||||
|
|
@ -193,7 +177,7 @@ export class DevelopmentScholarshipController extends Controller {
|
|||
)
|
||||
.orWhere(
|
||||
keyword != null && keyword != ""
|
||||
? "developmentScholarship.position LIKE :keyword"
|
||||
? "developmentScholarship.posExecutive LIKE :keyword"
|
||||
: "1=1",
|
||||
{
|
||||
keyword: `%${keyword}%`,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue