From f2ea301d443e0866b53aa1fda54f59bdb71cad02 Mon Sep 17 00:00:00 2001
From: Adisak <adisak@frappet.com>
Date: Mon, 29 Sep 2025 13:59:02 +0700
Subject: [PATCH] =?UTF-8?q?sort=20=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?=
 =?UTF-8?q?=E0=B8=82=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5=E0=B8=A2?=
 =?UTF-8?q?=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95?=
 =?UTF-8?q?=E0=B8=B4=20=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99?=
 =?UTF-8?q?=E0=B9=88=E0=B8=87/=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99?=
 =?UTF-8?q?=E0=B9=80=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

@Get: api/v1/org/profile/salaryTemp
---
 .../ProfileSalaryTempController.ts            | 80 ++++++++++++++++---
 1 file changed, 70 insertions(+), 10 deletions(-)

diff --git a/src/controllers/ProfileSalaryTempController.ts b/src/controllers/ProfileSalaryTempController.ts
index 81cc1751..3583d09b 100644
--- a/src/controllers/ProfileSalaryTempController.ts
+++ b/src/controllers/ProfileSalaryTempController.ts
@@ -64,6 +64,8 @@ export class ProfileSalaryTempController extends Controller {
     @Query() searchKeyword: string = "",
     @Query() statusCheckEdit?: string | null,
     @Query() rootId?: string,
+    @Query("sortBy") sortBy?: string,
+    @Query("descending") descending?: boolean,
   ) {
     if (type.trim().toUpperCase() == "OFFICER") {
       let _data = await new permission().PermissionOrgList(request, "SYS_REGISTRY_OFFICER");
@@ -78,7 +80,7 @@ export class ProfileSalaryTempController extends Controller {
       if (!findRevision) {
         throw new HttpError(HttpStatus.NOT_FOUND, "not found. OrgRevision");
       }
-      const [record, total] = await this.profileRepo
+      let query = await this.profileRepo
         .createQueryBuilder("profile")
         .leftJoinAndSelect("profile.posLevel", "posLevel")
         .leftJoinAndSelect("profile.posType", "posType")
@@ -321,17 +323,49 @@ export class ProfileSalaryTempController extends Controller {
           rootId: rootId,
         })
         .addSelect("CASE WHEN current_holders.posMasterNo IS NULL THEN 1 ELSE 0 END", "sort_order")
-        .orderBy("sort_order", "ASC")
+        // .orderBy(`${sortBy}`, sort)
+
+      if (sortBy) {
+        if(sortBy == "posLevel"){
+          query = query.orderBy(
+            `posLevel.posLevelName`,
+            descending ? "DESC" : "ASC"
+          );
+        }else if(sortBy == "posType"){
+          query = query.orderBy(
+            `posType.posTypeName`,
+            descending ? "DESC" : "ASC"
+          );
+        }else if(sortBy == "posExecutive"){
+          query = query.orderBy(
+            `posExecutive.posExecutiveName`,
+            descending ? "DESC" : "ASC"
+          );
+        }else if(sortBy == "posNo"){
+          query = query.orderBy(
+            `orgRoot.orgRootShortName`,
+            descending ? "DESC" : "ASC"
+          );
+        }else{
+          query = query.orderBy(
+            `profile.${sortBy}`,
+            descending ? "DESC" : "ASC"
+          );
+        }
+      }else{
+        query = query.orderBy("sort_order", "ASC")
         .addOrderBy("orgRoot.orgRootOrder", "ASC")
         .addOrderBy("orgChild1.orgChild1Order", "ASC")
         .addOrderBy("orgChild2.orgChild2Order", "ASC")
         .addOrderBy("orgChild3.orgChild3Order", "ASC")
         .addOrderBy("orgChild4.orgChild4Order", "ASC")
         .addOrderBy("current_holders.posMasterNo", "ASC")
-        // .orderBy(`${sortBy}`, sort)
-        .skip((page - 1) * pageSize)
-        .take(pageSize)
-        .getManyAndCount();
+      }
+
+      const [record, total] = await query
+      .skip((page - 1) * pageSize)
+      .take(pageSize)
+      .getManyAndCount();
 
       const data = await Promise.all(
         record.map((_data) => {
@@ -465,7 +499,7 @@ export class ProfileSalaryTempController extends Controller {
       if (!findRevision) {
         throw new HttpError(HttpStatus.NOT_FOUND, "not found. OrgRevision");
       }
-      const [record, total] = await this.profileEmployeeRepo
+      let query = await this.profileEmployeeRepo
         .createQueryBuilder("profileEmployee")
         .leftJoinAndSelect("profileEmployee.posLevel", "posLevel")
         .leftJoinAndSelect("profileEmployee.posType", "posType")
@@ -721,9 +755,35 @@ export class ProfileSalaryTempController extends Controller {
         })
         .orderBy("current_holders.posMasterNo", "ASC")
         // .orderBy(`${sortBy}`, sort)
-        .skip((page - 1) * pageSize)
-        .take(pageSize)
-        .getManyAndCount();
+
+       if (sortBy) {
+        if(sortBy == "posLevel"){
+          query = query.orderBy(
+            `posLevel.posLevelName`,
+            descending ? "DESC" : "ASC"
+          );
+        }else if(sortBy == "posType"){
+          query = query.orderBy(
+            `posType.posTypeName`,
+            descending ? "DESC" : "ASC"
+          );
+        }else if(sortBy == "posNo"){
+          query = query.orderBy(
+            `orgRoot.orgRootShortName`,
+            descending ? "DESC" : "ASC"
+          );
+        }else{
+          query = query.orderBy(
+            `profileEmployee.${sortBy}`,
+            descending ? "DESC" : "ASC"
+          );
+        }
+      }
+      const [record, total] = await query
+      .skip((page - 1) * pageSize)
+      .take(pageSize)
+      .getManyAndCount();
+
       const data = await Promise.all(
         record.map((_data) => {
           const shortName =