hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into adiDev

Browse source 
# Conflicts:
#	src/entities/view/viewDirector.ts
#	src/entities/view/viewDirectorActing.ts
This commit is contained in:
AdisakKanthawilang 2024-11-08 14:08:56 +07:00
commit d7c18c07df
8 changed files with 385 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/entities/view/viewDirector.ts
View file

@ -64,10 +64,22 @@ export class viewDirector {
@ViewColumn()
posType: string;
@ViewColumn()
posExecutiveName: string;
@ViewColumn()
isDirector: boolean;
@ViewColumn()
isDeputy: boolean;
@ViewColumn()
orgRootId: string;
@ViewColumn()
orgChild1Id: string;
@ViewColumn()
orgChild2Id: string;
@ViewColumn()
orgChild3Id: string;
@ViewColumn()
orgChild4Id: string;
@ViewColumn()
actFullNameId: string;
@ViewColumn()
actFullName: string;

12
src/entities/view/viewDirectorActing.ts
View file

@ -72,12 +72,24 @@ export class viewDirectorActing {
@ViewColumn()
posType: string;
@ViewColumn()
posExecutiveName: string;
@ViewColumn()
isDirector: boolean;
@ViewColumn()
isDeputy: boolean;
@ViewColumn()
isDirectorChild: boolean;
@ViewColumn()
orgRootId: string;
@ViewColumn()
orgChild1Id: string;
@ViewColumn()
orgChild2Id: string;
@ViewColumn()
orgChild3Id: string;
@ViewColumn()
orgChild4Id: string;
@ViewColumn()
actFullNameId: string;
@ViewColumn()
actFullName: string;