diff --git a/src/controllers/KpiUserEvaluationController.ts b/src/controllers/KpiUserEvaluationController.ts index a6f1b09..c988b61 100644 --- a/src/controllers/KpiUserEvaluationController.ts +++ b/src/controllers/KpiUserEvaluationController.ts @@ -75,6 +75,9 @@ export class KpiUserEvaluationController extends Controller { evaluationStatus: item.evaluationStatus, evaluationResults: item.evaluationResults, createdAt: item.createdAt, + evaluatorId: item.evaluatorId, + commanderId: item.commanderId, + commanderHighId: item.commanderHighId, })); return new HttpSuccess({ data: mapData, total }); } @@ -183,8 +186,6 @@ export class KpiUserEvaluationController extends Controller { ); } - // kpiUserEvaluation.evaluationStatus = requestBody.evaluationStatus - // kpiUserEvaluation.evaluationResults = requestBody.evaluationResults kpiUserEvaluation.lastUpdateUserId = request.user.sub; kpiUserEvaluation.lastUpdateFullName = request.user.name; this.kpiUserEvalutionRepository.merge(kpiUserEvaluation, requestBody); @@ -213,6 +214,9 @@ export class KpiUserEvaluationController extends Controller { "evaluationStatus", "evaluationResults", "createdAt", + "evaluatorId", + "commanderId", + "commanderHighId", ], }); if (!kpiUserEvaluation) { @@ -256,6 +260,9 @@ export class KpiUserEvaluationController extends Controller { kpiPeriodId: item.kpiPeriodId, evaluationStatus: item.evaluationStatus, evaluationResults: item.evaluationResults, + evaluatorId: item.evaluatorId, + commanderId: item.commanderId, + commanderHighId: item.commanderHighId, createdAt: item.createdAt, })); return new HttpSuccess({ data: mapData, total });