เช็ค ระบบพัฒนา #811

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,
     }));

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)

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)