From 691b81c0a8e438a8fdac52eccebbb94be2e7f9e7 Mon Sep 17 00:00:00 2001 From: Bright Date: Fri, 10 Jan 2025 11:52:12 +0700 Subject: [PATCH] fix view --- src/entities/view/viewDirector.ts | 49 +++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 5 deletions(-) diff --git a/src/entities/view/viewDirector.ts b/src/entities/view/viewDirector.ts index 55637e6c..82a8d10e 100644 --- a/src/entities/view/viewDirector.ts +++ b/src/entities/view/viewDirector.ts @@ -27,11 +27,50 @@ import { ViewColumn, ViewEntity } from "typeorm"; \`posMaster\`.\`orgChild3Id\` AS \`orgChild3Id\`, \`posMaster\`.\`orgChild4Id\` AS \`orgChild4Id\`, CONCAT(\`posMaster\`.\`id\`, \`profile\`.\`id\`) AS \`key\`, - \`profile\`.\`id\` AS \`actFullNameId\`, - CONCAT(\`profile\`.\`prefix\`, - \`profile\`.\`firstName\`, - ' ', - \`profile\`.\`lastName\`) AS \`actFullName\` + ( + SELECT \`actFullNameId\` + FROM \`view_director_acting\` AS \`acting\` + WHERE \`acting\`.\`Id\` = \`posMaster\`.\`current_holderId\` + AND \`acting\`.\`orgRootId\` = \`posMaster\`.\`orgRootId\` + AND ( + (\`acting\`.\`orgChild1Id\` IS NULL AND \`posMaster\`.\`orgChild1Id\` IS NULL) + OR (\`acting\`.\`orgChild1Id\` = \`posMaster\`.\`orgChild1Id\`) + ) + AND ( + (\`acting\`.\`orgChild2Id\` IS NULL AND \`posMaster\`.\`orgChild2Id\` IS NULL) + OR (\`acting\`.\`orgChild2Id\` = \`posMaster\`.\`orgChild2Id\`) + ) + AND ( + (\`acting\`.\`orgChild3Id\` IS NULL AND \`posMaster\`.\`orgChild3Id\` IS NULL) + OR (\`acting\`.\`orgChild3Id\` = \`posMaster\`.\`orgChild3Id\`) + ) + AND ( + (\`acting\`.\`orgChild4Id\` IS NULL AND \`posMaster\`.\`orgChild4Id\` IS NULL) + OR (\`acting\`.\`orgChild4Id\` = \`posMaster\`.\`orgChild4Id\`) + ) + ) AS \`actFullNameId\`, + ( + SELECT \`actFullName\` + FROM \`view_director_acting\` AS \`acting\` + WHERE \`acting\`.\`Id\` = \`posMaster\`.\`current_holderId\` + AND \`acting\`.\`orgRootId\` = \`posMaster\`.\`orgRootId\` + AND ( + (\`acting\`.\`orgChild1Id\` IS NULL AND \`posMaster\`.\`orgChild1Id\` IS NULL) + OR (\`acting\`.\`orgChild1Id\` = \`posMaster\`.\`orgChild1Id\`) + ) + AND ( + (\`acting\`.\`orgChild2Id\` IS NULL AND \`posMaster\`.\`orgChild2Id\` IS NULL) + OR (\`acting\`.\`orgChild2Id\` = \`posMaster\`.\`orgChild2Id\`) + ) + AND ( + (\`acting\`.\`orgChild3Id\` IS NULL AND \`posMaster\`.\`orgChild3Id\` IS NULL) + OR (\`acting\`.\`orgChild3Id\` = \`posMaster\`.\`orgChild3Id\`) + ) + AND ( + (\`acting\`.\`orgChild4Id\` IS NULL AND \`posMaster\`.\`orgChild4Id\` IS NULL) + OR (\`acting\`.\`orgChild4Id\` = \`posMaster\`.\`orgChild4Id\`) + ) + ) AS \`actFullName\` FROM ((((((((((\`posMaster\`