diff --git a/src/controllers/ImportDataController.ts b/src/controllers/ImportDataController.ts index 5b9a6882..efc36d46 100644 --- a/src/controllers/ImportDataController.ts +++ b/src/controllers/ImportDataController.ts @@ -1469,7 +1469,7 @@ export class ImportDataController extends Controller { @Post("ImportOrg") async ImportOrg(@Request() request: { user: Record }) { const IMPORT_ORG = await this.IMPORT_ORGRepo.find({ - where: { orgChild1: Not(IsNull()) }, + where: { orgChild1: Not(IsNull()) || Not("") }, }); const orgRevision = await this.orgRevisionRepo.findOne({ where: { orgRevisionIsCurrent: true, orgRevisionIsDraft: false }, @@ -1479,7 +1479,14 @@ export class ImportDataController extends Controller { IMPORT_ORG.map(async (item) => { const orgRoot = new OrgRoot(); orgRoot.orgRootName = item.orgRoot; - orgRoot.misId = item.MISCODE; + orgRoot.orgRootShortName = item.orgShortname; + const rank: any = item.orgRank; + orgRoot.orgRootRank = rank; + orgRoot.orgRootRankSub = item.orgSubRank; + orgRoot.DEPARTMENT_CODE = item.DEPARTMENT_CODE; + orgRoot.DIVISION_CODE = item.DIVISION_CODE; + orgRoot.SECTION_CODE = item.SECTION_CODE; + orgRoot.JOB_CODE = item.JOB_CODE; orgRoot.orgRevisionId = orgRevision.id; orgRoot.createdUserId = request.user.sub; orgRoot.createdFullName = request.user.name; @@ -1497,7 +1504,14 @@ export class ImportDataController extends Controller { const orgChild1 = new OrgChild1(); orgChild1.orgRootId = orgRoot.id; orgChild1.orgChild1Name = item1.orgChild1; - orgChild1.misId = item1.MISCODE; + orgChild1.orgChild1ShortName = item.orgShortname; + const rank: any = item.orgRank; + orgChild1.orgChild1Rank = rank; + orgChild1.orgChild1RankSub = item.orgSubRank; + orgChild1.DEPARTMENT_CODE = item.DEPARTMENT_CODE; + orgChild1.DIVISION_CODE = item.DIVISION_CODE; + orgChild1.SECTION_CODE = item.SECTION_CODE; + orgChild1.JOB_CODE = item.JOB_CODE; orgChild1.orgRevisionId = orgRevision.id; orgChild1.createdUserId = request.user.sub; orgChild1.createdFullName = request.user.name; @@ -1520,7 +1534,14 @@ export class ImportDataController extends Controller { orgChild2.orgRootId = orgRoot.id; orgChild2.orgChild1Id = orgChild1.id; orgChild2.orgChild2Name = item2.orgChild2; - orgChild2.misId = item2.MISCODE; + orgChild2.orgChild2ShortName = item.orgShortname; + const rank: any = item.orgRank; + orgChild2.orgChild2Rank = rank; + orgChild2.orgChild2RankSub = item.orgSubRank; + orgChild2.DEPARTMENT_CODE = item.DEPARTMENT_CODE; + orgChild2.DIVISION_CODE = item.DIVISION_CODE; + orgChild2.SECTION_CODE = item.SECTION_CODE; + orgChild2.JOB_CODE = item.JOB_CODE; orgChild2.orgRevisionId = orgRevision.id; orgChild2.createdUserId = request.user.sub; orgChild2.createdFullName = request.user.name; @@ -1544,7 +1565,14 @@ export class ImportDataController extends Controller { orgChild3.orgChild1Id = orgChild1.id; orgChild3.orgChild2Id = orgChild2.id; orgChild3.orgChild3Name = item.orgChild3; - orgChild3.misId = item.MISCODE; + orgChild3.orgChild3ShortName = item.orgShortname; + const rank: any = item.orgRank; + orgChild3.orgChild3Rank = rank; + orgChild3.orgChild3RankSub = item.orgSubRank; + orgChild3.DEPARTMENT_CODE = item.DEPARTMENT_CODE; + orgChild3.DIVISION_CODE = item.DIVISION_CODE; + orgChild3.SECTION_CODE = item.SECTION_CODE; + orgChild3.JOB_CODE = item.JOB_CODE; orgChild3.orgRevisionId = orgRevision.id; orgChild3.createdUserId = request.user.sub; orgChild3.createdFullName = request.user.name; diff --git a/src/entities/IMPORT_ORG.ts b/src/entities/IMPORT_ORG.ts index 7c5a2e1e..ea153ae5 100644 --- a/src/entities/IMPORT_ORG.ts +++ b/src/entities/IMPORT_ORG.ts @@ -67,4 +67,25 @@ export class IMPORT_ORG { default: null, }) MISCODE: string; + + @Column({ + nullable: true, + type: "text", + default: null, + }) + orgShortname: string; + + @Column({ + nullable: true, + type: "text", + default: null, + }) + orgRank: string; + + @Column({ + nullable: true, + type: "text", + default: null, + }) + orgSubRank: string; }