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

Merge branch 'develop-Bright' into develop

Browse source
This commit is contained in:
Bright 2024-11-27 15:33:23 +07:00
commit f8e175ae12
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/KpiUserEvaluationController.ts
View file

@ -171,7 +171,7 @@ export class KpiUserEvaluationController extends Controller {
}); });
}), }),
) )
.orderBy("kpiUserEvaluation.createdAt", "ASC") .orderBy("kpiUserEvaluation.createdAt", "DESC")
.skip((requestBody.page - 1) * requestBody.pageSize) .skip((requestBody.page - 1) * requestBody.pageSize)
.take(requestBody.pageSize) .take(requestBody.pageSize)
.getManyAndCount(); .getManyAndCount();
@ -1050,7 +1050,7 @@ export class KpiUserEvaluationController extends Controller {
evaluationStatus: status == undefined ? "" : status.trim().toUpperCase(), evaluationStatus: status == undefined ? "" : status.trim().toUpperCase(),
}, },
) )
.orderBy("kpiUserEvaluation.createdAt", "ASC") .orderBy("kpiUserEvaluation.createdAt", "DESC")
.skip((page - 1) * pageSize) .skip((page - 1) * pageSize)
.take(pageSize) .take(pageSize)
.getManyAndCount(); .getManyAndCount();