diff --git a/src/entities/view/viewPosMaster.ts b/src/entities/view/viewPosMaster.ts index b41839c0..f1cd3abd 100644 --- a/src/entities/view/viewPosMaster.ts +++ b/src/entities/view/viewPosMaster.ts @@ -6,6 +6,7 @@ import { ViewColumn, ViewEntity } from "typeorm"; posMaster.posMasterNoPrefix, posMaster.posMasterNo, posMaster.posMasterNoSuffix, + posMaster.orgRevisionId, posMaster.orgRootId, posMaster.orgChild1Id, posMaster.orgChild2Id, @@ -23,13 +24,18 @@ import { ViewColumn, ViewEntity } from "typeorm"; profile.birthDate, orgRoot.id as rootId, orgRoot.orgRootShortName, + orgRoot.orgRootName, orgChild1.id as child1Id, + orgChild1.orgChild1ShortName, orgChild1.orgChild1Name, orgChild2.id as child2Id, + orgChild2.orgChild2ShortName, orgChild2.orgChild2Name, orgChild3.id as child3Id, + orgChild3.orgChild3ShortName, orgChild3.orgChild3Name, orgChild4.id as child4Id, + orgChild4.orgChild4ShortName, orgChild4.orgChild4Name, position.id as positionId, position.positionIsSelected, @@ -91,6 +97,8 @@ export class viewPosMaster { @ViewColumn() posMasterNoSuffix: string; @ViewColumn() + orgRevisionId: string; + @ViewColumn() orgRootId: string; @ViewColumn() orgChild1Id: string; @@ -125,20 +133,30 @@ export class viewPosMaster { @ViewColumn() orgRootShortName: string; @ViewColumn() + orgRootName: string; + @ViewColumn() child1Id: string; @ViewColumn() + orgChild1ShortName: string; + @ViewColumn() orgChild1Name: string; @ViewColumn() child2Id: string; @ViewColumn() + orgChild2ShortName: string; + @ViewColumn() orgChild2Name: string; @ViewColumn() child3Id: string; @ViewColumn() + orgChild3ShortName: string; + @ViewColumn() orgChild3Name: string; @ViewColumn() child4Id: string; @ViewColumn() + orgChild4ShortName: string; + @ViewColumn() orgChild4Name: string; @ViewColumn() positionId: string; @@ -149,7 +167,9 @@ export class viewPosMaster { @ViewColumn() isSpecial: boolean; @ViewColumn() - posExcutiveId: string; + posExecutiveId: string; + @ViewColumn() + posExecutiveName: string; @ViewColumn() profileDisciplineId: string; @ViewColumn() @@ -159,7 +179,7 @@ export class viewPosMaster { @ViewColumn() profileAssessmentId: string; @ViewColumn() - pointSum: string; + pointSum: number; @ViewColumn() posLevelId: string; @ViewColumn()