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

sort posno

Browse source
This commit is contained in:
kittapath 2024-11-25 15:10:52 +07:00
parent 2ebb3e9b2b
commit 517aa1495a
3 changed files with 59 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/controllers/PermissionOrgController.ts
View file

@ -103,9 +103,17 @@ export class PermissionOrgController extends Controller {
} else if (searchField == "posNo") { } else if (searchField == "posNo") {
queryLike = `CONCAT( queryLike = `CONCAT(
IFNULL(orgChild4.orgChild4ShortName, ''), IFNULL(orgChild4.orgChild4ShortName, ''),
IFNULL(current_holders.posMasterNo , '')
) LIKE :keyword OR CONCAT(
IFNULL(orgChild3.orgChild3ShortName, ''), IFNULL(orgChild3.orgChild3ShortName, ''),
IFNULL(current_holders.posMasterNo , '')
) LIKE :keyword OR CONCAT(
IFNULL(orgChild2.orgChild2ShortName, ''), IFNULL(orgChild2.orgChild2ShortName, ''),
IFNULL(current_holders.posMasterNo , '')
) LIKE :keyword OR CONCAT(
IFNULL(orgChild1.orgChild1ShortName, ''), IFNULL(orgChild1.orgChild1ShortName, ''),
IFNULL(current_holders.posMasterNo , '')
) LIKE :keyword OR CONCAT(
IFNULL(orgRoot.orgRootShortName, ''), IFNULL(orgRoot.orgRootShortName, ''),
IFNULL(current_holders.posMasterNo , '') IFNULL(current_holders.posMasterNo , '')
) LIKE :keyword`; ) LIKE :keyword`;
@ -130,6 +138,7 @@ export class PermissionOrgController extends Controller {
keyword: `%${searchKeyword}%`, keyword: `%${searchKeyword}%`,
}, },
) )
.orderBy("current_holders.posMasterNo", "ASC")
.skip((page - 1) * pageSize) .skip((page - 1) * pageSize)
.take(pageSize) .take(pageSize)
.getManyAndCount(); .getManyAndCount();
@ -275,9 +284,17 @@ export class PermissionOrgController extends Controller {
} else if (requestBody.searchField == "posNo") { } else if (requestBody.searchField == "posNo") {
queryLike = `CONCAT( queryLike = `CONCAT(
IFNULL(orgChild4.orgChild4ShortName, ''), IFNULL(orgChild4.orgChild4ShortName, ''),
IFNULL(current_holders.posMasterNo , '')
) LIKE :keyword OR CONCAT(
IFNULL(orgChild3.orgChild3ShortName, ''), IFNULL(orgChild3.orgChild3ShortName, ''),
IFNULL(current_holders.posMasterNo , '')
) LIKE :keyword OR CONCAT(
IFNULL(orgChild2.orgChild2ShortName, ''), IFNULL(orgChild2.orgChild2ShortName, ''),
IFNULL(current_holders.posMasterNo , '')
) LIKE :keyword OR CONCAT(
IFNULL(orgChild1.orgChild1ShortName, ''), IFNULL(orgChild1.orgChild1ShortName, ''),
IFNULL(current_holders.posMasterNo , '')
) LIKE :keyword OR CONCAT(
IFNULL(orgRoot.orgRootShortName, ''), IFNULL(orgRoot.orgRootShortName, ''),
IFNULL(current_holders.posMasterNo , '') IFNULL(current_holders.posMasterNo , '')
) LIKE :keyword`; ) LIKE :keyword`;
@ -308,6 +325,7 @@ export class PermissionOrgController extends Controller {
keyword: `%${requestBody.searchKeyword}%`, keyword: `%${requestBody.searchKeyword}%`,
}, },
) )
.orderBy("current_holders.posMasterNo", "ASC")
.skip((requestBody.page - 1) * requestBody.pageSize) .skip((requestBody.page - 1) * requestBody.pageSize)
.take(requestBody.pageSize) .take(requestBody.pageSize)
.getManyAndCount(); .getManyAndCount();

18
src/controllers/ProfileController.ts
View file

@ -3727,9 +3727,17 @@ export class ProfileController extends Controller {
} else if (searchField == "posNo") { } else if (searchField == "posNo") {
queryLike = `CONCAT( queryLike = `CONCAT(
IFNULL(orgChild4.orgChild4ShortName, ''), IFNULL(orgChild4.orgChild4ShortName, ''),
IFNULL(current_holders.posMasterNo , '')
) LIKE :keyword OR CONCAT(
IFNULL(orgChild3.orgChild3ShortName, ''), IFNULL(orgChild3.orgChild3ShortName, ''),
IFNULL(current_holders.posMasterNo , '')
) LIKE :keyword OR CONCAT(
IFNULL(orgChild2.orgChild2ShortName, ''), IFNULL(orgChild2.orgChild2ShortName, ''),
IFNULL(current_holders.posMasterNo , '')
) LIKE :keyword OR CONCAT(
IFNULL(orgChild1.orgChild1ShortName, ''), IFNULL(orgChild1.orgChild1ShortName, ''),
IFNULL(current_holders.posMasterNo , '')
) LIKE :keyword OR CONCAT(
IFNULL(orgRoot.orgRootShortName, ''), IFNULL(orgRoot.orgRootShortName, ''),
IFNULL(current_holders.posMasterNo , '') IFNULL(current_holders.posMasterNo , '')
) LIKE :keyword`; ) LIKE :keyword`;
@ -3803,6 +3811,7 @@ export class ProfileController extends Controller {
.andWhere(nodeCondition, { .andWhere(nodeCondition, {
nodeId: nodeId, nodeId: nodeId,
}) })
.orderBy("current_holders.posMasterNo", "ASC")
.skip((page - 1) * pageSize) .skip((page - 1) * pageSize)
.take(pageSize) .take(pageSize)
.getManyAndCount(); .getManyAndCount();
@ -4072,9 +4081,17 @@ export class ProfileController extends Controller {
} else if (searchField == "posNo") { } else if (searchField == "posNo") {
queryLike = `CONCAT( queryLike = `CONCAT(
IFNULL(orgChild4.orgChild4ShortName, ''), IFNULL(orgChild4.orgChild4ShortName, ''),
IFNULL(current_holders.posMasterNo , '')
) LIKE :keyword OR CONCAT(
IFNULL(orgChild3.orgChild3ShortName, ''), IFNULL(orgChild3.orgChild3ShortName, ''),
IFNULL(current_holders.posMasterNo , '')
) LIKE :keyword OR CONCAT(
IFNULL(orgChild2.orgChild2ShortName, ''), IFNULL(orgChild2.orgChild2ShortName, ''),
IFNULL(current_holders.posMasterNo , '')
) LIKE :keyword OR CONCAT(
IFNULL(orgChild1.orgChild1ShortName, ''), IFNULL(orgChild1.orgChild1ShortName, ''),
IFNULL(current_holders.posMasterNo , '')
) LIKE :keyword OR CONCAT(
IFNULL(orgRoot.orgRootShortName, ''), IFNULL(orgRoot.orgRootShortName, ''),
IFNULL(current_holders.posMasterNo , '') IFNULL(current_holders.posMasterNo , '')
) LIKE :keyword`; ) LIKE :keyword`;
@ -4198,6 +4215,7 @@ export class ProfileController extends Controller {
.andWhere(nodeCondition, { .andWhere(nodeCondition, {
nodeId: nodeId, nodeId: nodeId,
}) })
.orderBy("current_holders.posMasterNo", "ASC")
.skip((page - 1) * pageSize) .skip((page - 1) * pageSize)
.take(pageSize) .take(pageSize)
.getManyAndCount(); .getManyAndCount();

9
src/controllers/ProfileEmployeeController.ts
View file

@ -1387,9 +1387,17 @@ export class ProfileEmployeeController extends Controller {
} else if (searchField == "posNo") { } else if (searchField == "posNo") {
queryLike = `CONCAT( queryLike = `CONCAT(
IFNULL(orgChild4.orgChild4ShortName, ''), IFNULL(orgChild4.orgChild4ShortName, ''),
IFNULL(current_holders.posMasterNo , '')
) LIKE :keyword OR CONCAT(
IFNULL(orgChild3.orgChild3ShortName, ''), IFNULL(orgChild3.orgChild3ShortName, ''),
IFNULL(current_holders.posMasterNo , '')
) LIKE :keyword OR CONCAT(
IFNULL(orgChild2.orgChild2ShortName, ''), IFNULL(orgChild2.orgChild2ShortName, ''),
IFNULL(current_holders.posMasterNo , '')
) LIKE :keyword OR CONCAT(
IFNULL(orgChild1.orgChild1ShortName, ''), IFNULL(orgChild1.orgChild1ShortName, ''),
IFNULL(current_holders.posMasterNo , '')
) LIKE :keyword OR CONCAT(
IFNULL(orgRoot.orgRootShortName, ''), IFNULL(orgRoot.orgRootShortName, ''),
IFNULL(current_holders.posMasterNo , '') IFNULL(current_holders.posMasterNo , '')
) LIKE :keyword`; ) LIKE :keyword`;
@ -1516,6 +1524,7 @@ export class ProfileEmployeeController extends Controller {
.andWhere(nodeCondition, { .andWhere(nodeCondition, {
nodeId: nodeId, nodeId: nodeId,
}) })
.orderBy("current_holders.posMasterNo", "ASC")
.skip((page - 1) * pageSize) .skip((page - 1) * pageSize)
.take(pageSize) .take(pageSize)
.getManyAndCount(); .getManyAndCount();