search org
This commit is contained in:
parent
2b53e433ba
commit
c6829ed14f
1 changed files with 439 additions and 439 deletions
|
|
@ -2232,91 +2232,91 @@ export class OrganizationController extends Controller {
|
|||
responsibility: orgRoot.responsibility,
|
||||
labelName:
|
||||
orgRoot.orgRootName + " " + orgRoot.orgRootCode + "00" + " " + orgRoot.orgRootShortName,
|
||||
totalPosition: await this.posMasterRepository.count({
|
||||
where: { orgRevisionId: orgRoot.orgRevisionId, orgRootId: orgRoot.id },
|
||||
}),
|
||||
totalPositionCurrentUse: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgRootId: orgRoot.id,
|
||||
current_holderId: Not(IsNull()) || Not(""),
|
||||
},
|
||||
}),
|
||||
totalPositionCurrentVacant: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgRootId: orgRoot.id,
|
||||
current_holderId: IsNull() || "",
|
||||
},
|
||||
}),
|
||||
totalPositionNextUse: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgRootId: orgRoot.id,
|
||||
next_holderId: Not(IsNull()) || Not(""),
|
||||
},
|
||||
}),
|
||||
totalPositionNextVacant: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgRootId: orgRoot.id,
|
||||
next_holderId: IsNull() || "",
|
||||
},
|
||||
}),
|
||||
totalRootPosition: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgRootId: orgRoot.id,
|
||||
orgChild1Id: IsNull() || "",
|
||||
orgChild2Id: IsNull() || "",
|
||||
orgChild3Id: IsNull() || "",
|
||||
orgChild4Id: IsNull() || "",
|
||||
},
|
||||
}),
|
||||
totalRootPositionCurrentUse: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgRootId: orgRoot.id,
|
||||
orgChild1Id: IsNull() || "",
|
||||
orgChild2Id: IsNull() || "",
|
||||
orgChild3Id: IsNull() || "",
|
||||
orgChild4Id: IsNull() || "",
|
||||
current_holderId: Not(IsNull()) || Not(""),
|
||||
},
|
||||
}),
|
||||
totalRootPositionCurrentVacant: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgRootId: orgRoot.id,
|
||||
orgChild1Id: IsNull() || "",
|
||||
orgChild2Id: IsNull() || "",
|
||||
orgChild3Id: IsNull() || "",
|
||||
orgChild4Id: IsNull() || "",
|
||||
current_holderId: IsNull() || "",
|
||||
},
|
||||
}),
|
||||
totalRootPositionNextUse: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgRootId: orgRoot.id,
|
||||
orgChild1Id: IsNull() || "",
|
||||
orgChild2Id: IsNull() || "",
|
||||
orgChild3Id: IsNull() || "",
|
||||
orgChild4Id: IsNull() || "",
|
||||
next_holderId: Not(IsNull()) || Not(""),
|
||||
},
|
||||
}),
|
||||
totalRootPositionNextVacant: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgRootId: orgRoot.id,
|
||||
orgChild1Id: IsNull() || "",
|
||||
orgChild2Id: IsNull() || "",
|
||||
orgChild3Id: IsNull() || "",
|
||||
orgChild4Id: IsNull() || "",
|
||||
next_holderId: IsNull() || "",
|
||||
},
|
||||
}),
|
||||
// totalPosition: await this.posMasterRepository.count({
|
||||
// where: { orgRevisionId: orgRoot.orgRevisionId, orgRootId: orgRoot.id },
|
||||
// }),
|
||||
// totalPositionCurrentUse: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgRootId: orgRoot.id,
|
||||
// current_holderId: Not(IsNull()) || Not(""),
|
||||
// },
|
||||
// }),
|
||||
// totalPositionCurrentVacant: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgRootId: orgRoot.id,
|
||||
// current_holderId: IsNull() || "",
|
||||
// },
|
||||
// }),
|
||||
// totalPositionNextUse: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgRootId: orgRoot.id,
|
||||
// next_holderId: Not(IsNull()) || Not(""),
|
||||
// },
|
||||
// }),
|
||||
// totalPositionNextVacant: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgRootId: orgRoot.id,
|
||||
// next_holderId: IsNull() || "",
|
||||
// },
|
||||
// }),
|
||||
// totalRootPosition: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgRootId: orgRoot.id,
|
||||
// orgChild1Id: IsNull() || "",
|
||||
// orgChild2Id: IsNull() || "",
|
||||
// orgChild3Id: IsNull() || "",
|
||||
// orgChild4Id: IsNull() || "",
|
||||
// },
|
||||
// }),
|
||||
// totalRootPositionCurrentUse: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgRootId: orgRoot.id,
|
||||
// orgChild1Id: IsNull() || "",
|
||||
// orgChild2Id: IsNull() || "",
|
||||
// orgChild3Id: IsNull() || "",
|
||||
// orgChild4Id: IsNull() || "",
|
||||
// current_holderId: Not(IsNull()) || Not(""),
|
||||
// },
|
||||
// }),
|
||||
// totalRootPositionCurrentVacant: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgRootId: orgRoot.id,
|
||||
// orgChild1Id: IsNull() || "",
|
||||
// orgChild2Id: IsNull() || "",
|
||||
// orgChild3Id: IsNull() || "",
|
||||
// orgChild4Id: IsNull() || "",
|
||||
// current_holderId: IsNull() || "",
|
||||
// },
|
||||
// }),
|
||||
// totalRootPositionNextUse: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgRootId: orgRoot.id,
|
||||
// orgChild1Id: IsNull() || "",
|
||||
// orgChild2Id: IsNull() || "",
|
||||
// orgChild3Id: IsNull() || "",
|
||||
// orgChild4Id: IsNull() || "",
|
||||
// next_holderId: Not(IsNull()) || Not(""),
|
||||
// },
|
||||
// }),
|
||||
// totalRootPositionNextVacant: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgRootId: orgRoot.id,
|
||||
// orgChild1Id: IsNull() || "",
|
||||
// orgChild2Id: IsNull() || "",
|
||||
// orgChild3Id: IsNull() || "",
|
||||
// orgChild4Id: IsNull() || "",
|
||||
// next_holderId: IsNull() || "",
|
||||
// },
|
||||
// }),
|
||||
|
||||
children: await Promise.all(
|
||||
orgChild1Data
|
||||
|
|
@ -2361,91 +2361,91 @@ export class OrganizationController extends Controller {
|
|||
"00" +
|
||||
" " +
|
||||
orgRoot.orgRootShortName,
|
||||
totalPosition: await this.posMasterRepository.count({
|
||||
where: { orgRevisionId: orgRoot.orgRevisionId, orgChild1Id: orgChild1.id },
|
||||
}),
|
||||
totalPositionCurrentUse: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgChild1Id: orgChild1.id,
|
||||
current_holderId: Not(IsNull()) || Not(""),
|
||||
},
|
||||
}),
|
||||
totalPositionCurrentVacant: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgChild1Id: orgChild1.id,
|
||||
current_holderId: IsNull() || "",
|
||||
},
|
||||
}),
|
||||
totalPositionNextUse: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgChild1Id: orgChild1.id,
|
||||
next_holderId: Not(IsNull()) || Not(""),
|
||||
},
|
||||
}),
|
||||
totalPositionNextVacant: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgChild1Id: orgChild1.id,
|
||||
next_holderId: IsNull() || "",
|
||||
},
|
||||
}),
|
||||
totalRootPosition: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgRootId: orgRoot.id,
|
||||
orgChild1Id: orgChild1.id,
|
||||
orgChild2Id: IsNull() || "",
|
||||
orgChild3Id: IsNull() || "",
|
||||
orgChild4Id: IsNull() || "",
|
||||
},
|
||||
}),
|
||||
totalRootPositionCurrentUse: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgRootId: orgRoot.id,
|
||||
orgChild1Id: orgChild1.id,
|
||||
orgChild2Id: IsNull() || "",
|
||||
orgChild3Id: IsNull() || "",
|
||||
orgChild4Id: IsNull() || "",
|
||||
current_holderId: Not(IsNull()) || Not(""),
|
||||
},
|
||||
}),
|
||||
totalRootPositionCurrentVacant: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgRootId: orgRoot.id,
|
||||
orgChild1Id: orgChild1.id,
|
||||
orgChild2Id: IsNull() || "",
|
||||
orgChild3Id: IsNull() || "",
|
||||
orgChild4Id: IsNull() || "",
|
||||
current_holderId: IsNull() || "",
|
||||
},
|
||||
}),
|
||||
totalRootPositionNextUse: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgRootId: orgRoot.id,
|
||||
orgChild1Id: orgChild1.id,
|
||||
orgChild2Id: IsNull() || "",
|
||||
orgChild3Id: IsNull() || "",
|
||||
orgChild4Id: IsNull() || "",
|
||||
next_holderId: Not(IsNull()) || Not(""),
|
||||
},
|
||||
}),
|
||||
totalRootPositionNextVacant: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgRootId: orgRoot.id,
|
||||
orgChild1Id: orgChild1.id,
|
||||
orgChild2Id: IsNull() || "",
|
||||
orgChild3Id: IsNull() || "",
|
||||
orgChild4Id: IsNull() || "",
|
||||
next_holderId: IsNull() || "",
|
||||
},
|
||||
}),
|
||||
// totalPosition: await this.posMasterRepository.count({
|
||||
// where: { orgRevisionId: orgRoot.orgRevisionId, orgChild1Id: orgChild1.id },
|
||||
// }),
|
||||
// totalPositionCurrentUse: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgChild1Id: orgChild1.id,
|
||||
// current_holderId: Not(IsNull()) || Not(""),
|
||||
// },
|
||||
// }),
|
||||
// totalPositionCurrentVacant: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgChild1Id: orgChild1.id,
|
||||
// current_holderId: IsNull() || "",
|
||||
// },
|
||||
// }),
|
||||
// totalPositionNextUse: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgChild1Id: orgChild1.id,
|
||||
// next_holderId: Not(IsNull()) || Not(""),
|
||||
// },
|
||||
// }),
|
||||
// totalPositionNextVacant: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgChild1Id: orgChild1.id,
|
||||
// next_holderId: IsNull() || "",
|
||||
// },
|
||||
// }),
|
||||
// totalRootPosition: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgRootId: orgRoot.id,
|
||||
// orgChild1Id: orgChild1.id,
|
||||
// orgChild2Id: IsNull() || "",
|
||||
// orgChild3Id: IsNull() || "",
|
||||
// orgChild4Id: IsNull() || "",
|
||||
// },
|
||||
// }),
|
||||
// totalRootPositionCurrentUse: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgRootId: orgRoot.id,
|
||||
// orgChild1Id: orgChild1.id,
|
||||
// orgChild2Id: IsNull() || "",
|
||||
// orgChild3Id: IsNull() || "",
|
||||
// orgChild4Id: IsNull() || "",
|
||||
// current_holderId: Not(IsNull()) || Not(""),
|
||||
// },
|
||||
// }),
|
||||
// totalRootPositionCurrentVacant: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgRootId: orgRoot.id,
|
||||
// orgChild1Id: orgChild1.id,
|
||||
// orgChild2Id: IsNull() || "",
|
||||
// orgChild3Id: IsNull() || "",
|
||||
// orgChild4Id: IsNull() || "",
|
||||
// current_holderId: IsNull() || "",
|
||||
// },
|
||||
// }),
|
||||
// totalRootPositionNextUse: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgRootId: orgRoot.id,
|
||||
// orgChild1Id: orgChild1.id,
|
||||
// orgChild2Id: IsNull() || "",
|
||||
// orgChild3Id: IsNull() || "",
|
||||
// orgChild4Id: IsNull() || "",
|
||||
// next_holderId: Not(IsNull()) || Not(""),
|
||||
// },
|
||||
// }),
|
||||
// totalRootPositionNextVacant: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgRootId: orgRoot.id,
|
||||
// orgChild1Id: orgChild1.id,
|
||||
// orgChild2Id: IsNull() || "",
|
||||
// orgChild3Id: IsNull() || "",
|
||||
// orgChild4Id: IsNull() || "",
|
||||
// next_holderId: IsNull() || "",
|
||||
// },
|
||||
// }),
|
||||
|
||||
children: await Promise.all(
|
||||
orgChild2Data
|
||||
|
|
@ -2495,94 +2495,94 @@ export class OrganizationController extends Controller {
|
|||
"00" +
|
||||
" " +
|
||||
orgRoot.orgRootShortName,
|
||||
totalPosition: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgChild2Id: orgChild2.id,
|
||||
},
|
||||
}),
|
||||
totalPositionCurrentUse: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgChild2Id: orgChild2.id,
|
||||
current_holderId: Not(IsNull()) || Not(""),
|
||||
},
|
||||
}),
|
||||
totalPositionCurrentVacant: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgChild2Id: orgChild2.id,
|
||||
current_holderId: IsNull() || "",
|
||||
},
|
||||
}),
|
||||
totalPositionNextUse: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgChild2Id: orgChild2.id,
|
||||
next_holderId: Not(IsNull()) || Not(""),
|
||||
},
|
||||
}),
|
||||
totalPositionNextVacant: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgChild2Id: orgChild2.id,
|
||||
next_holderId: IsNull() || "",
|
||||
},
|
||||
}),
|
||||
totalRootPosition: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgRootId: orgRoot.id,
|
||||
orgChild1Id: orgChild1.id,
|
||||
orgChild2Id: orgChild2.id,
|
||||
orgChild3Id: IsNull() || "",
|
||||
orgChild4Id: IsNull() || "",
|
||||
},
|
||||
}),
|
||||
totalRootPositionCurrentUse: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgRootId: orgRoot.id,
|
||||
orgChild1Id: orgChild1.id,
|
||||
orgChild2Id: orgChild2.id,
|
||||
orgChild3Id: IsNull() || "",
|
||||
orgChild4Id: IsNull() || "",
|
||||
current_holderId: Not(IsNull()) || Not(""),
|
||||
},
|
||||
}),
|
||||
totalRootPositionCurrentVacant: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgRootId: orgRoot.id,
|
||||
orgChild1Id: orgChild1.id,
|
||||
orgChild2Id: orgChild2.id,
|
||||
orgChild3Id: IsNull() || "",
|
||||
orgChild4Id: IsNull() || "",
|
||||
current_holderId: IsNull() || "",
|
||||
},
|
||||
}),
|
||||
totalRootPositionNextUse: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgRootId: orgRoot.id,
|
||||
orgChild1Id: orgChild1.id,
|
||||
orgChild2Id: orgChild2.id,
|
||||
orgChild3Id: IsNull() || "",
|
||||
orgChild4Id: IsNull() || "",
|
||||
next_holderId: Not(IsNull()) || Not(""),
|
||||
},
|
||||
}),
|
||||
totalRootPositionNextVacant: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgRootId: orgRoot.id,
|
||||
orgChild1Id: orgChild1.id,
|
||||
orgChild2Id: orgChild2.id,
|
||||
orgChild3Id: IsNull() || "",
|
||||
orgChild4Id: IsNull() || "",
|
||||
next_holderId: IsNull() || "",
|
||||
},
|
||||
}),
|
||||
// totalPosition: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgChild2Id: orgChild2.id,
|
||||
// },
|
||||
// }),
|
||||
// totalPositionCurrentUse: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgChild2Id: orgChild2.id,
|
||||
// current_holderId: Not(IsNull()) || Not(""),
|
||||
// },
|
||||
// }),
|
||||
// totalPositionCurrentVacant: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgChild2Id: orgChild2.id,
|
||||
// current_holderId: IsNull() || "",
|
||||
// },
|
||||
// }),
|
||||
// totalPositionNextUse: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgChild2Id: orgChild2.id,
|
||||
// next_holderId: Not(IsNull()) || Not(""),
|
||||
// },
|
||||
// }),
|
||||
// totalPositionNextVacant: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgChild2Id: orgChild2.id,
|
||||
// next_holderId: IsNull() || "",
|
||||
// },
|
||||
// }),
|
||||
// totalRootPosition: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgRootId: orgRoot.id,
|
||||
// orgChild1Id: orgChild1.id,
|
||||
// orgChild2Id: orgChild2.id,
|
||||
// orgChild3Id: IsNull() || "",
|
||||
// orgChild4Id: IsNull() || "",
|
||||
// },
|
||||
// }),
|
||||
// totalRootPositionCurrentUse: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgRootId: orgRoot.id,
|
||||
// orgChild1Id: orgChild1.id,
|
||||
// orgChild2Id: orgChild2.id,
|
||||
// orgChild3Id: IsNull() || "",
|
||||
// orgChild4Id: IsNull() || "",
|
||||
// current_holderId: Not(IsNull()) || Not(""),
|
||||
// },
|
||||
// }),
|
||||
// totalRootPositionCurrentVacant: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgRootId: orgRoot.id,
|
||||
// orgChild1Id: orgChild1.id,
|
||||
// orgChild2Id: orgChild2.id,
|
||||
// orgChild3Id: IsNull() || "",
|
||||
// orgChild4Id: IsNull() || "",
|
||||
// current_holderId: IsNull() || "",
|
||||
// },
|
||||
// }),
|
||||
// totalRootPositionNextUse: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgRootId: orgRoot.id,
|
||||
// orgChild1Id: orgChild1.id,
|
||||
// orgChild2Id: orgChild2.id,
|
||||
// orgChild3Id: IsNull() || "",
|
||||
// orgChild4Id: IsNull() || "",
|
||||
// next_holderId: Not(IsNull()) || Not(""),
|
||||
// },
|
||||
// }),
|
||||
// totalRootPositionNextVacant: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgRootId: orgRoot.id,
|
||||
// orgChild1Id: orgChild1.id,
|
||||
// orgChild2Id: orgChild2.id,
|
||||
// orgChild3Id: IsNull() || "",
|
||||
// orgChild4Id: IsNull() || "",
|
||||
// next_holderId: IsNull() || "",
|
||||
// },
|
||||
// }),
|
||||
|
||||
children: await Promise.all(
|
||||
orgChild3Data
|
||||
|
|
@ -2639,94 +2639,94 @@ export class OrganizationController extends Controller {
|
|||
"00" +
|
||||
" " +
|
||||
orgRoot.orgRootShortName,
|
||||
totalPosition: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgChild3Id: orgChild3.id,
|
||||
},
|
||||
}),
|
||||
totalPositionCurrentUse: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgChild3Id: orgChild3.id,
|
||||
current_holderId: Not(IsNull()) || Not(""),
|
||||
},
|
||||
}),
|
||||
totalPositionCurrentVacant: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgChild3Id: orgChild3.id,
|
||||
current_holderId: IsNull() || "",
|
||||
},
|
||||
}),
|
||||
totalPositionNextUse: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgChild3Id: orgChild3.id,
|
||||
next_holderId: Not(IsNull()) || Not(""),
|
||||
},
|
||||
}),
|
||||
totalPositionNextVacant: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgChild3Id: orgChild3.id,
|
||||
next_holderId: IsNull() || "",
|
||||
},
|
||||
}),
|
||||
totalRootPosition: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgRootId: orgRoot.id,
|
||||
orgChild1Id: orgChild1.id,
|
||||
orgChild2Id: orgChild2.id,
|
||||
orgChild3Id: orgChild3.id,
|
||||
orgChild4Id: IsNull() || "",
|
||||
},
|
||||
}),
|
||||
totalRootPositionCurrentUse: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgRootId: orgRoot.id,
|
||||
orgChild1Id: orgChild1.id,
|
||||
orgChild2Id: orgChild2.id,
|
||||
orgChild3Id: orgChild3.id,
|
||||
orgChild4Id: IsNull() || "",
|
||||
current_holderId: Not(IsNull()) || Not(""),
|
||||
},
|
||||
}),
|
||||
totalRootPositionCurrentVacant: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgRootId: orgRoot.id,
|
||||
orgChild1Id: orgChild1.id,
|
||||
orgChild2Id: orgChild2.id,
|
||||
orgChild3Id: orgChild3.id,
|
||||
orgChild4Id: IsNull() || "",
|
||||
current_holderId: IsNull() || "",
|
||||
},
|
||||
}),
|
||||
totalRootPositionNextUse: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgRootId: orgRoot.id,
|
||||
orgChild1Id: orgChild1.id,
|
||||
orgChild2Id: orgChild2.id,
|
||||
orgChild3Id: orgChild3.id,
|
||||
orgChild4Id: IsNull() || "",
|
||||
next_holderId: Not(IsNull()) || Not(""),
|
||||
},
|
||||
}),
|
||||
totalRootPositionNextVacant: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgRootId: orgRoot.id,
|
||||
orgChild1Id: orgChild1.id,
|
||||
orgChild2Id: orgChild2.id,
|
||||
orgChild3Id: orgChild3.id,
|
||||
orgChild4Id: IsNull() || "",
|
||||
next_holderId: IsNull() || "",
|
||||
},
|
||||
}),
|
||||
// totalPosition: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgChild3Id: orgChild3.id,
|
||||
// },
|
||||
// }),
|
||||
// totalPositionCurrentUse: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgChild3Id: orgChild3.id,
|
||||
// current_holderId: Not(IsNull()) || Not(""),
|
||||
// },
|
||||
// }),
|
||||
// totalPositionCurrentVacant: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgChild3Id: orgChild3.id,
|
||||
// current_holderId: IsNull() || "",
|
||||
// },
|
||||
// }),
|
||||
// totalPositionNextUse: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgChild3Id: orgChild3.id,
|
||||
// next_holderId: Not(IsNull()) || Not(""),
|
||||
// },
|
||||
// }),
|
||||
// totalPositionNextVacant: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgChild3Id: orgChild3.id,
|
||||
// next_holderId: IsNull() || "",
|
||||
// },
|
||||
// }),
|
||||
// totalRootPosition: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgRootId: orgRoot.id,
|
||||
// orgChild1Id: orgChild1.id,
|
||||
// orgChild2Id: orgChild2.id,
|
||||
// orgChild3Id: orgChild3.id,
|
||||
// orgChild4Id: IsNull() || "",
|
||||
// },
|
||||
// }),
|
||||
// totalRootPositionCurrentUse: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgRootId: orgRoot.id,
|
||||
// orgChild1Id: orgChild1.id,
|
||||
// orgChild2Id: orgChild2.id,
|
||||
// orgChild3Id: orgChild3.id,
|
||||
// orgChild4Id: IsNull() || "",
|
||||
// current_holderId: Not(IsNull()) || Not(""),
|
||||
// },
|
||||
// }),
|
||||
// totalRootPositionCurrentVacant: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgRootId: orgRoot.id,
|
||||
// orgChild1Id: orgChild1.id,
|
||||
// orgChild2Id: orgChild2.id,
|
||||
// orgChild3Id: orgChild3.id,
|
||||
// orgChild4Id: IsNull() || "",
|
||||
// current_holderId: IsNull() || "",
|
||||
// },
|
||||
// }),
|
||||
// totalRootPositionNextUse: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgRootId: orgRoot.id,
|
||||
// orgChild1Id: orgChild1.id,
|
||||
// orgChild2Id: orgChild2.id,
|
||||
// orgChild3Id: orgChild3.id,
|
||||
// orgChild4Id: IsNull() || "",
|
||||
// next_holderId: Not(IsNull()) || Not(""),
|
||||
// },
|
||||
// }),
|
||||
// totalRootPositionNextVacant: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgRootId: orgRoot.id,
|
||||
// orgChild1Id: orgChild1.id,
|
||||
// orgChild2Id: orgChild2.id,
|
||||
// orgChild3Id: orgChild3.id,
|
||||
// orgChild4Id: IsNull() || "",
|
||||
// next_holderId: IsNull() || "",
|
||||
// },
|
||||
// }),
|
||||
|
||||
children: await Promise.all(
|
||||
orgChild4Data
|
||||
|
|
@ -2790,99 +2790,99 @@ export class OrganizationController extends Controller {
|
|||
"00" +
|
||||
" " +
|
||||
orgRoot.orgRootShortName,
|
||||
totalPosition: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgChild4Id: orgChild4.id,
|
||||
},
|
||||
}),
|
||||
totalPositionCurrentUse: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgChild4Id: orgChild4.id,
|
||||
current_holderId: Not(IsNull()) || Not(""),
|
||||
},
|
||||
}),
|
||||
totalPositionCurrentVacant: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgChild4Id: orgChild4.id,
|
||||
current_holderId: IsNull() || "",
|
||||
},
|
||||
}),
|
||||
totalPositionNextUse: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgChild4Id: orgChild4.id,
|
||||
next_holderId: Not(IsNull()) || Not(""),
|
||||
},
|
||||
}),
|
||||
totalPositionNextVacant: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgChild4Id: orgChild4.id,
|
||||
next_holderId: IsNull() || "",
|
||||
},
|
||||
}),
|
||||
totalRootPosition: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgRootId: orgRoot.id,
|
||||
orgChild1Id: orgChild1.id,
|
||||
orgChild2Id: orgChild2.id,
|
||||
orgChild3Id: orgChild3.id,
|
||||
orgChild4Id: orgChild4.id,
|
||||
},
|
||||
}),
|
||||
totalRootPositionCurrentUse: await this.posMasterRepository.count(
|
||||
{
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgRootId: orgRoot.id,
|
||||
orgChild1Id: orgChild1.id,
|
||||
orgChild2Id: orgChild2.id,
|
||||
orgChild3Id: orgChild3.id,
|
||||
orgChild4Id: orgChild4.id,
|
||||
current_holderId: Not(IsNull()) || Not(""),
|
||||
},
|
||||
},
|
||||
),
|
||||
totalRootPositionCurrentVacant:
|
||||
await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgRootId: orgRoot.id,
|
||||
orgChild1Id: orgChild1.id,
|
||||
orgChild2Id: orgChild2.id,
|
||||
orgChild3Id: orgChild3.id,
|
||||
orgChild4Id: orgChild4.id,
|
||||
current_holderId: IsNull() || "",
|
||||
},
|
||||
}),
|
||||
totalRootPositionNextUse: await this.posMasterRepository.count({
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgRootId: orgRoot.id,
|
||||
orgChild1Id: orgChild1.id,
|
||||
orgChild2Id: orgChild2.id,
|
||||
orgChild3Id: orgChild3.id,
|
||||
orgChild4Id: orgChild4.id,
|
||||
next_holderId: Not(IsNull()) || Not(""),
|
||||
},
|
||||
}),
|
||||
totalRootPositionNextVacant: await this.posMasterRepository.count(
|
||||
{
|
||||
where: {
|
||||
orgRevisionId: orgRoot.orgRevisionId,
|
||||
orgRootId: orgRoot.id,
|
||||
orgChild1Id: orgChild1.id,
|
||||
orgChild2Id: orgChild2.id,
|
||||
orgChild3Id: orgChild3.id,
|
||||
orgChild4Id: orgChild4.id,
|
||||
next_holderId: IsNull() || "",
|
||||
},
|
||||
},
|
||||
),
|
||||
// totalPosition: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgChild4Id: orgChild4.id,
|
||||
// },
|
||||
// }),
|
||||
// totalPositionCurrentUse: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgChild4Id: orgChild4.id,
|
||||
// current_holderId: Not(IsNull()) || Not(""),
|
||||
// },
|
||||
// }),
|
||||
// totalPositionCurrentVacant: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgChild4Id: orgChild4.id,
|
||||
// current_holderId: IsNull() || "",
|
||||
// },
|
||||
// }),
|
||||
// totalPositionNextUse: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgChild4Id: orgChild4.id,
|
||||
// next_holderId: Not(IsNull()) || Not(""),
|
||||
// },
|
||||
// }),
|
||||
// totalPositionNextVacant: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgChild4Id: orgChild4.id,
|
||||
// next_holderId: IsNull() || "",
|
||||
// },
|
||||
// }),
|
||||
// totalRootPosition: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgRootId: orgRoot.id,
|
||||
// orgChild1Id: orgChild1.id,
|
||||
// orgChild2Id: orgChild2.id,
|
||||
// orgChild3Id: orgChild3.id,
|
||||
// orgChild4Id: orgChild4.id,
|
||||
// },
|
||||
// }),
|
||||
// totalRootPositionCurrentUse: await this.posMasterRepository.count(
|
||||
// {
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgRootId: orgRoot.id,
|
||||
// orgChild1Id: orgChild1.id,
|
||||
// orgChild2Id: orgChild2.id,
|
||||
// orgChild3Id: orgChild3.id,
|
||||
// orgChild4Id: orgChild4.id,
|
||||
// current_holderId: Not(IsNull()) || Not(""),
|
||||
// },
|
||||
// },
|
||||
// ),
|
||||
// totalRootPositionCurrentVacant:
|
||||
// await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgRootId: orgRoot.id,
|
||||
// orgChild1Id: orgChild1.id,
|
||||
// orgChild2Id: orgChild2.id,
|
||||
// orgChild3Id: orgChild3.id,
|
||||
// orgChild4Id: orgChild4.id,
|
||||
// current_holderId: IsNull() || "",
|
||||
// },
|
||||
// }),
|
||||
// totalRootPositionNextUse: await this.posMasterRepository.count({
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgRootId: orgRoot.id,
|
||||
// orgChild1Id: orgChild1.id,
|
||||
// orgChild2Id: orgChild2.id,
|
||||
// orgChild3Id: orgChild3.id,
|
||||
// orgChild4Id: orgChild4.id,
|
||||
// next_holderId: Not(IsNull()) || Not(""),
|
||||
// },
|
||||
// }),
|
||||
// totalRootPositionNextVacant: await this.posMasterRepository.count(
|
||||
// {
|
||||
// where: {
|
||||
// orgRevisionId: orgRoot.orgRevisionId,
|
||||
// orgRootId: orgRoot.id,
|
||||
// orgChild1Id: orgChild1.id,
|
||||
// orgChild2Id: orgChild2.id,
|
||||
// orgChild3Id: orgChild3.id,
|
||||
// orgChild4Id: orgChild4.id,
|
||||
// next_holderId: IsNull() || "",
|
||||
// },
|
||||
// },
|
||||
// ),
|
||||
})),
|
||||
),
|
||||
})),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue