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

โครงการเพิ่มค้นหาหน่วยงาน

Browse source
This commit is contained in:
Kittapath 2024-04-17 22:34:21 +07:00
parent 281a8515ba
commit ddc0e85e3e
5 changed files with 297 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

73
src/controllers/DevelopmentEmployeeHistoryController.ts
View file

@ -345,45 +345,40 @@ export class DevelopmentEmployeeHistoryController extends Controller {
}
const formattedData = {
rank: getDevelopment.rank ? getDevelopment.rank : null,
prefix: getDevelopment.prefix ? getDevelopment.prefix : null,
firstName: getDevelopment.firstName ? getDevelopment.firstName : null,
lastName: getDevelopment.lastName ? getDevelopment.lastName : null,
citizenId: getDevelopment.citizenId ? getDevelopment.citizenId : null,
position: getDevelopment.position ? getDevelopment.position : null,
posLevelId: getDevelopment.employeePosLevelId ? getDevelopment.employeePosLevelId : null,
posLevelName: getDevelopment.employeePosLevel.posLevelName
? getDevelopment.employeePosLevel.posLevelName
: null,
posTypeId: getDevelopment.employeePosTypeId ? getDevelopment.employeePosTypeId : null,
posTypeName: getDevelopment.employeePosType.posTypeName
? getDevelopment.employeePosType.posTypeName
: null,
developmentId: getDevelopment.developmentId ? getDevelopment.developmentId : null,
order: getDevelopment.order ? getDevelopment.order : null,
dateOrder: getDevelopment.dateOrder ? getDevelopment.dateOrder : null,
dateHisStart: getDevelopment.dateStart ? getDevelopment.dateStart : null,
dateHisEnd: getDevelopment.dateEnd ? getDevelopment.dateEnd : null,
year: getDevelopment.development.year ? getDevelopment.development.year : null,
projectName: getDevelopment.development.projectName
? getDevelopment.development.projectName
: null,
dateStart: getDevelopment.development.dateStart ? getDevelopment.development.dateStart : null,
dateEnd: getDevelopment.development.dateEnd ? getDevelopment.development.dateEnd : null,
totalDate: getDevelopment.development.totalDate ? getDevelopment.development.totalDate : null,
addressAcademic: getDevelopment.development.addressAcademic
? getDevelopment.development.addressAcademic
: null,
topicAcademic: getDevelopment.development.topicAcademic
? getDevelopment.development.topicAcademic
: null,
dateStudyStart: getDevelopment.development.dateStudyStart
? getDevelopment.development.dateStudyStart
: null,
dateStudyEnd: getDevelopment.development.dateStudyEnd
? getDevelopment.development.dateStudyEnd
: null,
org: null,
rank: getDevelopment.rank,
org: getDevelopment.org,
prefix: getDevelopment.prefix,
firstName: getDevelopment.firstName,
lastName: getDevelopment.lastName,
citizenId: getDevelopment.citizenId,
position: getDevelopment.position,
posLevelId: getDevelopment.employeePosLevelId,
posLevelName:
getDevelopment.employeePosLevel != null
? getDevelopment.employeePosLevel.posLevelName
: null,
posTypeId: getDevelopment.employeePosTypeId,
posTypeName:
getDevelopment.employeePosType != null ? getDevelopment.employeePosType.posTypeName : null,
developmentId: getDevelopment.developmentId,
order: getDevelopment.order,
dateOrder: getDevelopment.dateOrder,
dateHisStart: getDevelopment.dateStart,
dateHisEnd: getDevelopment.dateEnd,
year: getDevelopment.development != null ? getDevelopment.development.year : null,
projectName:
getDevelopment.development != null ? getDevelopment.development.projectName : null,
dateStart: getDevelopment.development != null ? getDevelopment.development.dateStart : null,
dateEnd: getDevelopment.development != null ? getDevelopment.development.dateEnd : null,
totalDate: getDevelopment.development != null ? getDevelopment.development.totalDate : null,
addressAcademic:
getDevelopment.development != null ? getDevelopment.development.addressAcademic : null,
topicAcademic:
getDevelopment.development != null ? getDevelopment.development.topicAcademic : null,
dateStudyStart:
getDevelopment.development != null ? getDevelopment.development.dateStudyStart : null,
dateStudyEnd:
getDevelopment.development != null ? getDevelopment.development.dateStudyEnd : null,
};
return new HttpSuccess(formattedData);