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

Merge branch 'develop' into adiDev

Browse source
This commit is contained in:
AdisakKanthawilang 2024-11-29 16:55:35 +07:00
commit 82d357fe52
5 changed files with 71 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/controllers/DevelopmentRequestController.ts
View file

@ -163,6 +163,13 @@ export class DevelopmentRequestController extends Controller {
{
keyword: `%${keyword}%`,
},
).orWhere(
keyword != null && keyword != ""
? "developmentRequest.createdFullName LIKE :keyword"
: "1=1",
{
keyword: `%${keyword}%`,
},
);
}),
)

16
src/controllers/ProfileEditController.ts
View file

@ -60,6 +60,11 @@ export class ProfileEditController extends Controller {
{
keyword: `%${keyword}%`,
},
).orWhere(
keyword != "" && keyword != null ? "ProfileEdit.remark LIKE :keyword" : "1=1",
{
keyword: `%${keyword}%`,
},
);
}),
)
@ -114,6 +119,17 @@ export class ProfileEditController extends Controller {
{
keyword: `%${keyword}%`,
},
).orWhere(
keyword != "" && keyword != null ? "ProfileEdit.remark LIKE :keyword" : "1=1",
{
keyword: `%${keyword}%`,
},
).orWhere(
keyword != "" && keyword != null ?
"CONCAT(profile.prefix, profile.firstName, ' ', profile.lastName) LIKE :keyword" : "1=1",
{
keyword: `%${keyword}%`,
},
);
}),
)

16
src/controllers/ProfileEditEmployeeController.ts
View file

@ -65,6 +65,11 @@ export class ProfileEditEmployeeController extends Controller {
{
keyword: `%${keyword}%`,
},
).orWhere(
keyword != "" && keyword != null ? "ProfileEdit.remark LIKE :keyword" : "1=1",
{
keyword: `%${keyword}%`,
},
);
}),
)
@ -119,6 +124,17 @@ export class ProfileEditEmployeeController extends Controller {
{
keyword: `%${keyword}%`,
},
).orWhere(
keyword != "" && keyword != null ? "ProfileEdit.remark LIKE :keyword" : "1=1",
{
keyword: `%${keyword}%`,
},
).orWhere(
keyword != "" && keyword != null ?
"CONCAT(profileEmployee.prefix, profileEmployee.firstName, ' ', profileEmployee.lastName) LIKE :keyword" : "1=1",
{
keyword: `%${keyword}%`,
},
);
}),
)

28
src/controllers/WorkflowController.ts
View file

@ -907,6 +907,20 @@ export class WorkflowController extends Controller {
{
keyword: `%${body.keyword}%`,
},
).orWhere(
body.keyword != null && body.keyword != ""
? "viewDirectorActing.posNo LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,
},
).orWhere(
body.keyword != null && body.keyword != ""
? "viewDirectorActing.posExecutiveName LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,
},
);
}),
)
@ -959,6 +973,20 @@ export class WorkflowController extends Controller {
{
keyword: `%${body.keyword}%`,
},
).orWhere(
body.keyword != null && body.keyword != ""
? "viewDirector.posNo LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,
},
).orWhere(
body.keyword != null && body.keyword != ""
? "viewDirector.posExecutiveName LIKE :keyword"
: "1=1",
{
keyword: `%${body.keyword}%`,
},
);
}),
)

7
src/interfaces/extension.ts
View file

@ -230,9 +230,7 @@ class Extension {
public static ToThaiShortYear(value: Date) {
let yy = value.getFullYear() < 2400 ? value.getFullYear() + 543 : value.getFullYear();
return (
yy.toString()
);
return yy.toString();
}
public static sumObjectValues(array: any, propertyName: any) {
@ -247,6 +245,9 @@ class Extension {
public static CheckCitizen(value: string) {
let citizen = value;
if (citizen == null || citizen == "") {
return citizen;
}
if (citizen.length !== 13) {
throw new HttpError(
HttpStatus.NOT_FOUND,