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

fix

Browse source
This commit is contained in:
AdisakKanthawilang 2025-04-24 10:11:34 +07:00
parent 6cf0aa117c
commit 25fc86c8a8
1 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/controllers/ReportController.ts
View file

@ -161,6 +161,8 @@ export class ReoportController {
.leftJoin("evaluation.salaries", "salaries")
.leftJoin("evaluation.training", "training")
.leftJoin("evaluation.assessment", "assessment")
.leftJoin("evaluation.portfolios", "portfolios")
.leftJoin("evaluation.performances", "performances")
.where("evaluation.id = :id", { id })
.select([
"evaluation.id",
@ -269,6 +271,14 @@ export class ReoportController {
"assessment.point2",
"assessment.pointSumTotal",
"assessment.pointSum",
"portfolios.name",
"portfolios.detail",
"performances.year",
"performances.type",
"performances.subject",
"performances.evaluationResult",
])
.orderBy("salaries.commandDateAffect", "DESC")
.getOne();
@ -353,7 +363,7 @@ export class ReoportController {
detailAnnounceStep5Footer: evaluation.detailAnnounceStep5Footer,
positionAreaWithSym: evaluation.positionArea?`(${Extension.ToThaiNumber(evaluation.positionArea)})` : "",
posExecutive: evaluation.posExecutive,
posFull: (evaluation.position ? `${evaluation.position}` : "") + (evaluation.posExecutive ? " " + `${evaluation.posExecutive}` : "") + (evaluation.positionLevel ? " " + `${evaluation.positionLevel}` : ""),
posFull: (evaluation.position ? `${evaluation.position}` : "") + (evaluation.positionLevel ? `${evaluation.positionLevel}` : "") + (evaluation.posExecutive ? " " + `${evaluation.posExecutive}` : "") ,
birthDate:
evaluation.birthDate != null && evaluation.birthDate != ""
? Extension.ToThaiNumber(
@ -499,6 +509,16 @@ export class ReoportController {
pointSumTotal: assessment.pointSumTotal,
pointSum: assessment.pointSum,
})),
portfolios: evaluation.portfolios.map((portfolio) => ({
name: portfolio.name,
detail: portfolio.detail,
})),
performances: evaluation.performances.map((performance) => ({
year: performance.year ? Extension.ToThaiNumber(performance.year.toString()) : "-",
type: performance.type,
subject: performance.subject,
evaluationResult: performance.evaluationResult,
})),
commanderFullname: commanderFullname ? commanderFullname : "-",
commanderPosition: commanderPosition ? commanderPosition : "-",
commanderRootName: commanderRootName ? commanderRootName : "-",
@ -507,6 +527,7 @@ export class ReoportController {
commanderAbovePosition: commanderAbovePosition ? commanderAbovePosition : "-",
commanderAboveRootName: commanderAboveRootName ? commanderAboveRootName : "-",
commanderAboveOrg: commanderAboveOrg ? commanderAboveOrg : "-",
// commanderPositionSign: `${commanderPosition} สำนักงานการเจ้าหน้าที่ ${commanderRootName}` + `\n` + `${commanderAbovePosition} ${commanderAboveRootName}`,
years: years,
};