update view

src/entities/view/viewRegistryEmployee.ts

@@ -47,7 +47,7 @@ import { ViewColumn, ViewEntity } from "typeorm";
             ed.degree,
             ed.profileEmployeeId,
             ed.level,
-            ROW_NUMBER() OVER (PARTITION BY ed.profileEmployeeId ORDER BY ed.level DESC) AS ed_number
+            ROW_NUMBER() OVER (PARTITION BY ed.profileEmployeeId ORDER BY ed.level ASC) AS ed_number
         FROM profileEducation ed
         WHERE ed.isUse IS TRUE
         ORDER BY ed.level ASC
@@ -85,7 +85,7 @@ import { ViewColumn, ViewEntity } from "typeorm";
         pm.searchShortName,
         p.position,
         posType.posTypeName,
-        posLevel.posLevelName,
+        CONCAT(posType.posTypeShortName, ' ', posLevel.posLevelName) AS "posLevelName",
         p.gender,
         p.relationship,
         p.dateAppoint,

src/entities/view/viewRegistryOfficer.ts

@@ -51,7 +51,7 @@ import { ViewColumn, ViewEntity } from "typeorm";
           ed.degree,
           ed.profileId,
           ed.level,
-          ROW_NUMBER() OVER (PARTITION BY ed.profileId ORDER BY ed.level DESC) AS ed_number
+          ROW_NUMBER() OVER (PARTITION BY ed.profileId ORDER BY ed.level ASC) AS ed_number
       FROM profileEducation ed
       WHERE ed.isUse IS TRUE
       ORDER BY ed.level ASC