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

fix

Browse source
This commit is contained in:
AdisakKanthawilang 2024-06-13 11:59:09 +07:00
parent ae1a382dd0
commit 39de288f5b
2 changed files with 55 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/controllers/ProfileController.ts
View file

@ -2085,7 +2085,7 @@ export class ProfileController extends Controller {
const latestProfileEducation = await this.profileEducationRepository.findOne({ const latestProfileEducation = await this.profileEducationRepository.findOne({
where: { profileId: item.id }, where: { profileId: item.id },
order: { createdAt: "DESC" }, order: { endDate: "DESC" },
}); });
return { return {
@ -2127,29 +2127,29 @@ export class ProfileController extends Controller {
posTypeName: item.posType?.posTypeName, posTypeName: item.posType?.posTypeName,
posLevelId: item.posLevelId, posLevelId: item.posLevelId,
posLevelName: item.posLevel?.posLevelName, posLevelName: item.posLevel?.posLevelName,
profileEducation: latestProfileEducation?.degree ?? null, educationDegree: latestProfileEducation != null && latestProfileEducation.educationLevel != null ? latestProfileEducation.educationLevel : null,
// ? { // ? {
// id: latestProfileEducation.id, // id: latestProfileEducation.id,
// degree: latestProfileEducation.degree, // degree: latestProfileEducation.degree,
// country: latestProfileEducation.country, // country: latestProfileEducation.country,
// duration: latestProfileEducation.duration, // duration: latestProfileEducation.duration,
// durationYear: latestProfileEducation.durationYear, // durationYear: latestProfileEducation.durationYear,
// field: latestProfileEducation.field, // field: latestProfileEducation.field,
// finishDate: latestProfileEducation.finishDate, // finishDate: latestProfileEducation.finishDate,
// fundName: latestProfileEducation.fundName, // fundName: latestProfileEducation.fundName,
// gpa: latestProfileEducation.gpa, // gpa: latestProfileEducation.gpa,
// institute: latestProfileEducation.institute, // institute: latestProfileEducation.institute,
// other: latestProfileEducation.other, // other: latestProfileEducation.other,
// startDate: latestProfileEducation.startDate, // startDate: latestProfileEducation.startDate,
// endDate: latestProfileEducation.endDate, // endDate: latestProfileEducation.endDate,
// educationLevel: latestProfileEducation.educationLevel, // educationLevel: latestProfileEducation.educationLevel,
// positionPath: latestProfileEducation.positionPath, // positionPath: latestProfileEducation.positionPath,
// positionPathId: latestProfileEducation.positionPathId, // positionPathId: latestProfileEducation.positionPathId,
// isDate: latestProfileEducation.isDate, // isDate: latestProfileEducation.isDate,
// isEducation: latestProfileEducation.isEducation, // isEducation: latestProfileEducation.isEducation,
// note: latestProfileEducation.note, // note: latestProfileEducation.note,
// } // }
// : null, // : null,
}; };
}), }),
); );

58
src/controllers/ProfileEmployeeController.ts
View file

@ -1504,10 +1504,11 @@ export class ProfileEmployeeController extends Controller {
(x) => x.orgRevisionId == findRevision.id, (x) => x.orgRevisionId == findRevision.id,
)?.posMasterNo; )?.posMasterNo;
const latestProfileEducation = await this.profileEducationRepository.findOne({ const latestProfileEducation = await this.profileEducationRepository.findOne({
where: { profileEmployeeId: item.id }, where: { profileEmployeeId: item.id },
order: { createdAt: "DESC" }, order: { endDate: "DESC" },
}); });
return { return {
id: item.id, id: item.id,
@ -1548,29 +1549,32 @@ export class ProfileEmployeeController extends Controller {
posTypeName: item.posType?.posTypeName, posTypeName: item.posType?.posTypeName,
posLevelId: item.posLevelId, posLevelId: item.posLevelId,
posLevelName: item.posLevel?.posLevelName, posLevelName: item.posLevel?.posLevelName,
profileEducation: latestProfileEducation?.degree ?? null, educationDegree:
// ? { latestProfileEducation != null && latestProfileEducation.educationLevel != null
// id: latestProfileEducation.id, ? latestProfileEducation.educationLevel
// degree: latestProfileEducation.degree, : null,
// country: latestProfileEducation.country, // ? {
// duration: latestProfileEducation.duration, // id: latestProfileEducation.id,
// durationYear: latestProfileEducation.durationYear, // degree: latestProfileEducation.degree,
// field: latestProfileEducation.field, // country: latestProfileEducation.country,
// finishDate: latestProfileEducation.finishDate, // duration: latestProfileEducation.duration,
// fundName: latestProfileEducation.fundName, // durationYear: latestProfileEducation.durationYear,
// gpa: latestProfileEducation.gpa, // field: latestProfileEducation.field,
// institute: latestProfileEducation.institute, // finishDate: latestProfileEducation.finishDate,
// other: latestProfileEducation.other, // fundName: latestProfileEducation.fundName,
// startDate: latestProfileEducation.startDate, // gpa: latestProfileEducation.gpa,
// endDate: latestProfileEducation.endDate, // institute: latestProfileEducation.institute,
// educationLevel: latestProfileEducation.educationLevel, // other: latestProfileEducation.other,
// positionPath: latestProfileEducation.positionPath, // startDate: latestProfileEducation.startDate,
// positionPathId: latestProfileEducation.positionPathId, // endDate: latestProfileEducation.endDate,
// isDate: latestProfileEducation.isDate, // educationLevel: latestProfileEducation.educationLevel,
// isEducation: latestProfileEducation.isEducation, // positionPath: latestProfileEducation.positionPath,
// note: latestProfileEducation.note, // positionPathId: latestProfileEducation.positionPathId,
// } // isDate: latestProfileEducation.isDate,
// : null, // isEducation: latestProfileEducation.isEducation,
// note: latestProfileEducation.note,
// }
// : null,
}; };
}), }),
); );