find firstName and lastName
This commit is contained in:
parent
23df3da9b0
commit
e7e16ba513
1 changed files with 23 additions and 18 deletions
|
|
@ -215,6 +215,7 @@ export class KpiUserEvaluationController extends Controller {
|
||||||
evaluating?: boolean | null;
|
evaluating?: boolean | null;
|
||||||
},
|
},
|
||||||
) {
|
) {
|
||||||
|
const [firstName, lastName] = requestBody.keyword ? requestBody.keyword.split(" ") : ["", ""];
|
||||||
const [kpiUserEvaluation, total] = await AppDataSource.getRepository(KpiUserEvaluation)
|
const [kpiUserEvaluation, total] = await AppDataSource.getRepository(KpiUserEvaluation)
|
||||||
.createQueryBuilder("kpiUserEvaluation")
|
.createQueryBuilder("kpiUserEvaluation")
|
||||||
.andWhere(requestBody.kpiPeriodId ? "kpiPeriodId LIKE :kpiPeriodId" : "1=1", {
|
.andWhere(requestBody.kpiPeriodId ? "kpiPeriodId LIKE :kpiPeriodId" : "1=1", {
|
||||||
|
|
@ -247,24 +248,28 @@ export class KpiUserEvaluationController extends Controller {
|
||||||
qb.orWhere("kpiUserEvaluation.prefix LIKE :keyword", {
|
qb.orWhere("kpiUserEvaluation.prefix LIKE :keyword", {
|
||||||
keyword: `%${requestBody.keyword}%`,
|
keyword: `%${requestBody.keyword}%`,
|
||||||
})
|
})
|
||||||
.orWhere("kpiUserEvaluation.firstName LIKE :keyword", {
|
.orWhere("kpiUserEvaluation.firstName LIKE :keyword", {
|
||||||
keyword: `%${requestBody.keyword}%`,
|
keyword: `%${requestBody.keyword}%`,
|
||||||
})
|
})
|
||||||
.orWhere("kpiUserEvaluation.lastName LIKE :keyword", {
|
.orWhere("kpiUserEvaluation.lastName LIKE :keyword", {
|
||||||
keyword: `%${requestBody.keyword}%`,
|
keyword: `%${requestBody.keyword}%`,
|
||||||
})
|
})
|
||||||
.orWhere("kpiUserEvaluation.org LIKE :keyword", {
|
.orWhere("kpiUserEvaluation.org LIKE :keyword", {
|
||||||
keyword: `%${requestBody.keyword}%`,
|
keyword: `%${requestBody.keyword}%`,
|
||||||
})
|
})
|
||||||
.orWhere("kpiUserEvaluation.position LIKE :keyword", {
|
.orWhere("kpiUserEvaluation.position LIKE :keyword", {
|
||||||
keyword: `%${requestBody.keyword}%`,
|
keyword: `%${requestBody.keyword}%`,
|
||||||
})
|
})
|
||||||
.orWhere("kpiUserEvaluation.posTypeName LIKE :keyword", {
|
.orWhere("kpiUserEvaluation.posTypeName LIKE :keyword", {
|
||||||
keyword: `%${requestBody.keyword}%`,
|
keyword: `%${requestBody.keyword}%`,
|
||||||
})
|
})
|
||||||
.orWhere("kpiUserEvaluation.posLevelName LIKE :keyword", {
|
.orWhere("kpiUserEvaluation.posLevelName LIKE :keyword", {
|
||||||
keyword: `%${requestBody.keyword}%`,
|
keyword: `%${requestBody.keyword}%`,
|
||||||
});
|
})
|
||||||
|
.orWhere(`kpiUserEvaluation.firstName LIKE :firstName`, {
|
||||||
|
firstName: `%${firstName}%`,
|
||||||
|
})
|
||||||
|
.orWhere(`kpiUserEvaluation.lastName LIKE :lastName`, { lastName: `%${lastName}%` });
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
.orderBy("kpiUserEvaluation.createdAt", "ASC")
|
.orderBy("kpiUserEvaluation.createdAt", "ASC")
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue