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

Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop

Browse source
This commit is contained in:
mamoss 2025-03-26 10:19:54 +07:00
commit a34a048dee
5 changed files with 35 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/controllers/ProfileEmployeeController.ts
View file

@ -2103,29 +2103,12 @@ export class ProfileEmployeeController extends Controller {
.andWhere(
new Brackets((qb) => {
qb.where(
requestBody.keyword != null && requestBody.keyword != ""
? "profileEmployee.prefix LIKE :keyword"
requestBody.keyword != null && requestBody.keyword != ""
? `CONCAT(profileEmployee.prefix, profileEmployee.firstName," ",profileEmployee.lastName) LIKE :keyword`
: "1=1",
{
keyword: `%${requestBody.keyword}%`,
},
)
.orWhere(
requestBody.keyword != null && requestBody.keyword != ""
? "profileEmployee.firstName LIKE :keyword"
: "1=1",
{
keyword: `%${requestBody.keyword}%`,
},
)
.orWhere(
requestBody.keyword != null && requestBody.keyword != ""
? "profileEmployee.lastName LIKE :keyword"
: "1=1",
{
keyword: `%${requestBody.keyword}%`,
},
)
})
.orWhere(
requestBody.keyword != null && requestBody.keyword != ""
? "profileEmployee.citizenId LIKE :keyword"

47
src/controllers/ProfileEmployeeTempController.ts
View file

@ -1703,28 +1703,11 @@ export class ProfileEmployeeTempController extends Controller {
new Brackets((qb) => {
qb.where(
requestBody.keyword != null && requestBody.keyword != ""
? "profileEmployee.prefix LIKE :keyword"
? `CONCAT(profileEmployee.prefix, profileEmployee.firstName," ",profileEmployee.lastName) LIKE :keyword`
: "1=1",
{
keyword: `%${requestBody.keyword}%`,
},
)
.orWhere(
requestBody.keyword != null && requestBody.keyword != ""
? "profileEmployee.firstName LIKE :keyword"
: "1=1",
{
keyword: `%${requestBody.keyword}%`,
},
)
.orWhere(
requestBody.keyword != null && requestBody.keyword != ""
? "profileEmployee.lastName LIKE :keyword"
: "1=1",
{
keyword: `%${requestBody.keyword}%`,
},
)
})
.orWhere(
requestBody.keyword != null && requestBody.keyword != ""
? "profileEmployee.citizenId LIKE :keyword"
@ -1732,7 +1715,31 @@ export class ProfileEmployeeTempController extends Controller {
{
keyword: `%${requestBody.keyword}%`,
},
);
)
// .orWhere(
// requestBody.keyword != null && requestBody.keyword != ""
// ? "profileEmployee.position LIKE :keyword"
// : "1=1",
// {
// keyword: `%${requestBody.keyword}%`,
// },
// )
// .orWhere(
// requestBody.keyword != null && requestBody.keyword != ""
// ? "posType.posTypeName LIKE :keyword"
// : "1=1",
// {
// keyword: `%${requestBody.keyword}%`,
// },
// )
// .orWhere(
// requestBody.keyword != null && requestBody.keyword != ""
// ? `CONCAT(posType.posTypeShortName," ",posLevel.posLevelName) LIKE :keyword`
// : "1=1",
// {
// keyword: `%${requestBody.keyword}%`,
// },
// );
}),
)
.andWhere(

1
src/controllers/ProfileSalaryTempController.ts
View file

@ -1114,6 +1114,7 @@ export class ProfileSalaryTempController extends Controller {
} else if (profileEmployee) {
history.profileEmployeeId = profileId;
}
history.returnedDate = new Date();
history.examinerName = req.user.name;
history.createdFullName = req.user.name;
history.lastUpdateFullName = req.user.name;

1
src/entities/PositionSalaryEditHistory.ts
View file

@ -57,7 +57,6 @@ export class PositionSalaryEditHistory extends EntityBase {
}
export class CreatePositionSalaryEditHistory {
returnedDate: Date;
detailForEdit: string | null;
}

4
src/entities/ProfileSalaryTemp.ts
View file

@ -342,6 +342,8 @@ export class CreateProfileSalaryTemp {
isGovernment?: boolean | null;
positionCee?: string | null;
commandName?: string | null;
posNumCodeSit?: string | null;
posNumCodeSitAbb?: string | null;
}
export type UpdateProfileSalaryTemp = {
@ -373,4 +375,6 @@ export type UpdateProfileSalaryTemp = {
isGovernment?: boolean | null;
positionCee?: string | null;
commandName?: string | null;
posNumCodeSit?: string | null;
posNumCodeSitAbb?: string | null;
};