Merge branch 'develop' into adiDev

src/controllers/KpiEvaluationController.ts

@@ -72,6 +72,7 @@ export class kpiEvaluationController extends Controller {
     @Query("page") page: number = 1,
     @Query("pageSize") pageSize: number = 10,
     @Query("keyword") keyword?: string,
+    @Query("status") status?: string,
   ) {
     let whereClause: any = {};
 
@@ -84,6 +85,9 @@ export class kpiEvaluationController extends Controller {
 
     const [kpiEvaluation, total] = await this.kpiEvaluationRepository.findAndCount({
       ...whereClause,
+      ...(status == null || status == undefined
+        ? {}
+        : { evaluationStatus: status.trim().toUpperCase() }),
       ...(keyword ? {} : { skip: (page - 1) * pageSize, take: pageSize }),
       order: {
         level: "DESC",

src/controllers/KpiUserEvaluationController.ts

@@ -127,7 +127,7 @@ export class KpiUserEvaluationController extends Controller {
         kpiUserEvaluation.lastName = x.lastName;
       })
       .catch((x) => {});
-    kpiUserEvaluation.evaluationStatus = "PENDING";
+    kpiUserEvaluation.evaluationStatus = "NEW";
     kpiUserEvaluation.evaluationResults = "PENDING";
     kpiUserEvaluation.createdUserId = request.user.sub;
     kpiUserEvaluation.createdFullName = request.user.name;