From 74693935513bb8d20c6f6e8232fab311a8c8b243 Mon Sep 17 00:00:00 2001 From: Bright Date: Thu, 28 Nov 2024 17:22:28 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=8A=E0=B9=87=E0=B8=84=20?= =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A=E0=B8=9E=E0=B8=B1=E0=B8=92?= =?UTF-8?q?=E0=B8=99=E0=B8=B2=20#811?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/DevelopmentEmployeeHistoryController.ts | 3 ++- src/controllers/DevelopmentHistoryController.ts | 1 + src/controllers/DevelopmentScholarshipController.ts | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/controllers/DevelopmentEmployeeHistoryController.ts b/src/controllers/DevelopmentEmployeeHistoryController.ts index 82d2f9a..f0ea6aa 100644 --- a/src/controllers/DevelopmentEmployeeHistoryController.ts +++ b/src/controllers/DevelopmentEmployeeHistoryController.ts @@ -318,6 +318,7 @@ export class DevelopmentEmployeeHistoryController extends Controller { ); }), ) + .orderBy("development.year", "DESC") .orderBy("developmentHistory.createdAt", "DESC") .skip((body.page - 1) * body.pageSize) .take(body.pageSize) @@ -333,7 +334,7 @@ export class DevelopmentEmployeeHistoryController extends Controller { year: item.development.year, posType: item.employeePosType ? item.employeePosType.posTypeName : null, posLevel: item.employeePosType && item.employeePosLevel - ? `${item.employeePosType.posTypeShortName}${item.employeePosLevel.posLevelName}` + ? `${item.employeePosType.posTypeShortName} ${item.employeePosLevel.posLevelName}` : null, projectName: item.development.projectName, })); diff --git a/src/controllers/DevelopmentHistoryController.ts b/src/controllers/DevelopmentHistoryController.ts index 33f512a..6a942f2 100644 --- a/src/controllers/DevelopmentHistoryController.ts +++ b/src/controllers/DevelopmentHistoryController.ts @@ -313,6 +313,7 @@ export class DevelopmentOfficerHistoryController extends Controller { ); }), ) + .orderBy("development.year", "DESC") .orderBy("developmentHistory.createdAt", "DESC") .skip((body.page - 1) * body.pageSize) .take(body.pageSize) diff --git a/src/controllers/DevelopmentScholarshipController.ts b/src/controllers/DevelopmentScholarshipController.ts index 74a1d74..9599867 100644 --- a/src/controllers/DevelopmentScholarshipController.ts +++ b/src/controllers/DevelopmentScholarshipController.ts @@ -226,6 +226,7 @@ export class DevelopmentScholarshipController extends Controller { ); }), ) + .orderBy("developmentScholarship.scholarshipYear", "DESC") .orderBy("developmentScholarship.createdAt", "DESC") .skip((page - 1) * pageSize) .take(pageSize)