From 5f88a0403689153e2669b089ac074f007a70bba6 Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Tue, 16 Jul 2024 13:46:41 +0700 Subject: [PATCH] fix --- src/controllers/ReportController.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index fdabb68..1872f03 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -473,6 +473,9 @@ export class ReportController extends Controller { .createQueryBuilder("kpiUserEvaluation") .leftJoinAndSelect("kpiUserEvaluation.kpiPeriod", "kpiPeriod") .where("kpiUserEvaluation.profileId = :profileId", { profileId: requestBody.profileId }) + .andWhere("kpiUserEvaluation.evaluationStatus = :evaluationStatus", { + evaluationStatus: "KP7", + }) // .where("kpiPeriod.year = :year", { year: yearNow }) .groupBy("kpiUserEvaluation.kpiPeriodId") .select("MIN(kpiUserEvaluation.id) as id") @@ -637,6 +640,9 @@ export class ReportController extends Controller { .createQueryBuilder("kpiUserEvaluation") .leftJoinAndSelect("kpiUserEvaluation.kpiPeriod", "kpiPeriod") .where("kpiUserEvaluation.profileId = :profileId", { profileId: requestBody.profileId }) + .andWhere("kpiUserEvaluation.evaluationStatus = :evaluationStatus", { + evaluationStatus: "KP7", + }) .andWhere("kpiPeriod.year BETWEEN :startYear AND :endYear", { startYear: yearNow - 4, endYear: yearNow, @@ -850,6 +856,9 @@ export class ReportController extends Controller { .createQueryBuilder("kpiUserEvaluation") .leftJoinAndSelect("kpiUserEvaluation.kpiPeriod", "kpiPeriod") .where("kpiUserEvaluation.profileId = :profileId", { profileId: requestBody.profileId }) + .andWhere("kpiUserEvaluation.evaluationStatus = :evaluationStatus", { + evaluationStatus: "KP7", + }) .andWhere("kpiPeriod.year BETWEEN :startYear AND :endYear", { startYear: yearNow - 2, endYear: yearNow,