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

search probation

Browse source
This commit is contained in:
kittapath 2024-12-25 01:10:49 +07:00
parent 4cb2887784
commit 51c6d8f615
3 changed files with 99 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/controllers/ProfileEmployeeTempController.ts
View file

@ -1867,7 +1867,7 @@ export class ProfileEmployeeTempController extends Controller {
: profile.current_holders.find((x) => x.orgRevisionId == orgRevisionPublish.id)?.orgChild4
.orgChild4Name,
salary: profile ? profile.amount : null,
amountSpecial: profile ? profile.amountSpecial : null
amountSpecial: profile ? profile.amountSpecial : null,
};
return new HttpSuccess(_profile);
}
@ -2472,9 +2472,11 @@ export class ProfileEmployeeTempController extends Controller {
.leftJoinAndSelect("current_holders.orgChild2", "orgChild2")
.leftJoinAndSelect("current_holders.orgChild3", "orgChild3")
.leftJoinAndSelect("current_holders.orgChild4", "orgChild4")
.where("profile.prefix LIKE :keyword", { keyword: `%${body.keyword}%` })
.orWhere("profile.firstName LIKE :keyword", { keyword: `%${body.keyword}%` })
.orWhere("profile.lastName LIKE :keyword", { keyword: `%${body.keyword}%` })
.where("CONCAT(profile.prefix, profile.firstName, ' ', profile.lastName) LIKE :keyword", {
keyword: `%${body.keyword}%`,
})
// .orWhere("profile.firstName LIKE :keyword", { keyword: `%${body.keyword}%` })
// .orWhere("profile.lastName LIKE :keyword", { keyword: `%${body.keyword}%` })
.orWhere("profile.position LIKE :keyword", { keyword: `%${body.keyword}%` })
.orWhere("posLevel.posLevelName LIKE :keyword", { keyword: `%${body.keyword}%` })
.orderBy("profile.citizenId", "ASC")