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

Merge branch 'develop' of github.com:Frappet/bma-ehr-development into develop

Browse source
This commit is contained in:
Kittapath 2024-04-30 13:20:22 +07:00
commit 722adb571a
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/controllers/DevelopmentScholarshipController.ts
View file

@ -174,6 +174,14 @@ export class DevelopmentScholarshipController extends Controller {
keyword: `%${keyword}%`, keyword: `%${keyword}%`,
}, },
) )
.orWhere(
keyword != null && keyword != ""
? "developmentScholarship.citizenId LIKE :keyword"
: "1=1",
{
keyword: `%${keyword}%`,
},
)
.orWhere( .orWhere(
keyword != null && keyword != "" keyword != null && keyword != ""
? "developmentScholarship.position LIKE :keyword" ? "developmentScholarship.position LIKE :keyword"

2
src/controllers/ReportController.ts
View file

@ -286,6 +286,8 @@ export class ReportController extends Controller {
? "" ? ""
: Extension.ToThaiNumber(Extension.ToThaiFullDate(getDevelopment.graduatedDate)), : Extension.ToThaiNumber(Extension.ToThaiFullDate(getDevelopment.graduatedDate)),
graduatedReason: getDevelopment.graduatedReason, graduatedReason: getDevelopment.graduatedReason,
useOfficialTime: getDevelopment.useOfficialTime,
isGraduated: getDevelopment.isGraduated
}; };
return new HttpSuccess({ return new HttpSuccess({