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

Merge branch 'adiDev' into develop

Browse source 
# Conflicts:
#	src/controllers/KpiUserEvaluationController.ts
This commit is contained in:
AdisakKanthawilang 2024-08-16 12:09:27 +07:00
commit f9fce4ba25
2 changed files with 28 additions and 28 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;
},
) {
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)
.createQueryBuilder("kpiUserDevelopment")
.leftJoinAndSelect("kpiUserDevelopment.kpiUserEvaluation", "kpiUserEvaluation")
@ -372,10 +373,9 @@ export class KpiUserDevelopmentController extends Controller {
.orWhere("kpiUserDevelopment.name LIKE :keyword", {
keyword: `%${requestBody.keyword}%`,
})
.orWhere(`kpiUserEvaluation.firstName LIKE :firstName`, {
firstName: `%${firstName}%`,
})
.orWhere(`kpiUserEvaluation.lastName LIKE :lastName`, { lastName: `%${lastName}%` });
.orWhere(conditionFullName, {
keyword: `%${requestBody.keyword}%`,
});
}),
)
.orderBy("kpiUserDevelopment.createdAt", "ASC")

46
src/controllers/KpiUserEvaluationController.ts
View file

@ -215,7 +215,8 @@ export class KpiUserEvaluationController extends Controller {
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)
.createQueryBuilder("kpiUserEvaluation")
.andWhere(requestBody.kpiPeriodId ? "kpiPeriodId LIKE :kpiPeriodId" : "1=1", {
@ -248,28 +249,27 @@ export class KpiUserEvaluationController extends Controller {
qb.orWhere("kpiUserEvaluation.prefix LIKE :keyword", {
keyword: `%${requestBody.keyword}%`,
})
.orWhere("kpiUserEvaluation.firstName LIKE :keyword", {
keyword: `%${requestBody.keyword}%`,
})
.orWhere("kpiUserEvaluation.lastName LIKE :keyword", {
keyword: `%${requestBody.keyword}%`,
})
.orWhere("kpiUserEvaluation.org LIKE :keyword", {
keyword: `%${requestBody.keyword}%`,
})
.orWhere("kpiUserEvaluation.position LIKE :keyword", {
keyword: `%${requestBody.keyword}%`,
})
.orWhere("kpiUserEvaluation.posTypeName LIKE :keyword", {
keyword: `%${requestBody.keyword}%`,
})
.orWhere("kpiUserEvaluation.posLevelName LIKE :keyword", {
keyword: `%${requestBody.keyword}%`,
})
.orWhere(`kpiUserEvaluation.firstName LIKE :firstName`, {
firstName: `%${firstName}%`,
})
.orWhere(`kpiUserEvaluation.lastName LIKE :lastName`, { lastName: `%${lastName}%` });
.orWhere("kpiUserEvaluation.firstName LIKE :keyword", {
keyword: `%${requestBody.keyword}%`,
})
.orWhere("kpiUserEvaluation.lastName LIKE :keyword", {
keyword: `%${requestBody.keyword}%`,
})
.orWhere("kpiUserEvaluation.org LIKE :keyword", {
keyword: `%${requestBody.keyword}%`,
})
.orWhere("kpiUserEvaluation.position LIKE :keyword", {
keyword: `%${requestBody.keyword}%`,
})
.orWhere("kpiUserEvaluation.posTypeName LIKE :keyword", {
keyword: `%${requestBody.keyword}%`,
})
.orWhere("kpiUserEvaluation.posLevelName LIKE :keyword", {
keyword: `%${requestBody.keyword}%`,
})
.orWhere(conditionFullName, {
keyword: `%${requestBody.keyword}%`,
})
}),
)
.orderBy("kpiUserEvaluation.createdAt", "ASC")