sort edu

src/controllers/ImportDataController.ts

@@ -1289,7 +1289,7 @@ export class ImportDataController extends Controller {
         education.educationLevel = hrFundCourseCode ? hrFundCourseCode.FUND_COURSE_NAME : null_;
         education.educationLevelId = hrFundCourseCode ? hrFundCourseCode.refId : null_;
         education.institute = item.INSTITUE;
-        education.level = item.EDUCATION_SEQ ? null_ : Number(item.EDUCATION_SEQ);
+        education.level = item.EDUCATION_SEQ ? Number(item.EDUCATION_SEQ) : null_;
         education.startDate = startDate;
         education.endDate = endDate;
         education.createdUserId = request.user.sub;

src/entities/view/viewRegistryEmployee.ts

@@ -47,10 +47,10 @@ import { ViewColumn, ViewEntity } from "typeorm";
             ed.degree,
             ed.profileEmployeeId,
             ed.level,
-            ROW_NUMBER() OVER (PARTITION BY ed.profileEmployeeId ORDER BY ed.level ASC) AS ed_number
+            ROW_NUMBER() OVER (PARTITION BY ed.profileEmployeeId ORDER BY ed.level DESC) AS ed_number
         FROM profileEducation ed
         WHERE ed.isUse IS TRUE
-        ORDER BY ed.level ASC
+        ORDER BY ed.level DESC
     ),
   PositionDate AS (
       SELECT 
@@ -126,120 +126,120 @@ import { ViewColumn, ViewEntity } from "typeorm";
   `,
 })
 export class viewRegistryEmployee {
-    @ViewColumn()
-    profileEmployeeId: string;
+  @ViewColumn()
+  profileEmployeeId: string;
 
-    @ViewColumn()
-    citizenId: string;
-  
-    @ViewColumn()
-    prefix: string; 
-  
-    @ViewColumn()
-    firstName: string; 
-  
-    @ViewColumn()
-    lastName: string;
+  @ViewColumn()
+  citizenId: string;
 
-    @ViewColumn()
-    isProbation: boolean;
+  @ViewColumn()
+  prefix: string;
 
-    @ViewColumn()
-    isLeave: boolean;
+  @ViewColumn()
+  firstName: string;
 
-    @ViewColumn()
-    isRetirement: boolean;
+  @ViewColumn()
+  lastName: string;
 
-    @ViewColumn()
-    leaveType: string;
-  
-    @ViewColumn()
-    posMasterNo: string;
-  
-    @ViewColumn()
-    orgRootId: string;
-  
-    @ViewColumn()
-    orgChild1Id: string;
-  
-    @ViewColumn()
-    orgChild2Id: string;
-  
-    @ViewColumn()
-    orgChild3Id: string;
-  
-    @ViewColumn()
-    orgChild4Id: string;
-  
-    @ViewColumn()
-    orgRootName: string;
-  
-    @ViewColumn()
-    orgChild1Name: string;
-  
-    @ViewColumn()
-    orgChild2Name: string;
-  
-    @ViewColumn()
-    orgChild3Name: string;
-  
-    @ViewColumn()
-    orgChild4Name: string;
-  
-    @ViewColumn()
-    org: string;
-  
-    @ViewColumn()
-    searchShortName: string;
-  
-    @ViewColumn()
-    position: string;
-  
-    @ViewColumn()
-    posTypeName: string;
-  
-    @ViewColumn()
-    posLevelName: string;
-  
-    @ViewColumn()
-    gender: string;
-  
-    @ViewColumn()
-    relationship: string;
-  
-    @ViewColumn()
-    dateAppoint: Date;
+  @ViewColumn()
+  isProbation: boolean;
 
-    @ViewColumn()
-    dateRetire: Date;
+  @ViewColumn()
+  isLeave: boolean;
 
-    @ViewColumn()
-    dateRetireLaw: Date;
-  
-    @ViewColumn()
-    birthdate: Date;
-  
-    @ViewColumn()
-    degree: string;
-  
-    @ViewColumn()
-    age: number;
+  @ViewColumn()
+  isRetirement: boolean;
 
-    @ViewColumn()
-    Years: number;
+  @ViewColumn()
+  leaveType: string;
 
-    @ViewColumn()
-    Months: number;
+  @ViewColumn()
+  posMasterNo: string;
 
-    @ViewColumn()
-    Days: number;
+  @ViewColumn()
+  orgRootId: string;
 
-    @ViewColumn()
-    levelYears: number;
+  @ViewColumn()
+  orgChild1Id: string;
 
-    @ViewColumn()
-    levelMonths: number;
+  @ViewColumn()
+  orgChild2Id: string;
 
-    @ViewColumn()
-    levelDays: number;
+  @ViewColumn()
+  orgChild3Id: string;
+
+  @ViewColumn()
+  orgChild4Id: string;
+
+  @ViewColumn()
+  orgRootName: string;
+
+  @ViewColumn()
+  orgChild1Name: string;
+
+  @ViewColumn()
+  orgChild2Name: string;
+
+  @ViewColumn()
+  orgChild3Name: string;
+
+  @ViewColumn()
+  orgChild4Name: string;
+
+  @ViewColumn()
+  org: string;
+
+  @ViewColumn()
+  searchShortName: string;
+
+  @ViewColumn()
+  position: string;
+
+  @ViewColumn()
+  posTypeName: string;
+
+  @ViewColumn()
+  posLevelName: string;
+
+  @ViewColumn()
+  gender: string;
+
+  @ViewColumn()
+  relationship: string;
+
+  @ViewColumn()
+  dateAppoint: Date;
+
+  @ViewColumn()
+  dateRetire: Date;
+
+  @ViewColumn()
+  dateRetireLaw: Date;
+
+  @ViewColumn()
+  birthdate: Date;
+
+  @ViewColumn()
+  degree: string;
+
+  @ViewColumn()
+  age: number;
+
+  @ViewColumn()
+  Years: number;
+
+  @ViewColumn()
+  Months: number;
+
+  @ViewColumn()
+  Days: number;
+
+  @ViewColumn()
+  levelYears: number;
+
+  @ViewColumn()
+  levelMonths: number;
+
+  @ViewColumn()
+  levelDays: number;
 }

src/entities/view/viewRegistryOfficer.ts

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