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

เช็ค ระบบเงินเดือน #813

Browse source
This commit is contained in:
AdisakKanthawilang 2024-11-29 16:49:05 +07:00
parent a56c55d0ac
commit 0358ce42ce
3 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/controllers/SalaryFormulaEmployeeController.ts
View file

@ -251,6 +251,7 @@ export class SalaryFormulaEmployeeController extends Controller {
{ details: Like(`%${keyword}%`) },
{ position: Like(`%${keyword}%`) },
{ posLevel: { posLevelName: Like(`%${keyword}%`) } },
{ posType: { posTypeName: Like(`%${keyword}%`) } },
],
)
.andWhere(posTypeId == undefined ? "1=1" : { posTypeId: Like(`%${posTypeId}%`) })

5
src/controllers/SalaryPeriodController.ts
View file

@ -1215,6 +1215,8 @@ export class SalaryPeriodController extends Controller {
.orWhere("profile.prefix LIKE :keyword", { keyword: `%${body.keyword}%` })
.orWhere("profile.firstName LIKE :keyword", { keyword: `%${body.keyword}%` })
.orWhere("profile.lastName LIKE :keyword", { keyword: `%${body.keyword}%` })
.orWhere("CONCAT(profile.prefix,profile.firstName,' ',profile.lastName) LIKE :keyword", { keyword: `%${body.keyword}%` })
.orWhere("CONCAT(profile.orgShortName,profile.posMasterNo) LIKE :keyword", { keyword: `%${body.keyword}%` })
// .orWhere("profile.citizenId LIKE :keyword", { keyword: `%${body.keyword}%` })
.orWhere("profile.position LIKE :keyword", { keyword: `%${body.keyword}%` })
// .orWhere("profile.posType LIKE :keyword", { keyword: `%${body.keyword}%` })
@ -2042,7 +2044,8 @@ export class SalaryPeriodController extends Controller {
"salaryPeriod.year",
"salaryPeriod.revisionId",
])
.orderBy("salaryPeriod.effectiveDate", "DESC")
.orderBy("salaryPeriod.year", "DESC")
.addOrderBy("salaryPeriod.effectiveDate", "DESC")
.skip((page - 1) * pageSize)
.take(pageSize)
.getManyAndCount();

2
src/controllers/SalaryPeriodEmployeeController.ts
View file

@ -893,6 +893,8 @@ export class SalaryPeriodEmployeeController extends Controller {
.orWhere("profile.prefix LIKE :keyword", { keyword: `%${body.keyword}%` })
.orWhere("profile.firstName LIKE :keyword", { keyword: `%${body.keyword}%` })
.orWhere("profile.lastName LIKE :keyword", { keyword: `%${body.keyword}%` })
.orWhere("CONCAT(profile.prefix,profile.firstName,' ',profile.lastName) LIKE :keyword", { keyword: `%${body.keyword}%` })
.orWhere("CONCAT(profile.orgShortName,profile.posMasterNo) LIKE :keyword", { keyword: `%${body.keyword}%` })
// .orWhere("profile.citizenId LIKE :keyword", { keyword: `%${body.keyword}%` })
.orWhere("profile.position LIKE :keyword", { keyword: `%${body.keyword}%` })
// .orWhere("profile.posType LIKE :keyword", { keyword: `%${body.keyword}%` })