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

fix

Browse source
This commit is contained in:
AdisakKanthawilang 2024-07-16 13:46:41 +07:00
parent 12160da78f
commit 5f88a04036
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/controllers/ReportController.ts
View file

@ -473,6 +473,9 @@ export class ReportController extends Controller {
.createQueryBuilder("kpiUserEvaluation") .createQueryBuilder("kpiUserEvaluation")
.leftJoinAndSelect("kpiUserEvaluation.kpiPeriod", "kpiPeriod") .leftJoinAndSelect("kpiUserEvaluation.kpiPeriod", "kpiPeriod")
.where("kpiUserEvaluation.profileId = :profileId", { profileId: requestBody.profileId }) .where("kpiUserEvaluation.profileId = :profileId", { profileId: requestBody.profileId })
.andWhere("kpiUserEvaluation.evaluationStatus = :evaluationStatus", {
evaluationStatus: "KP7",
})
// .where("kpiPeriod.year = :year", { year: yearNow }) // .where("kpiPeriod.year = :year", { year: yearNow })
.groupBy("kpiUserEvaluation.kpiPeriodId") .groupBy("kpiUserEvaluation.kpiPeriodId")
.select("MIN(kpiUserEvaluation.id) as id") .select("MIN(kpiUserEvaluation.id) as id")
@ -637,6 +640,9 @@ export class ReportController extends Controller {
.createQueryBuilder("kpiUserEvaluation") .createQueryBuilder("kpiUserEvaluation")
.leftJoinAndSelect("kpiUserEvaluation.kpiPeriod", "kpiPeriod") .leftJoinAndSelect("kpiUserEvaluation.kpiPeriod", "kpiPeriod")
.where("kpiUserEvaluation.profileId = :profileId", { profileId: requestBody.profileId }) .where("kpiUserEvaluation.profileId = :profileId", { profileId: requestBody.profileId })
.andWhere("kpiUserEvaluation.evaluationStatus = :evaluationStatus", {
evaluationStatus: "KP7",
})
.andWhere("kpiPeriod.year BETWEEN :startYear AND :endYear", { .andWhere("kpiPeriod.year BETWEEN :startYear AND :endYear", {
startYear: yearNow - 4, startYear: yearNow - 4,
endYear: yearNow, endYear: yearNow,
@ -850,6 +856,9 @@ export class ReportController extends Controller {
.createQueryBuilder("kpiUserEvaluation") .createQueryBuilder("kpiUserEvaluation")
.leftJoinAndSelect("kpiUserEvaluation.kpiPeriod", "kpiPeriod") .leftJoinAndSelect("kpiUserEvaluation.kpiPeriod", "kpiPeriod")
.where("kpiUserEvaluation.profileId = :profileId", { profileId: requestBody.profileId }) .where("kpiUserEvaluation.profileId = :profileId", { profileId: requestBody.profileId })
.andWhere("kpiUserEvaluation.evaluationStatus = :evaluationStatus", {
evaluationStatus: "KP7",
})
.andWhere("kpiPeriod.year BETWEEN :startYear AND :endYear", { .andWhere("kpiPeriod.year BETWEEN :startYear AND :endYear", {
startYear: yearNow - 2, startYear: yearNow - 2,
endYear: yearNow, endYear: yearNow,