From 9576d26753e76a2eec0f220040e1fe2ac3183fb7 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Fri, 26 Apr 2024 13:17:25 +0700
Subject: [PATCH] no message

---
 src/controllers/KpiUserEvaluationController.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

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 });