เพิ่มฟิว nodeName, strategyName

src/controllers/KpiPlanController.ts

@@ -195,39 +195,50 @@ export class kpiPlanController extends Controller {
     }
     let node = null;
     let nodeId = null;
+    let nodeName = null;
     if (kpiPlan.child4Id != null) {
       node = 4;
       nodeId = kpiPlan.child4Id;
+      nodeName = kpiPlan.child4;
     } else if (kpiPlan.child3Id != null) {
       node = 3;
       nodeId = kpiPlan.child3Id;
+      nodeName = kpiPlan.child3;
     } else if (kpiPlan.child2Id != null) {
       node = 2;
       nodeId = kpiPlan.child2Id;
+      nodeName = kpiPlan.child2;
     } else if (kpiPlan.child1Id != null) {
       node = 1;
       nodeId = kpiPlan.child1Id;
+      nodeName = kpiPlan.child1;
     } else if (kpiPlan.rootId != null) {
       node = 0;
       nodeId = kpiPlan.rootId;
+      nodeName = kpiPlan.root;
     }
     let strategy = null;
     let strategyId = null;
+    let strategyName = null;
     if (kpiPlan.strategyChild5Id != null) {
       strategy = 5;
       strategyId = kpiPlan.strategyChild5Id;
     } else if (kpiPlan.strategyChild4Id != null) {
       strategy = 4;
       strategyId = kpiPlan.strategyChild4Id;
+      strategyName = kpiPlan.strategyChild4;
     } else if (kpiPlan.strategyChild3Id != null) {
       strategy = 3;
       strategyId = kpiPlan.strategyChild3Id;
+      strategyName = kpiPlan.strategyChild3;
     } else if (kpiPlan.strategyChild2Id != null) {
       strategy = 2;
       strategyId = kpiPlan.strategyChild2Id;
+      strategyName = kpiPlan.strategyChild2;
     } else if (kpiPlan.strategyChild1Id != null) {
       strategy = 1;
       strategyId = kpiPlan.strategyChild1Id;
+      strategyName = kpiPlan.strategyChild1;
     }
     const formattedData = {
       id: kpiPlan.id,
@@ -248,9 +259,11 @@ export class kpiPlanController extends Controller {
       formula: kpiPlan.formula,
       node: node,
       nodeId: nodeId,
+      nodeName: nodeName,
       orgRevisionId: kpiPlan.orgRevisionId,
       strategy: strategy,
       strategyId: strategyId,
+      strategyName: strategyName,
     };
     return new HttpSuccess(formattedData);
   }

src/controllers/KpiRoleController.ts

@@ -158,21 +158,27 @@ export class kpiRoleController extends Controller {
     }
     let node = null;
     let nodeId = null;
+    let nodeName = null;
     if (kpiRole.child4Id != null) {
       node = 4;
       nodeId = kpiRole.child4Id;
+      nodeName = kpiRole.child4;
     } else if (kpiRole.child3Id != null) {
       node = 3;
       nodeId = kpiRole.child3Id;
+      nodeName = kpiRole.child3;
     } else if (kpiRole.child2Id != null) {
       node = 2;
       nodeId = kpiRole.child2Id;
+      nodeName = kpiRole.child2;
     } else if (kpiRole.child1Id != null) {
       node = 1;
       nodeId = kpiRole.child1Id;
+      nodeName = kpiRole.child1;
     } else if (kpiRole.rootId != null) {
       node = 0;
       nodeId = kpiRole.rootId;
+      nodeName = kpiRole.root;
     }
     const formattedData = {
       id: kpiRole.id,
@@ -193,6 +199,7 @@ export class kpiRoleController extends Controller {
       formula: kpiRole.formula,
       node: node,
       nodeId: nodeId,
+      nodeName: nodeName,
       orgRevisionId: kpiRole.orgRevisionId,
       position: kpiRole.position,
     };

src/controllers/KpiUserPlannedController.ts

@@ -171,12 +171,16 @@ export class KpiUserPlannedController extends Controller {
     // }
     const mapKpiUserPlanned = kpiUserPlanned.map((item) => ({
       id: item.id,
+      evaluationId: item.kpiUserEvaluation.id,
       indicatorId: item.kpiPlan.id,
+      includingName: item.kpiPlan.includingName,
       target: item.target,
-      unit: item.unit,
       weight: item.weight,
-      meaning: item.meaning,
-      formula: item.formula,
+      achievement1: item.kpiPlan.achievement1,
+      achievement2: item.kpiPlan.achievement2,
+      achievement3: item.kpiPlan.achievement3,
+      achievement4: item.kpiPlan.achievement4,
+      achievement5: item.kpiPlan.achievement5,
     }));
     return new HttpSuccess(mapKpiUserPlanned);
   }

src/controllers/KpiUserRoleController.ts

@@ -171,12 +171,16 @@ export class KpiUserRoleController extends Controller {
     // }
     const mapKpiUserRole = kpiUserRole.map((item) => ({
       id: item.id,
+      evaluationId: item.kpiUserEvaluation.id,
       indicatorId: item.kpiRole.id,
+      includingName: item.kpiRole.includingName,
       target: item.target,
-      unit: item.unit,
       weight: item.weight,
-      meaning: item.meaning,
-      formula: item.formula,
+      achievement1: item.kpiRole.achievement1,
+      achievement2: item.kpiRole.achievement2,
+      achievement3: item.kpiRole.achievement3,
+      achievement4: item.kpiRole.achievement4,
+      achievement5: item.kpiRole.achievement5,
     }));
     return new HttpSuccess(mapKpiUserRole);
   }