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

#857 (4),(5)

Browse source
This commit is contained in:
AdisakKanthawilang 2024-12-19 10:31:21 +07:00
parent e251b16c11
commit eb1264b885
2 changed files with 35 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/controllers/DevelopmentEmployeeHistoryController.ts
View file

@ -327,15 +327,17 @@ export class DevelopmentEmployeeHistoryController extends Controller {
const formattedData = development.map((item) => ({
id: item.id,
citizenId: item.citizenId,
fullName: item.prefix != null && item.firstName != null && item.lastName != null
? `${item?.prefix}${item?.firstName} ${item?.lastName}`
: "",
fullName:
item.prefix != null && item.firstName != null && item.lastName != null
? `${item?.prefix}${item?.firstName} ${item?.lastName}`
: "",
position: item.position,
year: item.development.year,
posType: item.employeePosType ? item.employeePosType.posTypeName : null,
posLevel: item.employeePosType && item.employeePosLevel
? `${item.employeePosType.posTypeShortName} ${item.employeePosLevel.posLevelName}`
: null,
posLevel:
item.employeePosType && item.employeePosLevel
? `${item.employeePosType.posTypeShortName} ${item.employeePosLevel.posLevelName}`
: null,
projectName: item.development.projectName,
}));
@ -355,7 +357,12 @@ export class DevelopmentEmployeeHistoryController extends Controller {
if (_workflow == false) await new permission().PermissionGet(request, "SYS_DEV_HISTORY_EMP");
const type = "EMPLOYEE";
const getDevelopment = await this.developmentHistoryRepository.findOne({
relations: ["development", "employeePosLevel", "employeePosType"],
relations: [
"development",
"development.developmentOthers",
"employeePosLevel",
"employeePosType",
],
where: { id: id, type: type },
});
if (!getDevelopment) {
@ -389,14 +396,20 @@ export class DevelopmentEmployeeHistoryController extends Controller {
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,
// 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,
academic: getDevelopment.development?.developmentOthers
? getDevelopment.development.developmentOthers.map((dev) => ({
topicAcademic: dev.topicAcademic,
addressAcademic: dev.addressAcademic,
}))
: [],
};
return new HttpSuccess(formattedData);

16
src/controllers/DevelopmentHistoryController.ts
View file

@ -350,7 +350,7 @@ export class DevelopmentOfficerHistoryController extends Controller {
await new permission().PermissionGet(request, "SYS_DEV_HISTORY_OFFICER");
const type = "OFFICER";
const getDevelopment = await this.developmentHistoryRepository.findOne({
relations: ["development", "posLevel", "posType"],
relations: ["development", "development.developmentOthers","posLevel", "posType"],
where: { id: id, type: type },
});
if (!getDevelopment) {
@ -381,14 +381,20 @@ export class DevelopmentOfficerHistoryController extends Controller {
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,
// 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,
academic: getDevelopment.development?.developmentOthers
? getDevelopment.development.developmentOthers.map(dev => ({
topicAcademic: dev.topicAcademic,
addressAcademic: dev.addressAcademic
}))
: []
};
return new HttpSuccess(formattedData);