Merge branch 'develop' of https://github.com/Frappet/bma-ehr-kpi into develop
This commit is contained in:
commit
2b060dedd4
1 changed files with 1 additions and 16 deletions
|
|
@ -404,22 +404,7 @@ export class kpiRoleController extends Controller {
|
||||||
const [kpiRole, total] = await AppDataSource.getRepository(KpiRole)
|
const [kpiRole, total] = await AppDataSource.getRepository(KpiRole)
|
||||||
.createQueryBuilder("kpiRole")
|
.createQueryBuilder("kpiRole")
|
||||||
.leftJoinAndSelect("kpiRole.kpiPeriod", "kpiPeriod")
|
.leftJoinAndSelect("kpiRole.kpiPeriod", "kpiPeriod")
|
||||||
.andWhere(
|
.andWhere(condition, parameters)
|
||||||
requestBody.node != undefined && requestBody.node != null
|
|
||||||
? requestBody.node == 4
|
|
||||||
? "kpiRole.child4Id LIKE :nodeId"
|
|
||||||
: requestBody.node == 3
|
|
||||||
? "kpiRole.child3Id LIKE :nodeId"
|
|
||||||
: requestBody.node == 2
|
|
||||||
? "kpiRole.child2Id LIKE :nodeId"
|
|
||||||
: requestBody.node == 1
|
|
||||||
? "kpiRole.child1Id LIKE :nodeId"
|
|
||||||
: "kpiRole.rootId LIKE :nodeId"
|
|
||||||
: "1=1",
|
|
||||||
{
|
|
||||||
nodeId: requestBody.nodeId,
|
|
||||||
},
|
|
||||||
)
|
|
||||||
// .andWhere(
|
// .andWhere(
|
||||||
// requestBody.year && requestBody.period
|
// requestBody.year && requestBody.period
|
||||||
// ? "kpiRole.year LIKE :year AND kpiRole.period LIKE :period"
|
// ? "kpiRole.year LIKE :year AND kpiRole.period LIKE :period"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue