This commit is contained in:
kittapath 2025-02-10 12:07:09 +07:00
parent d4f440295c
commit 939c121ac4
12 changed files with 452 additions and 0 deletions

View file

@ -69,6 +69,10 @@ export class OrgChild1Controller {
isOfficer: orgChild1.isOfficer,
isInformation: orgChild1.isInformation,
misId: orgChild1.misId,
DEPARTMENT_CODE: orgChild1.DEPARTMENT_CODE,
DIVISION_CODE: orgChild1.DIVISION_CODE,
SECTION_CODE: orgChild1.SECTION_CODE,
JOB_CODE: orgChild1.JOB_CODE,
orgCode: orgChild1.orgRoot.orgRootCode + orgChild1.orgChild1Code,
};
return new HttpSuccess(getOrgChild1);

View file

@ -80,6 +80,10 @@ export class OrgChild2Controller extends Controller {
orgChild2Fax: orgChild2.orgChild2Fax,
orgRevisionId: orgChild2.orgRevisionId,
misId: orgChild2.misId,
DEPARTMENT_CODE: orgChild2.DEPARTMENT_CODE,
DIVISION_CODE: orgChild2.DIVISION_CODE,
SECTION_CODE: orgChild2.SECTION_CODE,
JOB_CODE: orgChild2.JOB_CODE,
orgCode: orgChild2.orgRoot.orgRootCode + orgChild2.orgChild2Code,
};
return new HttpSuccess(getOrgChild2);

View file

@ -64,6 +64,10 @@ export class OrgChild3Controller {
orgChild3Fax: orgChild3.orgChild3Fax,
orgRevisionId: orgChild3.orgRevisionId,
misId: orgChild3.misId,
DEPARTMENT_CODE: orgChild3.DEPARTMENT_CODE,
DIVISION_CODE: orgChild3.DIVISION_CODE,
SECTION_CODE: orgChild3.SECTION_CODE,
JOB_CODE: orgChild3.JOB_CODE,
orgCode: orgChild3.orgRoot.orgRootCode + orgChild3.orgChild3Code,
};
return new HttpSuccess(getOrgChild3);

View file

@ -77,6 +77,10 @@ export class OrgChild4Controller extends Controller {
orgChild4Fax: orgChild4.orgChild4Fax,
orgRevisionId: orgChild4.orgRevisionId,
misId: orgChild4.misId,
DEPARTMENT_CODE: orgChild4.DEPARTMENT_CODE,
DIVISION_CODE: orgChild4.DIVISION_CODE,
SECTION_CODE: orgChild4.SECTION_CODE,
JOB_CODE: orgChild4.JOB_CODE,
orgCode: orgChild4.orgRoot.orgRootCode + orgChild4.orgChild4Code,
};
return new HttpSuccess(getOrgChild4);

View file

@ -75,6 +75,10 @@ export class OrgRootController extends Controller {
isDeputy: orgRoot.isDeputy,
isCommission: orgRoot.isCommission,
misId: orgRoot.misId,
DEPARTMENT_CODE: orgRoot.DEPARTMENT_CODE,
DIVISION_CODE: orgRoot.DIVISION_CODE,
SECTION_CODE: orgRoot.SECTION_CODE,
JOB_CODE: orgRoot.JOB_CODE,
orgCode: orgRoot.orgRootCode + "00",
};
return new HttpSuccess(getOrgRoot);

View file

@ -794,6 +794,10 @@ export class OrganizationController extends Controller {
"orgRoot.orgRevisionId",
"orgRoot.orgRootRank",
"orgRoot.orgRootRankSub",
"orgRoot.DEPARTMENT_CODE",
"orgRoot.DIVISION_CODE",
"orgRoot.SECTION_CODE",
"orgRoot.JOB_CODE",
"orgRoot.responsibility",
])
.orderBy("orgRoot.orgRootOrder", "ASC")
@ -828,6 +832,10 @@ export class OrganizationController extends Controller {
"orgChild1.orgRootId",
"orgChild1.orgChild1Rank",
"orgChild1.orgChild1RankSub",
"orgChild1.DEPARTMENT_CODE",
"orgChild1.DIVISION_CODE",
"orgChild1.SECTION_CODE",
"orgChild1.JOB_CODE",
"orgChild1.responsibility",
])
.orderBy("orgChild1.orgChild1Order", "ASC")
@ -862,6 +870,10 @@ export class OrganizationController extends Controller {
"orgChild2.orgRootId",
"orgChild2.orgChild2Rank",
"orgChild2.orgChild2RankSub",
"orgChild2.DEPARTMENT_CODE",
"orgChild2.DIVISION_CODE",
"orgChild2.SECTION_CODE",
"orgChild2.JOB_CODE",
"orgChild2.orgChild1Id",
"orgChild2.responsibility",
])
@ -897,6 +909,10 @@ export class OrganizationController extends Controller {
"orgChild3.orgRootId",
"orgChild3.orgChild3Rank",
"orgChild3.orgChild3RankSub",
"orgChild3.DEPARTMENT_CODE",
"orgChild3.DIVISION_CODE",
"orgChild3.SECTION_CODE",
"orgChild3.JOB_CODE",
"orgChild3.orgChild2Id",
"orgChild3.responsibility",
])
@ -932,6 +948,10 @@ export class OrganizationController extends Controller {
"orgChild4.orgRootId",
"orgChild4.orgChild4Rank",
"orgChild4.orgChild4RankSub",
"orgChild4.DEPARTMENT_CODE",
"orgChild4.DIVISION_CODE",
"orgChild4.SECTION_CODE",
"orgChild4.JOB_CODE",
"orgChild4.orgChild3Id",
"orgChild4.responsibility",
])
@ -951,6 +971,10 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + "00",
orgTreeRank: orgRoot.orgRootRank,
orgTreeRankSub: orgRoot.orgRootRankSub,
DEPARTMENT_CODE: orgRoot.DEPARTMENT_CODE,
DIVISION_CODE: orgRoot.DIVISION_CODE,
SECTION_CODE: orgRoot.SECTION_CODE,
JOB_CODE: orgRoot.JOB_CODE,
orgTreeOrder: orgRoot.orgRootOrder,
orgTreePhoneEx: orgRoot.orgRootPhoneEx,
orgTreePhoneIn: orgRoot.orgRootPhoneIn,
@ -1063,6 +1087,10 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + orgChild1.orgChild1Code,
orgTreeRank: orgChild1.orgChild1Rank,
orgTreeRankSub: orgChild1.orgChild1RankSub,
DEPARTMENT_CODE: orgChild1.DEPARTMENT_CODE,
DIVISION_CODE: orgChild1.DIVISION_CODE,
SECTION_CODE: orgChild1.SECTION_CODE,
JOB_CODE: orgChild1.JOB_CODE,
orgTreeOrder: orgChild1.orgChild1Order,
orgRootCode: orgRoot.orgRootCode,
orgTreePhoneEx: orgChild1.orgChild1PhoneEx,
@ -1180,6 +1208,10 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + orgChild2.orgChild2Code,
orgTreeRank: orgChild2.orgChild2Rank,
orgTreeRankSub: orgChild2.orgChild2RankSub,
DEPARTMENT_CODE: orgChild2.DEPARTMENT_CODE,
DIVISION_CODE: orgChild2.DIVISION_CODE,
SECTION_CODE: orgChild2.SECTION_CODE,
JOB_CODE: orgChild2.JOB_CODE,
orgTreeOrder: orgChild2.orgChild2Order,
orgRootCode: orgRoot.orgRootCode,
orgTreePhoneEx: orgChild2.orgChild2PhoneEx,
@ -1299,6 +1331,10 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + orgChild3.orgChild3Code,
orgTreeRank: orgChild3.orgChild3Rank,
orgTreeRankSub: orgChild3.orgChild3RankSub,
DEPARTMENT_CODE: orgChild3.DEPARTMENT_CODE,
DIVISION_CODE: orgChild3.DIVISION_CODE,
SECTION_CODE: orgChild3.SECTION_CODE,
JOB_CODE: orgChild3.JOB_CODE,
orgTreeOrder: orgChild3.orgChild3Order,
orgRootCode: orgRoot.orgRootCode,
orgTreePhoneEx: orgChild3.orgChild3PhoneEx,
@ -1418,6 +1454,10 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + orgChild4.orgChild4Code,
orgTreeRank: orgChild4.orgChild4Rank,
orgTreeRankSub: orgChild4.orgChild4RankSub,
DEPARTMENT_CODE: orgChild4.DEPARTMENT_CODE,
DIVISION_CODE: orgChild4.DIVISION_CODE,
SECTION_CODE: orgChild4.SECTION_CODE,
JOB_CODE: orgChild4.JOB_CODE,
orgTreeOrder: orgChild4.orgChild4Order,
orgRootCode: orgRoot.orgRootCode,
orgTreePhoneEx: orgChild4.orgChild4PhoneEx,
@ -1620,6 +1660,10 @@ export class OrganizationController extends Controller {
"orgRoot.orgRevisionId",
"orgRoot.orgRootRank",
"orgRoot.orgRootRankSub",
"orgRoot.DEPARTMENT_CODE",
"orgRoot.DIVISION_CODE",
"orgRoot.SECTION_CODE",
"orgRoot.JOB_CODE",
"orgRoot.responsibility",
])
.orderBy("orgRoot.orgRootOrder", "ASC")
@ -1644,6 +1688,10 @@ export class OrganizationController extends Controller {
"orgChild1.orgRootId",
"orgChild1.orgChild1Rank",
"orgChild1.orgChild1RankSub",
"orgChild1.DEPARTMENT_CODE",
"orgChild1.DIVISION_CODE",
"orgChild1.SECTION_CODE",
"orgChild1.JOB_CODE",
"orgChild1.responsibility",
])
.orderBy("orgChild1.orgChild1Order", "ASC")
@ -1668,6 +1716,10 @@ export class OrganizationController extends Controller {
"orgChild2.orgRootId",
"orgChild2.orgChild2Rank",
"orgChild2.orgChild2RankSub",
"orgChild2.DEPARTMENT_CODE",
"orgChild2.DIVISION_CODE",
"orgChild2.SECTION_CODE",
"orgChild2.JOB_CODE",
"orgChild2.orgChild1Id",
"orgChild2.responsibility",
])
@ -1693,6 +1745,10 @@ export class OrganizationController extends Controller {
"orgChild3.orgRootId",
"orgChild3.orgChild3Rank",
"orgChild3.orgChild3RankSub",
"orgChild3.DEPARTMENT_CODE",
"orgChild3.DIVISION_CODE",
"orgChild3.SECTION_CODE",
"orgChild3.JOB_CODE",
"orgChild3.orgChild2Id",
"orgChild3.responsibility",
])
@ -1718,6 +1774,10 @@ export class OrganizationController extends Controller {
"orgChild4.orgRootId",
"orgChild4.orgChild4Rank",
"orgChild4.orgChild4RankSub",
"orgChild4.DEPARTMENT_CODE",
"orgChild4.DIVISION_CODE",
"orgChild4.SECTION_CODE",
"orgChild4.JOB_CODE",
"orgChild4.orgChild3Id",
"orgChild4.responsibility",
])
@ -1738,6 +1798,10 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + "00",
orgTreeRank: orgRoot.orgRootRank,
orgTreeRankSub: orgRoot.orgRootRankSub,
DEPARTMENT_CODE: orgRoot.DEPARTMENT_CODE,
DIVISION_CODE: orgRoot.DIVISION_CODE,
SECTION_CODE: orgRoot.SECTION_CODE,
JOB_CODE: orgRoot.JOB_CODE,
orgTreeOrder: orgRoot.orgRootOrder,
orgTreePhoneEx: orgRoot.orgRootPhoneEx,
orgTreePhoneIn: orgRoot.orgRootPhoneIn,
@ -1849,6 +1913,10 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + orgChild1.orgChild1Code,
orgTreeRank: orgChild1.orgChild1Rank,
orgTreeRankSub: orgChild1.orgChild1RankSub,
DEPARTMENT_CODE: orgChild1.DEPARTMENT_CODE,
DIVISION_CODE: orgChild1.DIVISION_CODE,
SECTION_CODE: orgChild1.SECTION_CODE,
JOB_CODE: orgChild1.JOB_CODE,
orgTreeOrder: orgChild1.orgChild1Order,
orgRootCode: orgRoot.orgRootCode,
orgTreePhoneEx: orgChild1.orgChild1PhoneEx,
@ -1966,6 +2034,10 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + orgChild2.orgChild2Code,
orgTreeRank: orgChild2.orgChild2Rank,
orgTreeRankSub: orgChild2.orgChild2RankSub,
DEPARTMENT_CODE: orgChild2.DEPARTMENT_CODE,
DIVISION_CODE: orgChild2.DIVISION_CODE,
SECTION_CODE: orgChild2.SECTION_CODE,
JOB_CODE: orgChild2.JOB_CODE,
orgTreeOrder: orgChild2.orgChild2Order,
orgRootCode: orgRoot.orgRootCode,
orgTreePhoneEx: orgChild2.orgChild2PhoneEx,
@ -2084,6 +2156,10 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + orgChild3.orgChild3Code,
orgTreeRank: orgChild3.orgChild3Rank,
orgTreeRankSub: orgChild3.orgChild3RankSub,
DEPARTMENT_CODE: orgChild3.DEPARTMENT_CODE,
DIVISION_CODE: orgChild3.DIVISION_CODE,
SECTION_CODE: orgChild3.SECTION_CODE,
JOB_CODE: orgChild3.JOB_CODE,
orgTreeOrder: orgChild3.orgChild3Order,
orgRootCode: orgRoot.orgRootCode,
orgTreePhoneEx: orgChild3.orgChild3PhoneEx,
@ -2202,6 +2278,10 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + orgChild4.orgChild4Code,
orgTreeRank: orgChild4.orgChild4Rank,
orgTreeRankSub: orgChild4.orgChild4RankSub,
DEPARTMENT_CODE: orgChild4.DEPARTMENT_CODE,
DIVISION_CODE: orgChild4.DIVISION_CODE,
SECTION_CODE: orgChild4.SECTION_CODE,
JOB_CODE: orgChild4.JOB_CODE,
orgTreeOrder: orgChild4.orgChild4Order,
orgRootCode: orgRoot.orgRootCode,
orgTreePhoneEx: orgChild4.orgChild4PhoneEx,
@ -2402,6 +2482,10 @@ export class OrganizationController extends Controller {
"orgRoot.orgRevisionId",
"orgRoot.orgRootRank",
"orgRoot.orgRootRankSub",
"orgRoot.DEPARTMENT_CODE",
"orgRoot.DIVISION_CODE",
"orgRoot.SECTION_CODE",
"orgRoot.JOB_CODE",
"orgRoot.responsibility",
])
.orderBy("orgRoot.orgRootOrder", "ASC")
@ -2437,6 +2521,10 @@ export class OrganizationController extends Controller {
"orgChild1.orgRootId",
"orgChild1.orgChild1Rank",
"orgChild1.orgChild1RankSub",
"orgChild1.DEPARTMENT_CODE",
"orgChild1.DIVISION_CODE",
"orgChild1.SECTION_CODE",
"orgChild1.JOB_CODE",
"orgChild1.responsibility",
])
.orderBy("orgChild1.orgChild1Order", "ASC")
@ -2472,6 +2560,10 @@ export class OrganizationController extends Controller {
"orgChild2.orgRootId",
"orgChild2.orgChild2Rank",
"orgChild2.orgChild2RankSub",
"orgChild2.DEPARTMENT_CODE",
"orgChild2.DIVISION_CODE",
"orgChild2.SECTION_CODE",
"orgChild2.JOB_CODE",
"orgChild2.orgChild1Id",
"orgChild2.responsibility",
])
@ -2508,6 +2600,10 @@ export class OrganizationController extends Controller {
"orgChild3.orgRootId",
"orgChild3.orgChild3Rank",
"orgChild3.orgChild3RankSub",
"orgChild3.DEPARTMENT_CODE",
"orgChild3.DIVISION_CODE",
"orgChild3.SECTION_CODE",
"orgChild3.JOB_CODE",
"orgChild3.orgChild2Id",
"orgChild3.responsibility",
])
@ -2544,6 +2640,10 @@ export class OrganizationController extends Controller {
"orgChild4.orgRootId",
"orgChild4.orgChild4Rank",
"orgChild4.orgChild4RankSub",
"orgChild4.DEPARTMENT_CODE",
"orgChild4.DIVISION_CODE",
"orgChild4.SECTION_CODE",
"orgChild4.JOB_CODE",
"orgChild4.orgChild3Id",
"orgChild4.responsibility",
])
@ -2565,6 +2665,10 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + "00",
orgTreeRank: orgRoot.orgRootRank,
orgTreeRankSub: orgRoot.orgRootRankSub,
DEPARTMENT_CODE: orgRoot.DEPARTMENT_CODE,
DIVISION_CODE: orgRoot.DIVISION_CODE,
SECTION_CODE: orgRoot.SECTION_CODE,
JOB_CODE: orgRoot.JOB_CODE,
orgTreeOrder: orgRoot.orgRootOrder,
orgTreePhoneEx: orgRoot.orgRootPhoneEx,
orgTreePhoneIn: orgRoot.orgRootPhoneIn,
@ -2677,6 +2781,10 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + orgChild1.orgChild1Code,
orgTreeRank: orgChild1.orgChild1Rank,
orgTreeRankSub: orgChild1.orgChild1RankSub,
DEPARTMENT_CODE: orgChild1.DEPARTMENT_CODE,
DIVISION_CODE: orgChild1.DIVISION_CODE,
SECTION_CODE: orgChild1.SECTION_CODE,
JOB_CODE: orgChild1.JOB_CODE,
orgTreeOrder: orgChild1.orgChild1Order,
orgRootCode: orgRoot.orgRootCode,
orgTreePhoneEx: orgChild1.orgChild1PhoneEx,
@ -2802,6 +2910,10 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + orgChild2.orgChild2Code,
orgTreeRank: orgChild2.orgChild2Rank,
orgTreeRankSub: orgChild2.orgChild2RankSub,
DEPARTMENT_CODE: orgChild2.DEPARTMENT_CODE,
DIVISION_CODE: orgChild2.DIVISION_CODE,
SECTION_CODE: orgChild2.SECTION_CODE,
JOB_CODE: orgChild2.JOB_CODE,
orgTreeOrder: orgChild2.orgChild2Order,
orgRootCode: orgRoot.orgRootCode,
orgTreePhoneEx: orgChild2.orgChild2PhoneEx,
@ -2935,6 +3047,10 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + orgChild3.orgChild3Code,
orgTreeRank: orgChild3.orgChild3Rank,
orgTreeRankSub: orgChild3.orgChild3RankSub,
DEPARTMENT_CODE: orgChild3.DEPARTMENT_CODE,
DIVISION_CODE: orgChild3.DIVISION_CODE,
SECTION_CODE: orgChild3.SECTION_CODE,
JOB_CODE: orgChild3.JOB_CODE,
orgTreeOrder: orgChild3.orgChild3Order,
orgRootCode: orgRoot.orgRootCode,
orgTreePhoneEx: orgChild3.orgChild3PhoneEx,
@ -3075,6 +3191,10 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + orgChild4.orgChild4Code,
orgTreeRank: orgChild4.orgChild4Rank,
orgTreeRankSub: orgChild4.orgChild4RankSub,
DEPARTMENT_CODE: orgChild4.DEPARTMENT_CODE,
DIVISION_CODE: orgChild4.DIVISION_CODE,
SECTION_CODE: orgChild4.SECTION_CODE,
JOB_CODE: orgChild4.JOB_CODE,
orgTreeOrder: orgChild4.orgChild4Order,
orgRootCode: orgRoot.orgRootCode,
orgTreePhoneEx: orgChild4.orgChild4PhoneEx,
@ -6638,6 +6758,10 @@ export class OrganizationController extends Controller {
"orgRoot.orgRevisionId",
"orgRoot.orgRootRank",
"orgRoot.orgRootRankSub",
"orgRoot.DEPARTMENT_CODE",
"orgRoot.DIVISION_CODE",
"orgRoot.SECTION_CODE",
"orgRoot.JOB_CODE",
"orgRoot.responsibility",
])
.orderBy("orgRoot.orgRootOrder", "ASC")
@ -6671,6 +6795,10 @@ export class OrganizationController extends Controller {
"orgChild1.orgRootId",
"orgChild1.orgChild1Rank",
"orgChild1.orgChild1RankSub",
"orgChild1.DEPARTMENT_CODE",
"orgChild1.DIVISION_CODE",
"orgChild1.SECTION_CODE",
"orgChild1.JOB_CODE",
"orgChild1.responsibility",
])
.orderBy("orgChild1.orgChild1Order", "ASC")
@ -6706,6 +6834,10 @@ export class OrganizationController extends Controller {
"orgChild2.orgRootId",
"orgChild2.orgChild2Rank",
"orgChild2.orgChild2RankSub",
"orgChild2.DEPARTMENT_CODE",
"orgChild2.DIVISION_CODE",
"orgChild2.SECTION_CODE",
"orgChild2.JOB_CODE",
"orgChild2.orgChild1Id",
"orgChild2.responsibility",
])
@ -6742,6 +6874,10 @@ export class OrganizationController extends Controller {
"orgChild3.orgRootId",
"orgChild3.orgChild3Rank",
"orgChild3.orgChild3RankSub",
"orgChild3.DEPARTMENT_CODE",
"orgChild3.DIVISION_CODE",
"orgChild3.SECTION_CODE",
"orgChild3.JOB_CODE",
"orgChild3.orgChild2Id",
"orgChild3.responsibility",
])
@ -6778,6 +6914,10 @@ export class OrganizationController extends Controller {
"orgChild4.orgRootId",
"orgChild4.orgChild4Rank",
"orgChild4.orgChild4RankSub",
"orgChild4.DEPARTMENT_CODE",
"orgChild4.DIVISION_CODE",
"orgChild4.SECTION_CODE",
"orgChild4.JOB_CODE",
"orgChild4.orgChild3Id",
"orgChild4.responsibility",
])
@ -6799,6 +6939,10 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + "00",
orgTreeRank: orgRoot.orgRootRank,
orgTreeRankSub: orgRoot.orgRootRankSub,
DEPARTMENT_CODE: orgRoot.DEPARTMENT_CODE,
DIVISION_CODE: orgRoot.DIVISION_CODE,
SECTION_CODE: orgRoot.SECTION_CODE,
JOB_CODE: orgRoot.JOB_CODE,
orgTreeOrder: orgRoot.orgRootOrder,
orgTreePhoneEx: orgRoot.orgRootPhoneEx,
orgTreePhoneIn: orgRoot.orgRootPhoneIn,
@ -6910,6 +7054,10 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + orgChild1.orgChild1Code,
orgTreeRank: orgChild1.orgChild1Rank,
orgTreeRankSub: orgChild1.orgChild1RankSub,
DEPARTMENT_CODE: orgChild1.DEPARTMENT_CODE,
DIVISION_CODE: orgChild1.DIVISION_CODE,
SECTION_CODE: orgChild1.SECTION_CODE,
JOB_CODE: orgChild1.JOB_CODE,
orgTreeOrder: orgChild1.orgChild1Order,
orgRootCode: orgRoot.orgRootCode,
orgTreePhoneEx: orgChild1.orgChild1PhoneEx,
@ -7034,6 +7182,10 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + orgChild2.orgChild2Code,
orgTreeRank: orgChild2.orgChild2Rank,
orgTreeRankSub: orgChild2.orgChild2RankSub,
DEPARTMENT_CODE: orgChild2.DEPARTMENT_CODE,
DIVISION_CODE: orgChild2.DIVISION_CODE,
SECTION_CODE: orgChild2.SECTION_CODE,
JOB_CODE: orgChild2.JOB_CODE,
orgTreeOrder: orgChild2.orgChild2Order,
orgRootCode: orgRoot.orgRootCode,
orgTreePhoneEx: orgChild2.orgChild2PhoneEx,
@ -7168,6 +7320,10 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + orgChild3.orgChild3Code,
orgTreeRank: orgChild3.orgChild3Rank,
orgTreeRankSub: orgChild3.orgChild3RankSub,
DEPARTMENT_CODE: orgChild3.DEPARTMENT_CODE,
DIVISION_CODE: orgChild3.DIVISION_CODE,
SECTION_CODE: orgChild3.SECTION_CODE,
JOB_CODE: orgChild3.JOB_CODE,
orgTreeOrder: orgChild3.orgChild3Order,
orgRootCode: orgRoot.orgRootCode,
orgTreePhoneEx: orgChild3.orgChild3PhoneEx,
@ -7309,6 +7465,10 @@ export class OrganizationController extends Controller {
orgCode: orgRoot.orgRootCode + orgChild4.orgChild4Code,
orgTreeRank: orgChild4.orgChild4Rank,
orgTreeRankSub: orgChild4.orgChild4RankSub,
DEPARTMENT_CODE: orgChild4.DEPARTMENT_CODE,
DIVISION_CODE: orgChild4.DIVISION_CODE,
SECTION_CODE: orgChild4.SECTION_CODE,
JOB_CODE: orgChild4.JOB_CODE,
orgTreeOrder: orgChild4.orgChild4Order,
orgRootCode: orgRoot.orgRootCode,
orgTreePhoneEx: orgChild4.orgChild4PhoneEx,

View file

@ -140,6 +140,38 @@ export class OrgChild1 extends EntityBase {
@JoinColumn({ name: "orgRevisionId" })
orgRevision: OrgRevision;
@Column({
nullable: true,
length: 5,
comment: "DEPARTMENT_CODE",
default: null,
})
DEPARTMENT_CODE: string;
@Column({
nullable: true,
length: 5,
comment: "DIVISION_CODE",
default: null,
})
DIVISION_CODE: string;
@Column({
nullable: true,
length: 5,
comment: "SECTION_CODE",
default: null,
})
SECTION_CODE: string;
@Column({
nullable: true,
length: 5,
comment: "JOB_CODE",
default: null,
})
JOB_CODE: string;
@ManyToOne(() => OrgRoot, (orgRoot) => orgRoot.orgChild1s)
@JoinColumn({ name: "orgRootId" })
orgRoot: OrgRoot;
@ -173,6 +205,18 @@ export class CreateOrgChild1 {
@Column()
orgChild1RankSub?: string;
@Column()
DEPARTMENT_CODE?: string;
@Column()
DIVISION_CODE?: string;
@Column()
SECTION_CODE?: string;
@Column()
JOB_CODE?: string;
@Column()
orgChild1PhoneEx?: string;

View file

@ -112,6 +112,38 @@ export class OrgChild2 extends EntityBase {
})
orgRevisionId: string;
@Column({
nullable: true,
length: 5,
comment: "DEPARTMENT_CODE",
default: null,
})
DEPARTMENT_CODE: string;
@Column({
nullable: true,
length: 5,
comment: "DIVISION_CODE",
default: null,
})
DIVISION_CODE: string;
@Column({
nullable: true,
length: 5,
comment: "SECTION_CODE",
default: null,
})
SECTION_CODE: string;
@Column({
nullable: true,
length: 5,
comment: "JOB_CODE",
default: null,
})
JOB_CODE: string;
@Column({
nullable: true,
length: 40,
@ -167,6 +199,18 @@ export class CreateOrgChild2 {
@Column()
orgChild2RankSub?: string;
@Column()
DEPARTMENT_CODE?: string;
@Column()
DIVISION_CODE?: string;
@Column()
SECTION_CODE?: string;
@Column()
JOB_CODE?: string;
@Column()
orgChild2PhoneEx?: string;

View file

@ -119,6 +119,38 @@ export class OrgChild3 extends EntityBase {
})
orgRevisionId: string;
@Column({
nullable: true,
length: 5,
comment: "DEPARTMENT_CODE",
default: null,
})
DEPARTMENT_CODE: string;
@Column({
nullable: true,
length: 5,
comment: "DIVISION_CODE",
default: null,
})
DIVISION_CODE: string;
@Column({
nullable: true,
length: 5,
comment: "SECTION_CODE",
default: null,
})
SECTION_CODE: string;
@Column({
nullable: true,
length: 5,
comment: "JOB_CODE",
default: null,
})
JOB_CODE: string;
@Column({
nullable: true,
length: 40,
@ -175,6 +207,18 @@ export class CreateOrgChild3 {
@Column()
orgChild3RankSub?: string;
@Column()
DEPARTMENT_CODE?: string;
@Column()
DIVISION_CODE?: string;
@Column()
SECTION_CODE?: string;
@Column()
JOB_CODE?: string;
@Column()
orgChild3PhoneEx?: string;

View file

@ -124,6 +124,38 @@ export class OrgChild4 extends EntityBase {
})
orgRevisionId: string;
@Column({
nullable: true,
length: 5,
comment: "DEPARTMENT_CODE",
default: null,
})
DEPARTMENT_CODE: string;
@Column({
nullable: true,
length: 5,
comment: "DIVISION_CODE",
default: null,
})
DIVISION_CODE: string;
@Column({
nullable: true,
length: 5,
comment: "SECTION_CODE",
default: null,
})
SECTION_CODE: string;
@Column({
nullable: true,
length: 5,
comment: "JOB_CODE",
default: null,
})
JOB_CODE: string;
@Column({
nullable: true,
length: 40,
@ -181,6 +213,18 @@ export class CreateOrgChild4 {
@Column()
orgChild4RankSub?: string;
@Column()
DEPARTMENT_CODE?: string;
@Column()
DIVISION_CODE?: string;
@Column()
SECTION_CODE?: string;
@Column()
JOB_CODE?: string;
@Column()
orgChild4PhoneEx?: string;

View file

@ -131,6 +131,38 @@ export class OrgRoot extends EntityBase {
})
orgRevisionId: string;
@Column({
nullable: true,
length: 5,
comment: "DEPARTMENT_CODE",
default: null,
})
DEPARTMENT_CODE: string;
@Column({
nullable: true,
length: 5,
comment: "DIVISION_CODE",
default: null,
})
DIVISION_CODE: string;
@Column({
nullable: true,
length: 5,
comment: "SECTION_CODE",
default: null,
})
SECTION_CODE: string;
@Column({
nullable: true,
length: 5,
comment: "JOB_CODE",
default: null,
})
JOB_CODE: string;
@ManyToOne(() => OrgRevision, (orgRevision) => orgRevision.orgRoots)
@JoinColumn({ name: "orgRevisionId" })
orgRevision: OrgRevision;
@ -170,6 +202,18 @@ export class CreateOrgRoot {
@Column()
orgRootRankSub?: string;
@Column()
DEPARTMENT_CODE?: string;
@Column()
DIVISION_CODE?: string;
@Column()
SECTION_CODE?: string;
@Column()
JOB_CODE?: string;
@Column()
orgRootPhoneEx?: string;

View file

@ -0,0 +1,52 @@
import { MigrationInterface, QueryRunner } from "typeorm";
export class Updateorgaddmisidcode41739163891571 implements MigrationInterface {
name = 'Updateorgaddmisidcode41739163891571'
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`orgChild4\` ADD \`DEPARTMENT_CODE\` varchar(5) NULL COMMENT 'DEPARTMENT_CODE'`);
await queryRunner.query(`ALTER TABLE \`orgChild4\` ADD \`DIVISION_CODE\` varchar(5) NULL COMMENT 'DIVISION_CODE'`);
await queryRunner.query(`ALTER TABLE \`orgChild4\` ADD \`SECTION_CODE\` varchar(5) NULL COMMENT 'SECTION_CODE'`);
await queryRunner.query(`ALTER TABLE \`orgChild4\` ADD \`JOB_CODE\` varchar(5) NULL COMMENT 'JOB_CODE'`);
await queryRunner.query(`ALTER TABLE \`orgChild3\` ADD \`DEPARTMENT_CODE\` varchar(5) NULL COMMENT 'DEPARTMENT_CODE'`);
await queryRunner.query(`ALTER TABLE \`orgChild3\` ADD \`DIVISION_CODE\` varchar(5) NULL COMMENT 'DIVISION_CODE'`);
await queryRunner.query(`ALTER TABLE \`orgChild3\` ADD \`SECTION_CODE\` varchar(5) NULL COMMENT 'SECTION_CODE'`);
await queryRunner.query(`ALTER TABLE \`orgChild3\` ADD \`JOB_CODE\` varchar(5) NULL COMMENT 'JOB_CODE'`);
await queryRunner.query(`ALTER TABLE \`orgChild2\` ADD \`DEPARTMENT_CODE\` varchar(5) NULL COMMENT 'DEPARTMENT_CODE'`);
await queryRunner.query(`ALTER TABLE \`orgChild2\` ADD \`DIVISION_CODE\` varchar(5) NULL COMMENT 'DIVISION_CODE'`);
await queryRunner.query(`ALTER TABLE \`orgChild2\` ADD \`SECTION_CODE\` varchar(5) NULL COMMENT 'SECTION_CODE'`);
await queryRunner.query(`ALTER TABLE \`orgChild2\` ADD \`JOB_CODE\` varchar(5) NULL COMMENT 'JOB_CODE'`);
await queryRunner.query(`ALTER TABLE \`orgChild1\` ADD \`DEPARTMENT_CODE\` varchar(5) NULL COMMENT 'DEPARTMENT_CODE'`);
await queryRunner.query(`ALTER TABLE \`orgChild1\` ADD \`DIVISION_CODE\` varchar(5) NULL COMMENT 'DIVISION_CODE'`);
await queryRunner.query(`ALTER TABLE \`orgChild1\` ADD \`SECTION_CODE\` varchar(5) NULL COMMENT 'SECTION_CODE'`);
await queryRunner.query(`ALTER TABLE \`orgChild1\` ADD \`JOB_CODE\` varchar(5) NULL COMMENT 'JOB_CODE'`);
await queryRunner.query(`ALTER TABLE \`orgRoot\` ADD \`DEPARTMENT_CODE\` varchar(5) NULL COMMENT 'DEPARTMENT_CODE'`);
await queryRunner.query(`ALTER TABLE \`orgRoot\` ADD \`DIVISION_CODE\` varchar(5) NULL COMMENT 'DIVISION_CODE'`);
await queryRunner.query(`ALTER TABLE \`orgRoot\` ADD \`SECTION_CODE\` varchar(5) NULL COMMENT 'SECTION_CODE'`);
await queryRunner.query(`ALTER TABLE \`orgRoot\` ADD \`JOB_CODE\` varchar(5) NULL COMMENT 'JOB_CODE'`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`orgRoot\` DROP COLUMN \`JOB_CODE\``);
await queryRunner.query(`ALTER TABLE \`orgRoot\` DROP COLUMN \`SECTION_CODE\``);
await queryRunner.query(`ALTER TABLE \`orgRoot\` DROP COLUMN \`DIVISION_CODE\``);
await queryRunner.query(`ALTER TABLE \`orgRoot\` DROP COLUMN \`DEPARTMENT_CODE\``);
await queryRunner.query(`ALTER TABLE \`orgChild1\` DROP COLUMN \`JOB_CODE\``);
await queryRunner.query(`ALTER TABLE \`orgChild1\` DROP COLUMN \`SECTION_CODE\``);
await queryRunner.query(`ALTER TABLE \`orgChild1\` DROP COLUMN \`DIVISION_CODE\``);
await queryRunner.query(`ALTER TABLE \`orgChild1\` DROP COLUMN \`DEPARTMENT_CODE\``);
await queryRunner.query(`ALTER TABLE \`orgChild2\` DROP COLUMN \`JOB_CODE\``);
await queryRunner.query(`ALTER TABLE \`orgChild2\` DROP COLUMN \`SECTION_CODE\``);
await queryRunner.query(`ALTER TABLE \`orgChild2\` DROP COLUMN \`DIVISION_CODE\``);
await queryRunner.query(`ALTER TABLE \`orgChild2\` DROP COLUMN \`DEPARTMENT_CODE\``);
await queryRunner.query(`ALTER TABLE \`orgChild3\` DROP COLUMN \`JOB_CODE\``);
await queryRunner.query(`ALTER TABLE \`orgChild3\` DROP COLUMN \`SECTION_CODE\``);
await queryRunner.query(`ALTER TABLE \`orgChild3\` DROP COLUMN \`DIVISION_CODE\``);
await queryRunner.query(`ALTER TABLE \`orgChild3\` DROP COLUMN \`DEPARTMENT_CODE\``);
await queryRunner.query(`ALTER TABLE \`orgChild4\` DROP COLUMN \`JOB_CODE\``);
await queryRunner.query(`ALTER TABLE \`orgChild4\` DROP COLUMN \`SECTION_CODE\``);
await queryRunner.query(`ALTER TABLE \`orgChild4\` DROP COLUMN \`DIVISION_CODE\``);
await queryRunner.query(`ALTER TABLE \`orgChild4\` DROP COLUMN \`DEPARTMENT_CODE\``);
}
}