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

useOfficialTime send false

Browse source
This commit is contained in:
Kittapath 2024-04-09 16:30:29 +07:00
parent 58a30a7c74
commit 68c31be431
1 changed files with 49 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/controllers/DevelopmentScholarshipController.ts
View file

@ -158,10 +158,9 @@ export class DevelopmentScholarshipController extends Controller {
) )
.andWhere( .andWhere(
scholarshipType != null && scholarshipType != undefined scholarshipType != null && scholarshipType != undefined
? ? "developmentScholarship.scholarshipType = :scholarshipType"
"developmentScholarship.scholarshipType = :scholarshipType"
: "1=1", : "1=1",
{ scholarshipType: scholarshipType } { scholarshipType: scholarshipType },
) )
.andWhere( .andWhere(
new Brackets((qb) => { new Brackets((qb) => {
@ -245,27 +244,43 @@ export class DevelopmentScholarshipController extends Controller {
position: getDevelopment.position ? getDevelopment.position : null, position: getDevelopment.position ? getDevelopment.position : null,
posExecutive: getDevelopment.posExecutive ? getDevelopment.posExecutive : null, posExecutive: getDevelopment.posExecutive ? getDevelopment.posExecutive : null,
posLevelId: getDevelopment.posLevelId ? getDevelopment.posLevelId : null, posLevelId: getDevelopment.posLevelId ? getDevelopment.posLevelId : null,
posLevelName: getDevelopment.posLevel?.posLevelName ? getDevelopment.posLevel?.posLevelName : null, posLevelName: getDevelopment.posLevel?.posLevelName
? getDevelopment.posLevel?.posLevelName
: null,
posTypeId: getDevelopment.posTypeId ? getDevelopment.posTypeId : null, posTypeId: getDevelopment.posTypeId ? getDevelopment.posTypeId : null,
posTypeName: getDevelopment.posType?.posTypeName ? getDevelopment.posType?.posTypeName : null, posTypeName: getDevelopment.posType?.posTypeName ? getDevelopment.posType?.posTypeName : null,
guarantorRank: getDevelopment.guarantorRank ? getDevelopment.guarantorRank : null, guarantorRank: getDevelopment.guarantorRank ? getDevelopment.guarantorRank : null,
guarantorPrefix: getDevelopment.guarantorPrefix ? getDevelopment.guarantorPrefix : null, guarantorPrefix: getDevelopment.guarantorPrefix ? getDevelopment.guarantorPrefix : null,
guarantorFirstName: getDevelopment.guarantorFirstName ? getDevelopment.guarantorFirstName : null, guarantorFirstName: getDevelopment.guarantorFirstName
? getDevelopment.guarantorFirstName
: null,
guarantorLastName: getDevelopment.guarantorLastName ? getDevelopment.guarantorLastName : null, guarantorLastName: getDevelopment.guarantorLastName ? getDevelopment.guarantorLastName : null,
guarantorCitizenId: getDevelopment.guarantorCitizenId ? getDevelopment.guarantorCitizenId : null, guarantorCitizenId: getDevelopment.guarantorCitizenId
? getDevelopment.guarantorCitizenId
: null,
guarantorPosition: getDevelopment.guarantorPosition ? getDevelopment.guarantorPosition : null, guarantorPosition: getDevelopment.guarantorPosition ? getDevelopment.guarantorPosition : null,
guarantorPosExecutive: getDevelopment.guarantorPosExecutive ? getDevelopment.guarantorPosExecutive : null, guarantorPosExecutive: getDevelopment.guarantorPosExecutive
posLevelguarantorId: getDevelopment.posLevelguarantorId ? getDevelopment.posLevelguarantorId : null, ? getDevelopment.guarantorPosExecutive
posLevelguarantorName: getDevelopment.posLevelguarantor?.posLevelName ? getDevelopment.posLevelguarantor?.posLevelName : null, : null,
posTypeguarantorId: getDevelopment.posTypeguarantorId ? getDevelopment.posTypeguarantorId : null, posLevelguarantorId: getDevelopment.posLevelguarantorId
posTypeguarantorName: getDevelopment.posTypeguarantor?.posTypeName ? getDevelopment.posTypeguarantor?.posTypeName : null, ? getDevelopment.posLevelguarantorId
: null,
posLevelguarantorName: getDevelopment.posLevelguarantor?.posLevelName
? getDevelopment.posLevelguarantor?.posLevelName
: null,
posTypeguarantorId: getDevelopment.posTypeguarantorId
? getDevelopment.posTypeguarantorId
: null,
posTypeguarantorName: getDevelopment.posTypeguarantor?.posTypeName
? getDevelopment.posTypeguarantor?.posTypeName
: null,
scholarshipYear: getDevelopment.scholarshipYear ? getDevelopment.scholarshipYear : null, scholarshipYear: getDevelopment.scholarshipYear ? getDevelopment.scholarshipYear : null,
budgetSource: getDevelopment.budgetSource ? getDevelopment.budgetSource : null, budgetSource: getDevelopment.budgetSource ? getDevelopment.budgetSource : null,
budgetApprove: getDevelopment.budgetApprove ? getDevelopment.budgetApprove : null, budgetApprove: getDevelopment.budgetApprove ? getDevelopment.budgetApprove : null,
bookNo: getDevelopment.bookNo ? getDevelopment.bookNo : null, bookNo: getDevelopment.bookNo ? getDevelopment.bookNo : null,
bookNoDate: getDevelopment.bookNoDate ? getDevelopment.bookNoDate : null, bookNoDate: getDevelopment.bookNoDate ? getDevelopment.bookNoDate : null,
bookApproveDate: getDevelopment.bookApproveDate ? getDevelopment.bookApproveDate : null, bookApproveDate: getDevelopment.bookApproveDate ? getDevelopment.bookApproveDate : null,
useOfficialTime: getDevelopment.useOfficialTime ? getDevelopment.useOfficialTime : null, useOfficialTime: getDevelopment.useOfficialTime ? getDevelopment.useOfficialTime : false,
changeDetail: getDevelopment.changeDetail ? getDevelopment.changeDetail : null, changeDetail: getDevelopment.changeDetail ? getDevelopment.changeDetail : null,
scholarshipType: getDevelopment.scholarshipType ? getDevelopment.scholarshipType : null, scholarshipType: getDevelopment.scholarshipType ? getDevelopment.scholarshipType : null,
fundType: getDevelopment.fundType ? getDevelopment.fundType : null, fundType: getDevelopment.fundType ? getDevelopment.fundType : null,
@ -278,7 +293,9 @@ export class DevelopmentScholarshipController extends Controller {
course: getDevelopment.course ? getDevelopment.course : null, course: getDevelopment.course ? getDevelopment.course : null,
field: getDevelopment.field ? getDevelopment.field : null, field: getDevelopment.field ? getDevelopment.field : null,
faculty: getDevelopment.faculty ? getDevelopment.faculty : null, faculty: getDevelopment.faculty ? getDevelopment.faculty : null,
educationalInstitution: getDevelopment.educationalInstitution ? getDevelopment.educationalInstitution : null, educationalInstitution: getDevelopment.educationalInstitution
? getDevelopment.educationalInstitution
: null,
startDate: getDevelopment.startDate ? getDevelopment.startDate : null, startDate: getDevelopment.startDate ? getDevelopment.startDate : null,
endDate: getDevelopment.endDate ? getDevelopment.endDate : null, endDate: getDevelopment.endDate ? getDevelopment.endDate : null,
studyPlace: getDevelopment.studyPlace ? getDevelopment.studyPlace : null, studyPlace: getDevelopment.studyPlace ? getDevelopment.studyPlace : null,
@ -287,9 +304,13 @@ export class DevelopmentScholarshipController extends Controller {
studyEndDate: getDevelopment.studyEndDate ? getDevelopment.studyEndDate : null, studyEndDate: getDevelopment.studyEndDate ? getDevelopment.studyEndDate : null,
studyCountry: getDevelopment.studyCountry ? getDevelopment.studyCountry : null, studyCountry: getDevelopment.studyCountry ? getDevelopment.studyCountry : null,
studyAbroadTopic: getDevelopment.studyAbroadTopic ? getDevelopment.studyAbroadTopic : null, studyAbroadTopic: getDevelopment.studyAbroadTopic ? getDevelopment.studyAbroadTopic : null,
studyAbroadStartDate: getDevelopment.studyAbroadStartDate ? getDevelopment.studyAbroadStartDate : null, studyAbroadStartDate: getDevelopment.studyAbroadStartDate
studyAbroadEndDate: getDevelopment.studyAbroadEndDate ? getDevelopment.studyAbroadEndDate : null, ? getDevelopment.studyAbroadStartDate
totalPeriod: getDevelopment.totalPeriod ? getDevelopment.totalPeriod : null : null,
studyAbroadEndDate: getDevelopment.studyAbroadEndDate
? getDevelopment.studyAbroadEndDate
: null,
totalPeriod: getDevelopment.totalPeriod ? getDevelopment.totalPeriod : null,
}; };
return new HttpSuccess(formattedData); return new HttpSuccess(formattedData);
} }