sort edu
This commit is contained in:
parent
990d80e64d
commit
f38e5b26f0
3 changed files with 108 additions and 108 deletions
|
|
@ -1289,7 +1289,7 @@ export class ImportDataController extends Controller {
|
||||||
education.educationLevel = hrFundCourseCode ? hrFundCourseCode.FUND_COURSE_NAME : null_;
|
education.educationLevel = hrFundCourseCode ? hrFundCourseCode.FUND_COURSE_NAME : null_;
|
||||||
education.educationLevelId = hrFundCourseCode ? hrFundCourseCode.refId : null_;
|
education.educationLevelId = hrFundCourseCode ? hrFundCourseCode.refId : null_;
|
||||||
education.institute = item.INSTITUE;
|
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.startDate = startDate;
|
||||||
education.endDate = endDate;
|
education.endDate = endDate;
|
||||||
education.createdUserId = request.user.sub;
|
education.createdUserId = request.user.sub;
|
||||||
|
|
|
||||||
|
|
@ -47,10 +47,10 @@ import { ViewColumn, ViewEntity } from "typeorm";
|
||||||
ed.degree,
|
ed.degree,
|
||||||
ed.profileEmployeeId,
|
ed.profileEmployeeId,
|
||||||
ed.level,
|
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
|
FROM profileEducation ed
|
||||||
WHERE ed.isUse IS TRUE
|
WHERE ed.isUse IS TRUE
|
||||||
ORDER BY ed.level ASC
|
ORDER BY ed.level DESC
|
||||||
),
|
),
|
||||||
PositionDate AS (
|
PositionDate AS (
|
||||||
SELECT
|
SELECT
|
||||||
|
|
|
||||||
|
|
@ -51,10 +51,10 @@ import { ViewColumn, ViewEntity } from "typeorm";
|
||||||
ed.degree,
|
ed.degree,
|
||||||
ed.profileId,
|
ed.profileId,
|
||||||
ed.level,
|
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
|
FROM profileEducation ed
|
||||||
WHERE ed.isUse IS TRUE
|
WHERE ed.isUse IS TRUE
|
||||||
ORDER BY ed.level ASC
|
ORDER BY ed.level DESC
|
||||||
),
|
),
|
||||||
PositionDate AS (
|
PositionDate AS (
|
||||||
SELECT
|
SELECT
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue