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-03 14:55:21 +07:00
commit da6b3dcc4e
2 changed files with 55 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/controllers/DevelopmentEmployeeHistoryController.ts
View file

@ -216,11 +216,37 @@ export class DevelopmentEmployeeHistoryController extends Controller {
async GetDevelopemtHistoryById(@Path() id: string) {
const type = "EMPLOYEE";
const getDevelopment = await this.developmentHistoryRepository.findOne({
relations: ["development"],
where: { id: id, type: type },
});
if (!getDevelopment) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลประวัติการฝึกอบรม/ดูงานนี้");
}
return new HttpSuccess(getDevelopment);
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.posLevelId ? getDevelopment.posLevelId : null,
posTypeId: getDevelopment.posTypeId ? getDevelopment.posTypeId : null,
developmentId: getDevelopment.developmentId ? getDevelopment.developmentId : null,
order: getDevelopment.order ? getDevelopment.order : null,
dateOrder: getDevelopment.dateOrder ? getDevelopment.dateOrder : 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,
dateStartAcademic: new Date(),
dateEndAcademic: new Date(),
org: null,
};
return new HttpSuccess(formattedData);
}
}

30
src/controllers/DevelopmentHistoryController.ts
View file

@ -208,15 +208,41 @@ export class DevelopmentOfficerHistoryController extends Controller {
*
* @param {string} id Id โครงการ
*/
@Get("{id}")
@Get("{id}")
async GetDevelopemtHistoryById(@Path() id: string) {
const type = "OFFICER";
const getDevelopment = await this.developmentHistoryRepository.findOne({
relations: ["development"],
where: { id: id, type: type },
});
if (!getDevelopment) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลประวัติการฝึกอบรม/ดูงานนี้");
}
return new HttpSuccess(getDevelopment);
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.posLevelId ? getDevelopment.posLevelId : null,
posTypeId: getDevelopment.posTypeId ? getDevelopment.posTypeId : null,
developmentId: getDevelopment.developmentId ? getDevelopment.developmentId : null,
order: getDevelopment.order ? getDevelopment.order : null,
dateOrder: getDevelopment.dateOrder ? getDevelopment.dateOrder : 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,
dateStartAcademic: new Date(),
dateEndAcademic: new Date(),
org: null,
};
return new HttpSuccess(formattedData);
}
}