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

fix find fullName

Browse source
This commit is contained in:
AdisakKanthawilang 2024-08-16 12:08:10 +07:00
parent 161595782d
commit 2aea50a5d4
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/controllers/KpiUserDevelopmentController.ts
View file

@ -337,7 +337,8 @@ export class KpiUserDevelopmentController extends Controller {
// evaluating?: boolean | null; // evaluating?: boolean | null;
}, },
) { ) {
const [firstName, lastName] = requestBody.keyword ? requestBody.keyword.split(" ") : ["", ""]; let conditionFullName =
"CONCAT(kpiUserEvaluation.prefix, kpiUserEvaluation.firstName, ' ', kpiUserEvaluation.lastName) LIKE :keyword";
const [kpiUserDevelopment, total] = await AppDataSource.getRepository(KpiUserDevelopment) const [kpiUserDevelopment, total] = await AppDataSource.getRepository(KpiUserDevelopment)
.createQueryBuilder("kpiUserDevelopment") .createQueryBuilder("kpiUserDevelopment")
.leftJoinAndSelect("kpiUserDevelopment.kpiUserEvaluation", "kpiUserEvaluation") .leftJoinAndSelect("kpiUserDevelopment.kpiUserEvaluation", "kpiUserEvaluation")
@ -372,10 +373,9 @@ export class KpiUserDevelopmentController extends Controller {
.orWhere("kpiUserDevelopment.name LIKE :keyword", { .orWhere("kpiUserDevelopment.name LIKE :keyword", {
keyword: `%${requestBody.keyword}%`, keyword: `%${requestBody.keyword}%`,
}) })
.orWhere(`kpiUserEvaluation.firstName LIKE :firstName`, { .orWhere(conditionFullName, {
firstName: `%${firstName}%`, keyword: `%${requestBody.keyword}%`,
}) });
.orWhere(`kpiUserEvaluation.lastName LIKE :lastName`, { lastName: `%${lastName}%` });
}), }),
) )
.orderBy("kpiUserDevelopment.createdAt", "ASC") .orderBy("kpiUserDevelopment.createdAt", "ASC")

8
src/controllers/KpiUserEvaluationController.ts
View file

@ -215,7 +215,8 @@ export class KpiUserEvaluationController extends Controller {
evaluating?: boolean | null; evaluating?: boolean | null;
}, },
) { ) {
const [firstName, lastName] = requestBody.keyword ? requestBody.keyword.split(" ") : ["", ""]; let conditionFullName =
"CONCAT(kpiUserEvaluation.prefix, kpiUserEvaluation.firstName, ' ', kpiUserEvaluation.lastName) LIKE :keyword";
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", {
@ -266,10 +267,9 @@ export class KpiUserEvaluationController extends Controller {
.orWhere("kpiUserEvaluation.posLevelName LIKE :keyword", { .orWhere("kpiUserEvaluation.posLevelName LIKE :keyword", {
keyword: `%${requestBody.keyword}%`, keyword: `%${requestBody.keyword}%`,
}) })
.orWhere(`kpiUserEvaluation.firstName LIKE :firstName`, { .orWhere(conditionFullName, {
firstName: `%${firstName}%`, keyword: `%${requestBody.keyword}%`,
}) })
.orWhere(`kpiUserEvaluation.lastName LIKE :lastName`, { lastName: `%${lastName}%` });
}), }),
) )
.orderBy("kpiUserEvaluation.createdAt", "ASC") .orderBy("kpiUserEvaluation.createdAt", "ASC")