diff --git a/External All Channel.Report/.platform b/External All Channel.Report/.platform index 227612b..25ec015 100644 --- a/External All Channel.Report/.platform +++ b/External All Channel.Report/.platform @@ -6,6 +6,6 @@ }, "config": { "version": "2.0", - "logicalId": "16c8aecb-2392-49dd-abb3-57f1bb0875bc" + "logicalId": "8102f22c-a7eb-4739-8667-e248bc97948d" } } \ No newline at end of file diff --git a/External All Channel.Report/definition/pages/ReportSection7c203e32de7071898401/visuals/3b74165e00a96ee65040/visual.json b/External All Channel.Report/definition/pages/ReportSection7c203e32de7071898401/visuals/3b74165e00a96ee65040/visual.json index 98156c9..a46664f 100644 --- a/External All Channel.Report/definition/pages/ReportSection7c203e32de7071898401/visuals/3b74165e00a96ee65040/visual.json +++ b/External All Channel.Report/definition/pages/ReportSection7c203e32de7071898401/visuals/3b74165e00a96ee65040/visual.json @@ -1,9 +1,9 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.8.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.9.0/schema.json", "name": "3b74165e00a96ee65040", "position": { - "x": 689.90114483443222, - "y": 3.9287626217140428, + "x": 691.19065493323455, + "y": 7.5697363545567313, "z": 1000, "height": 34.21000981354269, "width": 235.15927141937871, diff --git a/External All Channel.Report/definition/pages/ReportSection7c203e32de7071898401/visuals/5f97f14aa88e82ac7f55/visual.json b/External All Channel.Report/definition/pages/ReportSection7c203e32de7071898401/visuals/5f97f14aa88e82ac7f55/visual.json index 772cc3d..3149bea 100644 --- a/External All Channel.Report/definition/pages/ReportSection7c203e32de7071898401/visuals/5f97f14aa88e82ac7f55/visual.json +++ b/External All Channel.Report/definition/pages/ReportSection7c203e32de7071898401/visuals/5f97f14aa88e82ac7f55/visual.json @@ -1,12 +1,12 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.8.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.9.0/schema.json", "name": "5f97f14aa88e82ac7f55", "position": { "x": 0, "y": 0, "z": 1500, - "height": 43.16916488222698, - "width": 703.04068522483942, + "height": 47.331189710610929, + "width": 671.89710610932468, "tabOrder": 9000 }, "visual": { @@ -23,31 +23,14 @@ "Entity": "Dim_RegionType" } }, - "Property": "region_name" + "Property": "REGION_TYPE" } }, - "queryRef": "Dim_RegionType.region_name", - "nativeQueryRef": "region_name" + "queryRef": "Dim_RegionType.REGION_TYPE", + "nativeQueryRef": "REGION_TYPE" } ] } - }, - "sortDefinition": { - "sort": [ - { - "field": { - "Column": { - "Expression": { - "SourceRef": { - "Entity": "Dim_GeoGroup" - } - }, - "Property": "PROVINCE_C" - } - }, - "direction": "Descending" - } - ] } }, "objects": { @@ -107,6 +90,13 @@ } } } + }, + "showBlankAs": { + "expr": { + "Literal": { + "Value": "''" + } + } } }, "selector": { @@ -260,6 +250,22 @@ "id": "selection:selected" } } + ], + "image": [ + { + "properties": { + "show": { + "expr": { + "Literal": { + "Value": "false" + } + } + } + }, + "selector": { + "id": "default" + } + } ] }, "visualContainerObjects": { @@ -365,6 +371,78 @@ ] }, "howCreated": "User" + }, + { + "name": "f7ea241f7e9900d5787f", + "field": { + "Column": { + "Expression": { + "SourceRef": { + "Entity": "Dim_RegionType" + } + }, + "Property": "REGION_TYPE" + } + }, + "type": "Categorical", + "filter": { + "Version": 2, + "From": [ + { + "Name": "d", + "Entity": "Dim_RegionType", + "Type": 0 + } + ], + "Where": [ + { + "Condition": { + "Not": { + "Expression": { + "In": { + "Expressions": [ + { + "Column": { + "Expression": { + "SourceRef": { + "Source": "d" + } + }, + "Property": "REGION_TYPE" + } + } + ], + "Values": [ + [ + { + "Literal": { + "Value": "null" + } + } + ] + ] + } + } + } + } + } + ] + }, + "objects": { + "general": [ + { + "properties": { + "isInvertedSelectionMode": { + "expr": { + "Literal": { + "Value": "true" + } + } + } + } + } + ] + } } ] } diff --git a/External All Channel.Report/definition/pages/ReportSection7c203e32de7071898401/visuals/628ab9479c857792d017/visual.json b/External All Channel.Report/definition/pages/ReportSection7c203e32de7071898401/visuals/628ab9479c857792d017/visual.json index 1a35382..065852a 100644 --- a/External All Channel.Report/definition/pages/ReportSection7c203e32de7071898401/visuals/628ab9479c857792d017/visual.json +++ b/External All Channel.Report/definition/pages/ReportSection7c203e32de7071898401/visuals/628ab9479c857792d017/visual.json @@ -1,9 +1,9 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.8.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.9.0/schema.json", "name": "628ab9479c857792d017", "position": { - "x": 940.19041988716822, - "y": 4.6292002353929211, + "x": 941.47992998597056, + "y": 8.27017396823561, "z": 0, "height": 33.098159509202453, "width": 210.31678555332448, diff --git a/External All Channel.Report/definition/pages/ReportSection7c203e32de7071898401/visuals/df26ee22e300ab6a543d/visual.json b/External All Channel.Report/definition/pages/ReportSection7c203e32de7071898401/visuals/df26ee22e300ab6a543d/visual.json index f59ad53..29c98ba 100644 --- a/External All Channel.Report/definition/pages/ReportSection7c203e32de7071898401/visuals/df26ee22e300ab6a543d/visual.json +++ b/External All Channel.Report/definition/pages/ReportSection7c203e32de7071898401/visuals/df26ee22e300ab6a543d/visual.json @@ -1,12 +1,12 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.7.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.9.0/schema.json", "name": "df26ee22e300ab6a543d", "position": { - "x": 732.22006728677979, - "y": 5.0330421054108569, + "x": 730.93055718797746, + "y": 1.392068372568168, "z": 14125, - "height": 43.16916488222698, - "width": 1150.5072054404927, + "height": 47.331189710610929, + "width": 1151.7967155392951, "tabOrder": 8000 }, "visualGroup": { diff --git a/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/e540378da57667468e92/visual.json b/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/e540378da57667468e92/visual.json index 098343e..2eaf399 100644 --- a/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/e540378da57667468e92/visual.json +++ b/External All Channel.Report/definition/pages/ReportSectioned71c491b41e12906de3/visuals/e540378da57667468e92/visual.json @@ -1,5 +1,5 @@ { - "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.8.0/schema.json", + "$schema": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/visualContainer/2.9.0/schema.json", "name": "e540378da57667468e92", "position": { "x": 0, @@ -4796,7 +4796,7 @@ "autoSizeColumnWidth": { "expr": { "Literal": { - "Value": "false" + "Value": "true" } } }, diff --git a/External All Channel.SemanticModel/.platform b/External All Channel.SemanticModel/.platform index 4aecbb3..a53b881 100644 --- a/External All Channel.SemanticModel/.platform +++ b/External All Channel.SemanticModel/.platform @@ -6,6 +6,6 @@ }, "config": { "version": "2.0", - "logicalId": "e651f9f7-6c0e-468b-b3e6-610ef7960ab4" + "logicalId": "b806f352-cf54-4854-b2d7-6c956de0b139" } } \ No newline at end of file diff --git a/External All Channel.SemanticModel/definition/cultures/zh-CN.tmdl b/External All Channel.SemanticModel/definition/cultures/zh-CN.tmdl index 9a5e58e..bb6ac56 100644 --- a/External All Channel.SemanticModel/definition/cultures/zh-CN.tmdl +++ b/External All Channel.SemanticModel/definition/cultures/zh-CN.tmdl @@ -16087,29 +16087,6 @@ cultureInfo zh-CN } ] }, - "dim_region_type.region_type": { - "Definition": { - "Binding": { - "ConceptualEntity": "Dim_RegionType", - "ConceptualProperty": "REGION_TYPE" - } - }, - "State": "Generated", - "Terms": [ - { - "region type": { - "State": "Generated" - } - }, - { - "REGION_TYPE": { - "Type": "Noun", - "State": "Generated", - "Weight": 0.99 - } - } - ] - }, "dim_brand_default_MKT": { "Definition": { "Binding": { @@ -27484,29 +27461,6 @@ cultureInfo zh-CN } ] }, - "dim_region_type.region_name": { - "Definition": { - "Binding": { - "ConceptualEntity": "Dim_RegionType", - "ConceptualProperty": "region_name" - } - }, - "State": "Generated", - "Terms": [ - { - "region name": { - "State": "Generated" - } - }, - { - "region_name": { - "Type": "Noun", - "State": "Generated", - "Weight": 0.99 - } - } - ] - }, "dm_td_chpa_market_definition": { "Definition": { "Binding": { @@ -32360,75 +32314,6 @@ cultureInfo zh-CN } ] }, - "dim_geo_group.province_group_catagory": { - "Definition": { - "Binding": { - "ConceptualEntity": "Dim_GeoGroup", - "ConceptualProperty": "PROVINCE_GROUP_CATAGORY" - } - }, - "State": "Generated", - "Terms": [ - { - "province group catagory": { - "State": "Generated" - } - }, - { - "PROVINCE_GROUP_CATAGORY": { - "Type": "Noun", - "State": "Generated", - "Weight": 0.99 - } - } - ] - }, - "dim_region_type.is_hidden_county": { - "Definition": { - "Binding": { - "ConceptualEntity": "Dim_RegionType", - "ConceptualProperty": "IS_HIDDEN_COUNTY" - } - }, - "State": "Generated", - "Terms": [ - { - "is hidden county": { - "State": "Generated" - } - }, - { - "IS_HIDDEN_COUNTY": { - "Type": "Noun", - "State": "Generated", - "Weight": 0.99 - } - } - ] - }, - "dim_market.is_hidden_county": { - "Definition": { - "Binding": { - "ConceptualEntity": "Dim_Market", - "ConceptualProperty": "IS_HIDDEN_COUNTY" - } - }, - "State": "Generated", - "Terms": [ - { - "is hidden county": { - "State": "Generated" - } - }, - { - "IS_HIDDEN_COUNTY": { - "Type": "Noun", - "State": "Generated", - "Weight": 0.99 - } - } - ] - }, "fact_sale.mergedata_flag": { "Definition": { "Binding": { @@ -32475,29 +32360,6 @@ cultureInfo zh-CN } ] }, - "dim_brand_MKT.is_hidden_county": { - "Definition": { - "Binding": { - "ConceptualEntity": "Dim_BrandMKT", - "ConceptualProperty": "IS_HIDDEN_COUNTY" - } - }, - "State": "Generated", - "Terms": [ - { - "is hidden county": { - "State": "Generated" - } - }, - { - "IS_HIDDEN_COUNTY": { - "Type": "Noun", - "State": "Generated", - "Weight": 0.99 - } - } - ] - }, "dim_calendar.YM_flag": { "Definition": { "Binding": { diff --git a/External All Channel.SemanticModel/definition/expressions.tmdl b/External All Channel.SemanticModel/definition/expressions.tmdl index 087c783..81305d7 100644 --- a/External All Channel.SemanticModel/definition/expressions.tmdl +++ b/External All Channel.SemanticModel/definition/expressions.tmdl @@ -21,7 +21,7 @@ expression limit = "10" meta [IsParameterQuery=true, Type="Text", IsParameterQue annotation PBI_ResultType = Text /// 切换数据源Http路径使用 -expression HttpPath = "sql/protocolv1/o/4124350841043461/0410-074134-do66802w" meta [IsParameterQuery=true, List={"sql/protocolv1/o/1064580724995799/1118-074021-486fqthp", "sql/protocolv1/o/4124350841043461/0410-074134-do66802w"}, DefaultValue="sql/protocolv1/o/1064580724995799/1118-074021-486fqthp", Type="Text", IsParameterQueryRequired=true] +expression HttpPath = "sql/protocolv1/o/1064580724995799/1118-074021-486fqthp" meta [IsParameterQuery=true, List={"sql/protocolv1/o/1064580724995799/1118-074021-486fqthp", "sql/protocolv1/o/4124350841043461/0410-074134-do66802w"}, DefaultValue="sql/protocolv1/o/1064580724995799/1118-074021-486fqthp", Type="Text", IsParameterQueryRequired=true] lineageTag: 9c59df5e-b5dc-4259-a64d-7ae346dcb3e7 queryGroup: 参数 @@ -30,7 +30,7 @@ expression HttpPath = "sql/protocolv1/o/4124350841043461/0410-074134-do66802w" m annotation PBI_NavigationStepName = Navigation /// 切换数据目录使用 -expression CatalogName = "catalog_e2_ngbi_prd" meta [IsParameterQuery=true, List={"catalog_e2_ngbi_qas", "catalog_e2_ngbi_prd"}, DefaultValue="catalog_e2_ngbi_prd", Type="Text", IsParameterQueryRequired=true] +expression CatalogName = "catalog_e2_ngbi_qas" meta [IsParameterQuery=true, List={"catalog_e2_ngbi_qas", "catalog_e2_ngbi_prd"}, DefaultValue="catalog_e2_ngbi_prd", Type="Text", IsParameterQueryRequired=true] lineageTag: f262d2bb-985d-406a-aacb-2c1d5b1430ac queryGroup: 参数 @@ -39,7 +39,7 @@ expression CatalogName = "catalog_e2_ngbi_prd" meta [IsParameterQuery=true, List annotation PBI_NavigationStepName = Navigation /// 切换服务器主机地址使用 -expression ServerAddress = "adb-4124350841043461.1.databricks.azure.cn" meta [IsParameterQuery=true, List={"adb-1064580724995799.3.databricks.azure.cn", "adb-4124350841043461.1.databricks.azure.cn"}, DefaultValue="adb-1064580724995799.3.databricks.azure.cn", Type="Text", IsParameterQueryRequired=true] +expression ServerAddress = "adb-1064580724995799.3.databricks.azure.cn" meta [IsParameterQuery=true, List={"adb-1064580724995799.3.databricks.azure.cn", "adb-4124350841043461.1.databricks.azure.cn"}, DefaultValue="adb-1064580724995799.3.databricks.azure.cn", Type="Text", IsParameterQueryRequired=true] lineageTag: 08b2d8cc-13df-48c6-970c-d788d6b1da4f queryGroup: 参数 diff --git a/External All Channel.SemanticModel/definition/relationships.tmdl b/External All Channel.SemanticModel/definition/relationships.tmdl index 20d0e97..c519c91 100644 --- a/External All Channel.SemanticModel/definition/relationships.tmdl +++ b/External All Channel.SemanticModel/definition/relationships.tmdl @@ -99,11 +99,6 @@ relationship 3b22ccf1-310c-abb2-c667-ce35f3302afa fromColumn: Fact_EC.PLATFORM_TYPE_SOURCE toColumn: Dim_PlatformMID.PLATFORM_TYPE_SOURCE -relationship 2e91292f-ad43-9957-8b21-359df82e3e77 - toCardinality: many - fromColumn: Fact_Sales_Total.REGION_TYPE - toColumn: Dim_RegionType.REGION_TYPE - relationship 180235a4-7288-6615-7b0e-62ab25528bd7 toCardinality: many fromColumn: Dim_Geo.AUDIT_KEY @@ -288,12 +283,6 @@ relationship 2724b646-60c1-d1d3-0343-6ffbe6c685cb fromColumn: Fact_Retail_RawData.DATA_SOURCE toColumn: Dim_DataSource_ForRLS.DATA_SOURCE -relationship 73477bd1-8615-2d4f-4a3d-99b57f53e812 - isActive: false - toCardinality: many - fromColumn: Dim_BrandMKT.IS_HIDDEN_COUNTY - toColumn: Dim_RegionType.IS_HIDDEN_COUNTY - relationship e369a4e6-11ea-c7ed-9f2d-ea5ed1f6316b crossFilteringBehavior: bothDirections fromColumn: Dim_RC_Merged_Data.KEY @@ -495,3 +484,7 @@ relationship fbe1a0c2-e9ac-7219-71fa-6efbdce5dda4 fromColumn: Fact_Sales.STORE_NAME toColumn: Dim_Store.STORE_NAME +relationship f30f6574-7413-c7c6-eef1-6db49a899c50 + fromColumn: Fact_Sales_Total.REGION_TYPE + toColumn: Dim_RegionType.REGION_TYPE + diff --git a/External All Channel.SemanticModel/definition/tables/00_KPI.tmdl b/External All Channel.SemanticModel/definition/tables/00_KPI.tmdl index e729f3e..51c4237 100644 --- a/External All Channel.SemanticModel/definition/tables/00_KPI.tmdl +++ b/External All Channel.SemanticModel/definition/tables/00_KPI.tmdl @@ -2835,10 +2835,7 @@ table 00_KPI lineageTag: 7c18d276-c27c-4a17-83a8-d4e197e51fc1 measure 'ExternalTotal.VBP.LY.KPI' = - CALCULATE ( - [ExternalTotal.VBP.LY.MTH], - USERELATIONSHIP ( Dim_RegionType[IS_HIDDEN_COUNTY], Dim_BrandMKT[IS_HIDDEN_COUNTY] ) - ) + [ExternalTotal.VBP.LY.MTH] ---------------------------------KPI描述------------------------------------ ------创建者：zhouxin ------邮箱：kmls393@astrazeneca.net @@ -2936,10 +2933,7 @@ table 00_KPI lineageTag: ef6a1c21-e215-4c04-ab99-6dfd275d246a measure 'ExternalTotal.VBP.KPI' = - CALCULATE ( - [ExternalTotal.VBP.MTH], - USERELATIONSHIP ( Dim_RegionType[IS_HIDDEN_COUNTY], Dim_BrandMKT[IS_HIDDEN_COUNTY] ) - ) + [ExternalTotal.VBP.MTH] ---------------------------------KPI描述------------------------------------ ------创建者：zhouxin ------邮箱：kmls393@astrazeneca.net diff --git a/External All Channel.SemanticModel/definition/tables/Dim_BrandMKT.tmdl b/External All Channel.SemanticModel/definition/tables/Dim_BrandMKT.tmdl index 77842d1..6d0236e 100644 --- a/External All Channel.SemanticModel/definition/tables/Dim_BrandMKT.tmdl +++ b/External All Channel.SemanticModel/definition/tables/Dim_BrandMKT.tmdl @@ -212,15 +212,6 @@ table Dim_BrandMKT annotation SummarizationSetBy = Automatic - column IS_HIDDEN_COUNTY - dataType: int64 - formatString: 0 - lineageTag: 8a2003c6-a56b-42e8-af70-f41f5e5908b3 - summarizeBy: sum - sourceColumn: IS_HIDDEN_COUNTY - - annotation SummarizationSetBy = Automatic - column Definition dataType: string lineageTag: 2885513c-6cc4-4b7b-8636-b21a05e89dad @@ -265,11 +256,6 @@ table Dim_BrandMKT TA_RN, DATA_SOURCE, B.PROD_DES_C BRAND_NAME_CN, - CASE - WHEN TA_NAME = 'ONC' THEN 1 - WHEN TA_NAME = 'RARE' THEN 2 - ELSE 0 - END AS IS_HIDDEN_COUNTY, CONCAT( MARKET, ' (', diff --git a/External All Channel.SemanticModel/definition/tables/Dim_GeoGroup.tmdl b/External All Channel.SemanticModel/definition/tables/Dim_GeoGroup.tmdl index fcef3b2..8e97696 100644 --- a/External All Channel.SemanticModel/definition/tables/Dim_GeoGroup.tmdl +++ b/External All Channel.SemanticModel/definition/tables/Dim_GeoGroup.tmdl @@ -74,15 +74,6 @@ table Dim_GeoGroup annotation SummarizationSetBy = Automatic - column PROVINCE_GROUP_CATAGORY - dataType: int64 - formatString: 0 - lineageTag: f7d1d4c5-e998-4b63-a952-2cfd7fcd4515 - summarizeBy: sum - sourceColumn: PROVINCE_GROUP_CATAGORY - - annotation SummarizationSetBy = Automatic - partition Dim_GeoGroup = m mode: import queryGroup: OLD\非首页 @@ -104,11 +95,7 @@ table Dim_GeoGroup DISTINCT DATA_SOURCE, AUDIT_COD, REGION_TYPE, - PROVINCE_GROUP, - CASE WHEN PROVINCE_GROUP = 'BBU County' OR PROVINCE_GROUP = 'BBU_BU_COUNTY' THEN 1 - WHEN PROVINCE_GROUP = 'OBU East5' OR PROVINCE_GROUP = 'OBU NonEast5' THEN 2 - WHEN PROVINCE_GROUP = '全国' THEN 3 - ELSE 4 END AS PROVINCE_GROUP_CATAGORY + PROVINCE_GROUP FROM DM.dm_td_external_geo_type " diff --git a/External All Channel.SemanticModel/definition/tables/Dim_Market.tmdl b/External All Channel.SemanticModel/definition/tables/Dim_Market.tmdl index f937f4c..526721a 100644 --- a/External All Channel.SemanticModel/definition/tables/Dim_Market.tmdl +++ b/External All Channel.SemanticModel/definition/tables/Dim_Market.tmdl @@ -57,15 +57,6 @@ table Dim_Market annotation SummarizationSetBy = Automatic - column IS_HIDDEN_COUNTY - dataType: int64 - formatString: 0 - lineageTag: f991248d-5cae-4b11-8178-7d460f1fa073 - summarizeBy: sum - sourceColumn: IS_HIDDEN_COUNTY - - annotation SummarizationSetBy = Automatic - column MERGED_DATA_MARKET dataType: int64 formatString: 0 @@ -132,11 +123,6 @@ table Dim_Market AND A.MARKET IN ('Respules Market', 'HTN Market') THEN 2 ELSE 0 END AS MKT_FLAG, - CASE - WHEN B.TA_MAP = 'RARE' THEN 1 - WHEN B.TA_MAP = 'ONCO' THEN 2 - ELSE 0 - END AS IS_HIDDEN_COUNTY, CASE WHEN C.MARKET IS NOT NULL THEN 1 ELSE 0 END AS MERGED_DATA_MARKET FROM DM.dm_td_ext_unionall_market A LEFT JOIN COUNTY_MARKET B ON A.MARKET = B.MARKET @@ -152,7 +138,7 @@ table Dim_Market Source ``` - annotation PBI_ResultType = Exception + annotation PBI_ResultType = Table annotation PBI_NavigationStepName = Navigation diff --git a/External All Channel.SemanticModel/definition/tables/Dim_RegionType.tmdl b/External All Channel.SemanticModel/definition/tables/Dim_RegionType.tmdl index 66a80ca..6f3f70b 100644 --- a/External All Channel.SemanticModel/definition/tables/Dim_RegionType.tmdl +++ b/External All Channel.SemanticModel/definition/tables/Dim_RegionType.tmdl @@ -3,7 +3,7 @@ table Dim_RegionType column REGION_TYPE dataType: string - lineageTag: 8ed78a9a-bf64-495b-bfe8-39e8a5d4b77a + lineageTag: b57a0378-d343-4cc0-82c6-f0bc06dc5f6d summarizeBy: none sourceColumn: REGION_TYPE @@ -11,70 +11,21 @@ table Dim_RegionType column region_name dataType: string - lineageTag: a2623e17-4eca-4108-9086-31e65141735d + lineageTag: 5e1e77ff-108a-44c1-9fea-5c21ff027469 summarizeBy: none sourceColumn: region_name annotation SummarizationSetBy = Automatic - column IS_HIDDEN_COUNTY - dataType: string - lineageTag: a6fe8b2d-feec-4282-9b75-4f0276a8bb58 - summarizeBy: none - sourceColumn: IS_HIDDEN_COUNTY - - annotation SummarizationSetBy = Automatic - partition Dim_RegionType = m mode: import queryGroup: OLD\首页 - source = ``` + source = let - Source = - Value.NativeQuery( - Databricks.Catalogs( - ServerAddress, HttpPath, [ - Catalog = CatalogName, - Database = null, - EnableAutomaticProxyDiscovery = null,EnableQueryResultDownload="0" - ] - ){ - [Name = CatalogName, Kind = "Database"] - }[Data], - // " SELECT DISTINCT A.REGION_TYPE,'BBU_COUNTY' REGION_NAME - // FROM DM.dm_ext_county_tf_sales_region A - // WHERE A.REGION_TYPE IN ('bbu_county_obu_nonEast5','BBU COUNTY') - // UNION ALL - // SELECT DISTINCT A.REGION_TYPE,'BBU_BU_COUNTY' REGION_NAME - // FROM DM.dm_ext_county_tf_sales_region A - // WHERE A.REGION_TYPE IN ('BBU_BU_COUNTY','bbu_bu_county_obu_East5','bbu_bu_county_obu_nonEast5') - // UNION ALL - // SELECT DISTINCT A.REGION_TYPE,'OBU East5' REGION_NAME - // FROM DM.dm_ext_county_tf_sales_region A - // WHERE A.REGION_TYPE = 'bbu_bu_county_obu_East5' - // UNION ALL - // SELECT DISTINCT A.REGION_TYPE,'OBU NonEast5' REGION_NAME - // FROM DM.dm_ext_county_tf_sales_region A - // WHERE A.REGION_TYPE IN ('bbu_bu_county_obu_nonEast5','bbu_county_obu_nonEast5') - // " - "SELECT DISTINCT A.REGION_TYPE - FROM DM.dm_ext_county_tf_sales_region A - WHERE A.REGION_TYPE IS NOT NULL" - & UsingLimit, - null, - [ - EnableFolding = true - ] - ), - 已添加自定义 = Table.AddColumn(Source, "region_name", each if [REGION_TYPE]="bbu_bu_county_obu_East5" then "OBU East5" - else if List.Contains({"bbu_bu_county_obu_nonEast5", "bbu_county_obu_nonEast5"}, [REGION_TYPE]) then "OBU NonEast5" - else if List.Contains({"BBU County", "bbu_county_obu_nonEast5"}, [REGION_TYPE]) then "BBU County" - else if List.Contains({"BBU_BU_COUNTY", "bbu_bu_county_obu_East5","bbu_bu_county_obu_nonEast5"}, [REGION_TYPE]) then "BBU_BU_COUNTY" - else 9), - #"Added Custom" = Table.AddColumn(已添加自定义, "IS_HIDDEN_COUNTY", each if Text.StartsWith([region_name], "OBU") then 1 else if Text.StartsWith([region_name], "BBU") then 0 else 0) + TABLE_1 = Table.FromRows({{"BBU County", "BBU County"},{"BU_County", "BU_County"}},{"REGION_TYPE","region_name"}), + #"Changed Type" = Table.TransformColumnTypes(TABLE_1,{{"REGION_TYPE", type text}, {"region_name", type text}}) in - #"Added Custom" - ``` + #"Changed Type" annotation PBI_ResultType = Table diff --git a/External All Channel.SemanticModel/definition/tables/Fact_Sales.tmdl b/External All Channel.SemanticModel/definition/tables/Fact_Sales.tmdl index 47705b7..2b142a3 100644 --- a/External All Channel.SemanticModel/definition/tables/Fact_Sales.tmdl +++ b/External All Channel.SemanticModel/definition/tables/Fact_Sales.tmdl @@ -160,13 +160,6 @@ table Fact_Sales annotation SummarizationSetBy = Automatic - column COUNTY_FLAG = IF([REGION_TYPE] IN {"BBU_BU COUNTY","OBU_BU COUNTY","OBU COUNTY","BBU COUNTY"},1,0) - formatString: 0 - lineageTag: 54d2f08a-99ae-4b56-8612-73a265a98b88 - summarizeBy: sum - - annotation SummarizationSetBy = Automatic - column GEO_FLAG = SWITCH(TRUE(), diff --git a/External All Channel.SemanticModel/definition/tables/Fact_Sales_Total.tmdl b/External All Channel.SemanticModel/definition/tables/Fact_Sales_Total.tmdl index 16649f9..0f2ac3f 100644 --- a/External All Channel.SemanticModel/definition/tables/Fact_Sales_Total.tmdl +++ b/External All Channel.SemanticModel/definition/tables/Fact_Sales_Total.tmdl @@ -195,38 +195,75 @@ table Fact_Sales_Total [Name = CatalogName, Kind = "Database"] }[Data], " + WITH base AS ( + -- 下推过滤，主表只扫一次 + SELECT * + FROM DM.dm_tf_ext_unionall_sales_mapping + WHERE YYYYMM >= (YEAR(CURRENT_DATE()) - 3) * 100 + 1 + ), + + geo AS ( + -- 小维表预聚合去重，配合 BROADCAST 使用 + SELECT DISTINCT AUDIT_COD, PROVINCE_GROUP + FROM DM.dm_td_external_geo_type + WHERE DATA_SOURCE = 'IQVIA-COUNTY(Quarterly)' + AND PROVINCE_GROUP <> '全国' + ) + + -- Branch 1: 非季度数据，REGION_TYPE 置空 SELECT - A.YYYYMM, - A.MARKET, - A.CLASS, - A.PACK_COD, - A.PLATFORM_TYPE, - A.STORE_TYPE, - A.REGION_TYPE, - A.DATA_SOURCE, - concat(A.MARKET,A.DATA_SOURCE) MKT_SOURCE, - SUM(NULLIF(A.SALES_UNIT_CAL, 0)) AS SALES_UNIT_CAL, - SUM(NULLIF(A.SALES_UNIT_CAL_LY, 0)) AS SALES_UNIT_CAL_LY, - SUM(NULLIF(A.SALES_VALUE_CAL, 0)) AS SALES_VALUE_CAL, - SUM(NULLIF(A.SALES_VALUE_CAL_LY, 0)) AS SALES_VALUE_CAL_LY, - SUM(NULLIF(A.CONUTING_UNIT, 0)) AS CONUTING_UNIT, - SUM(NULLIF(A.CONUTING_UNIT_LY, 0)) AS CONUTING_UNIT_LY, - SUM(NULLIF(A.PDOT, 0)) AS PDOT, - SUM(NULLIF(A.PDOT_LY, 0)) AS PDOT_LY - FROM - DM.dm_tf_ext_unionall_sales_mapping A - WHERE - YYYYMM >= (YEAR(CURRENT_DATE()) - 3) * 100 + 1 -- 内联，消除 CROSS JOIN - AND DATA_SOURCE <> 'XH Data(Quarterly)' + YYYYMM, + MARKET, + CLASS, + PACK_COD, + PLATFORM_TYPE, + STORE_TYPE, + '' AS REGION_TYPE, + DATA_SOURCE, + concat(MARKET, DATA_SOURCE) AS MKT_SOURCE, + SUM(NULLIF(SALES_UNIT_CAL, 0)) AS SALES_UNIT_CAL, + SUM(NULLIF(SALES_UNIT_CAL_LY,0)) AS SALES_UNIT_CAL_LY, + SUM(NULLIF(SALES_VALUE_CAL, 0)) AS SALES_VALUE_CAL, + SUM(NULLIF(SALES_VALUE_CAL_LY,0)) AS SALES_VALUE_CAL_LY, + SUM(NULLIF(CONUTING_UNIT, 0)) AS CONUTING_UNIT, + SUM(NULLIF(CONUTING_UNIT_LY, 0)) AS CONUTING_UNIT_LY, + SUM(NULLIF(PDOT, 0)) AS PDOT, + SUM(NULLIF(PDOT_LY, 0)) AS PDOT_LY + FROM base + WHERE DATA_SOURCE NOT IN ('XH Data(Quarterly)', 'IQVIA-COUNTY(Quarterly)','AIA(Monthly)') GROUP BY + YYYYMM, MARKET, CLASS, PACK_COD, + PLATFORM_TYPE, STORE_TYPE, DATA_SOURCE + + UNION ALL + + -- Branch 2: IQVIA 季度数据，关联省份分组 + SELECT /*+ BROADCAST(geo) */ A.YYYYMM, A.MARKET, A.CLASS, A.PACK_COD, - A.PLATFORM_TYPE, - A.STORE_TYPE, - A.REGION_TYPE, - A.DATA_SOURCE + '' as PLATFORM_TYPE, + '' as STORE_TYPE, + coalesce(B.PROVINCE_GROUP, '') AS REGION_TYPE, + A.DATA_SOURCE, + concat(A.MARKET, A.DATA_SOURCE) AS MKT_SOURCE, + SUM(NULLIF(A.SALES_UNIT_CAL, 0)) AS SALES_UNIT_CAL, + SUM(NULLIF(A.SALES_UNIT_CAL_LY,0)) AS SALES_UNIT_CAL_LY, + SUM(NULLIF(A.SALES_VALUE_CAL, 0)) AS SALES_VALUE_CAL, + SUM(NULLIF(A.SALES_VALUE_CAL_LY,0)) AS SALES_VALUE_CAL_LY, + SUM(NULLIF(A.CONUTING_UNIT, 0)) AS CONUTING_UNIT, + SUM(NULLIF(A.CONUTING_UNIT_LY, 0)) AS CONUTING_UNIT_LY, + SUM(NULLIF(A.PDOT, 0)) AS PDOT, + SUM(NULLIF(A.PDOT_LY, 0)) AS PDOT_LY + FROM base A + LEFT JOIN geo B + ON A.AUDIT_COD = B.AUDIT_COD + WHERE A.DATA_SOURCE = 'IQVIA-COUNTY(Quarterly)' + GROUP BY + A.YYYYMM, A.MARKET, A.CLASS, A.PACK_COD, + A.DATA_SOURCE, + coalesce(B.PROVINCE_GROUP, '') " & UsingLimit, null, @@ -238,7 +275,7 @@ table Fact_Sales_Total Source ``` - annotation PBI_ResultType = Table + annotation PBI_ResultType = Exception annotation PBI_NavigationStepName = Navigation diff --git a/External All Channel.SemanticModel/definition/tables/Measure.tmdl b/External All Channel.SemanticModel/definition/tables/Measure.tmdl index 08fb652..707f862 100644 --- a/External All Channel.SemanticModel/definition/tables/Measure.tmdl +++ b/External All Channel.SemanticModel/definition/tables/Measure.tmdl @@ -1613,46 +1613,16 @@ table Measure lineageTag: fb23c401-367f-47a1-be96-8ab5a3691aac measure 'External.Sales.LY.KPI' = - VAR MKT_FLAG = - SELECTEDVALUE ( Dim_Market[IS_HIDDEN_COUNTY], -1 ) - RETURN - //如果选择market，且选择province_group，则隐藏ONC&RARE市场 - SWITCH ( - TRUE ( ), - ISFILTERED ( Dim_GeoGroup ), - SWITCH ( - MKT_FLAG, - -1, [External.Sales.LY.MTH.MID], - 1, - CALCULATE ( - [External.Sales.LY.MTH.MID], - KEEPFILTERS ( - TREATAS ( { 0, 3 }, Dim_GeoGroup[PROVINCE_GROUP_CATAGORY] ) - ) - ), - 2, - CALCULATE ( - [External.Sales.LY.MTH.MID], - KEEPFILTERS ( - TREATAS ( { 0, 2, 3 }, Dim_GeoGroup[PROVINCE_GROUP_CATAGORY] ) - ) - ), - 0, - CALCULATE ( - [External.Sales.LY.MTH.MID], - KEEPFILTERS ( - TREATAS ( { 0, 1, 3 }, Dim_GeoGroup[PROVINCE_GROUP_CATAGORY] ) - ) - ) - ), - ISFILTERED ( AIA_Merge_Data[mergedata_5_2] ), - SUMX ( - VALUES ( Dim_MergeDataSource[DATA_SOURCE] ), - [External.Sales.LY.MTH.MID] - ), - ISFILTERED ( Config_PageFlag_FreeReportNIAD ), [Retail.NIAD.Sales.LY], - [External.Sales.LY.MTH.MID] - ) + SWITCH ( + TRUE ( ), + ISFILTERED ( AIA_Merge_Data[mergedata_5_2] ), + SUMX ( + VALUES ( Dim_MergeDataSource[DATA_SOURCE] ), + [External.Sales.LY.MTH.MID] + ), + ISFILTERED ( Config_PageFlag_FreeReportNIAD ), [Retail.NIAD.Sales.LY], + [External.Sales.LY.MTH.MID] + ) ---------------------------------KPI描述------------------------------------ ------创建者：zhouxin ------邮箱：kmls393@astrazeneca.net @@ -1959,46 +1929,16 @@ table Measure lineageTag: 80db969c-cb8b-4fb1-a94b-1904c1af37d5 measure 'External.Sales.KPI' = - VAR MKT_FLAG = - SELECTEDVALUE ( Dim_Market[IS_HIDDEN_COUNTY], -1 ) - RETURN - //如果选择market，且选择province_group，则隐藏ONC&RARE市场 - SWITCH ( - TRUE ( ), - ISFILTERED ( Dim_GeoGroup ), - SWITCH ( - MKT_FLAG, - -1, [External.Sales.MTH.MID], - 1, - CALCULATE ( - [External.Sales.MTH.MID], - KEEPFILTERS ( - TREATAS ( { 0, 3 }, Dim_GeoGroup[PROVINCE_GROUP_CATAGORY] ) - ) - ), - 2, - CALCULATE ( - [External.Sales.MTH.MID], - KEEPFILTERS ( - TREATAS ( { 0, 2, 3 }, Dim_GeoGroup[PROVINCE_GROUP_CATAGORY] ) - ) - ), - 0, - CALCULATE ( - [External.Sales.MTH.MID], - KEEPFILTERS ( - TREATAS ( { 0, 1, 3 }, Dim_GeoGroup[PROVINCE_GROUP_CATAGORY] ) - ) - ) - ), - ISFILTERED ( AIA_Merge_Data[mergedata_5_2] ), - SUMX ( - VALUES ( Dim_MergeDataSource[DATA_SOURCE] ), - [External.Sales.MTH.MID] - ), - ISFILTERED ( Config_PageFlag_FreeReportNIAD ), [Retail.NIAD.Sales], - [External.Sales.MTH.MID] - ) + SWITCH ( + TRUE ( ), + ISFILTERED ( AIA_Merge_Data[mergedata_5_2] ), + SUMX ( + VALUES ( Dim_MergeDataSource[DATA_SOURCE] ), + [External.Sales.MTH.MID] + ), + ISFILTERED ( Config_PageFlag_FreeReportNIAD ), [Retail.NIAD.Sales], + [External.Sales.MTH.MID] + ) ---------------------------------KPI描述------------------------------------ ------创建者：zhouxin ------邮箱：kmls393@astrazeneca.net diff --git a/External All Channel.SemanticModel/diagramLayout.json b/External All Channel.SemanticModel/diagramLayout.json index a6abfaf..d3eadf0 100644 --- a/External All Channel.SemanticModel/diagramLayout.json +++ b/External All Channel.SemanticModel/diagramLayout.json @@ -1943,7 +1943,7 @@ "height": 300, "width": 234 }, - "zIndex": 0 + "zIndex": 10 }, { "location": { @@ -1956,7 +1956,7 @@ "height": 176, "width": 234 }, - "zIndex": 0 + "zIndex": 1 }, { "location": { @@ -1969,7 +1969,7 @@ "height": 300, "width": 234 }, - "zIndex": 0 + "zIndex": 2 }, { "location": { @@ -1982,7 +1982,7 @@ "height": 152, "width": 234 }, - "zIndex": 0 + "zIndex": 3 }, { "location": { @@ -1995,12 +1995,12 @@ "height": 152, "width": 234 }, - "zIndex": 0 + "zIndex": 4 }, { "location": { - "x": 840.91665884177678, - "y": 158.266476064088 + "x": 1013.9166588417768, + "y": 122.26647606408801 }, "nodeIndex": "Dim_RegionType", "nodeLineageTag": "6aa1d3be-7da3-480d-96ed-18f4d5839bbe", @@ -2008,7 +2008,7 @@ "height": 152, "width": 234 }, - "zIndex": 0 + "zIndex": 5 }, { "location": { @@ -2021,7 +2021,7 @@ "height": 176, "width": 234 }, - "zIndex": 0 + "zIndex": 6 }, { "location": { @@ -2034,7 +2034,7 @@ "height": 248, "width": 234 }, - "zIndex": 0 + "zIndex": 7 }, { "location": { @@ -2047,7 +2047,7 @@ "height": 152, "width": 234 }, - "zIndex": 0 + "zIndex": 8 }, { "location": { @@ -2060,7 +2060,7 @@ "height": 300, "width": 234 }, - "zIndex": 0 + "zIndex": 9 } ], "name": "Layout 1", @@ -2071,6 +2071,6 @@ "tablesLocked": false } ], - "selectedDiagram": "Main_CHPA", + "selectedDiagram": "Layout 1", "defaultDiagram": "All tables" } \ No newline at end of file