no message
This commit is contained in:
parent
ecbb9c0d9f
commit
9576d26753
1 changed files with 9 additions and 2 deletions
|
|
@ -75,6 +75,9 @@ export class KpiUserEvaluationController extends Controller {
|
||||||
evaluationStatus: item.evaluationStatus,
|
evaluationStatus: item.evaluationStatus,
|
||||||
evaluationResults: item.evaluationResults,
|
evaluationResults: item.evaluationResults,
|
||||||
createdAt: item.createdAt,
|
createdAt: item.createdAt,
|
||||||
|
evaluatorId: item.evaluatorId,
|
||||||
|
commanderId: item.commanderId,
|
||||||
|
commanderHighId: item.commanderHighId,
|
||||||
}));
|
}));
|
||||||
return new HttpSuccess({ data: mapData, total });
|
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.lastUpdateUserId = request.user.sub;
|
||||||
kpiUserEvaluation.lastUpdateFullName = request.user.name;
|
kpiUserEvaluation.lastUpdateFullName = request.user.name;
|
||||||
this.kpiUserEvalutionRepository.merge(kpiUserEvaluation, requestBody);
|
this.kpiUserEvalutionRepository.merge(kpiUserEvaluation, requestBody);
|
||||||
|
|
@ -213,6 +214,9 @@ export class KpiUserEvaluationController extends Controller {
|
||||||
"evaluationStatus",
|
"evaluationStatus",
|
||||||
"evaluationResults",
|
"evaluationResults",
|
||||||
"createdAt",
|
"createdAt",
|
||||||
|
"evaluatorId",
|
||||||
|
"commanderId",
|
||||||
|
"commanderHighId",
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
if (!kpiUserEvaluation) {
|
if (!kpiUserEvaluation) {
|
||||||
|
|
@ -256,6 +260,9 @@ export class KpiUserEvaluationController extends Controller {
|
||||||
kpiPeriodId: item.kpiPeriodId,
|
kpiPeriodId: item.kpiPeriodId,
|
||||||
evaluationStatus: item.evaluationStatus,
|
evaluationStatus: item.evaluationStatus,
|
||||||
evaluationResults: item.evaluationResults,
|
evaluationResults: item.evaluationResults,
|
||||||
|
evaluatorId: item.evaluatorId,
|
||||||
|
commanderId: item.commanderId,
|
||||||
|
commanderHighId: item.commanderHighId,
|
||||||
createdAt: item.createdAt,
|
createdAt: item.createdAt,
|
||||||
}));
|
}));
|
||||||
return new HttpSuccess({ data: mapData, total });
|
return new HttpSuccess({ data: mapData, total });
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue