checkpoint
This commit is contained in:
parent
f19d3ce70e
commit
e585e41a70
4 changed files with 228 additions and 0 deletions
|
|
@ -355,6 +355,7 @@ export class CreateProfileSalaryEmployee {
|
|||
commandName?: string | null;
|
||||
posNumCodeSit?: string | null;
|
||||
posNumCodeSitAbb?: string | null;
|
||||
salaryLevel?: number | null;
|
||||
}
|
||||
|
||||
export class UpdateProfileSalaryEmployee {
|
||||
|
|
@ -387,6 +388,7 @@ export class UpdateProfileSalaryEmployee {
|
|||
commandName?: string | null;
|
||||
posNumCodeSit?: string | null;
|
||||
posNumCodeSitAbb?: string | null;
|
||||
salaryLevel?: number | null;
|
||||
}
|
||||
|
||||
export type UpdateProfileSalary = {
|
||||
|
|
|
|||
|
|
@ -24,18 +24,23 @@ import { ViewColumn, ViewEntity } from "typeorm";
|
|||
profile.birthDate,
|
||||
orgRoot.id as rootId,
|
||||
orgRoot.orgRootShortName,
|
||||
orgRoot.orgRootOrder,
|
||||
orgRoot.orgRootName,
|
||||
orgChild1.id as child1Id,
|
||||
orgChild1.orgChild1ShortName,
|
||||
orgChild1.orgChild1Order,
|
||||
orgChild1.orgChild1Name,
|
||||
orgChild2.id as child2Id,
|
||||
orgChild2.orgChild2ShortName,
|
||||
orgChild2.orgChild2Order,
|
||||
orgChild2.orgChild2Name,
|
||||
orgChild3.id as child3Id,
|
||||
orgChild3.orgChild3ShortName,
|
||||
orgChild3.orgChild3Order,
|
||||
orgChild3.orgChild3Name,
|
||||
orgChild4.id as child4Id,
|
||||
orgChild4.orgChild4ShortName,
|
||||
orgChild4.orgChild4Order,
|
||||
orgChild4.orgChild4Name,
|
||||
position.id as positionId,
|
||||
position.positionIsSelected,
|
||||
|
|
@ -133,30 +138,40 @@ export class viewPosMaster {
|
|||
@ViewColumn()
|
||||
orgRootShortName: string;
|
||||
@ViewColumn()
|
||||
orgRootOrder: string;
|
||||
@ViewColumn()
|
||||
orgRootName: string;
|
||||
@ViewColumn()
|
||||
child1Id: string;
|
||||
@ViewColumn()
|
||||
orgChild1ShortName: string;
|
||||
@ViewColumn()
|
||||
orgChild1Order: string;
|
||||
@ViewColumn()
|
||||
orgChild1Name: string;
|
||||
@ViewColumn()
|
||||
child2Id: string;
|
||||
@ViewColumn()
|
||||
orgChild2ShortName: string;
|
||||
@ViewColumn()
|
||||
orgChild2Order: string;
|
||||
@ViewColumn()
|
||||
orgChild2Name: string;
|
||||
@ViewColumn()
|
||||
child3Id: string;
|
||||
@ViewColumn()
|
||||
orgChild3ShortName: string;
|
||||
@ViewColumn()
|
||||
orgChild3Order: string;
|
||||
@ViewColumn()
|
||||
orgChild3Name: string;
|
||||
@ViewColumn()
|
||||
child4Id: string;
|
||||
@ViewColumn()
|
||||
orgChild4ShortName: string;
|
||||
@ViewColumn()
|
||||
orgChild4Order: string;
|
||||
@ViewColumn()
|
||||
orgChild4Name: string;
|
||||
@ViewColumn()
|
||||
positionId: string;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue