diff --git a/External All Channel.SemanticModel/definition/expressions.tmdl b/External All Channel.SemanticModel/definition/expressions.tmdl index 24c82b6..d9338b1 100644 --- a/External All Channel.SemanticModel/definition/expressions.tmdl +++ b/External All Channel.SemanticModel/definition/expressions.tmdl @@ -47,97 +47,6 @@ expression ServerAddress = "adb-1064580724995799.3.databricks.azure.cn" meta [Is annotation PBI_NavigationStepName = Navigation -expression Fact_Sales_SQL = ``` - let - Source = " - select - DATA_SOURCE, - MARKET, - KEY_COMPETITOR, - CLASS, - YYYYMM, - PACK_COD, - AUDIT_COD, - VA, - UT, - CU, - PT, - SALES_UNIT_CAL, - SALES_UNIT_CAL_LY, - SALES_VALUE_CAL, - SALES_VALUE_CAL_LY, - CONUTING_UNIT, - CONUTING_UNIT_LY, - PDOT, - PDOT_LY, - PRESCRIPTION, - PRESCRIPTION_LY, - ---关联主键----------------------------- - TO_DATE(CONCAT(YYYYMM, '01'), 'yyyyMMdd') AS DATE_KEY, - COALESCE(MARKET, '') || DATA_SOURCE AS MARKET_KEY, - COALESCE(PACK_COD, '') || DATA_SOURCE || NEW_CODE AS PACK_SOURCE, - COALESCE(AUDIT_COD, '') || DATA_SOURCE AS AUDIT_SOURCE, - COALESCE(AUDIT_COD, '') || DATA_SOURCE AS AUDIT_KEY, - COALESCE(MARKET, '') || COALESCE(CLASS, '') || DATA_SOURCE AS CLASS_KEY, - - COALESCE(STORE_TYPE, '') || DATA_SOURCE AS STORE_TYPE_SOURCE, - COALESCE(STORE_TYPE, '') || '-' || COALESCE(PLATFORM_TYPE, '') AS STORE_PLATFORM, - COALESCE(REIMBURSE_TYPE, '') || DATA_SOURCE AS REIMBURSETYPE_SOURCE, - COALESCE(REIMBURSE, '') || DATA_SOURCE AS REIMBURSE_SOURCE, - COALESCE(PRESCRIPTION_TYPE, '') || DATA_SOURCE AS PRESCRIPTION_SOURCE, - COALESCE(PLATFORM_TYPE, '') || DATA_SOURCE AS PLATFORM_TYPE_SOURCE, - COALESCE(dept_name, '') || DATA_SOURCE AS DEPT_SOURCE, - COALESCE(AUDIT_COD, '') || DATA_SOURCE AS INST_SOURCE, - COALESCE(AIA_HP_FLAG, '') || DATA_SOURCE AS HP_SOURCE, - ------------------------------------- - --Retail藏数逻辑标签------------------ - PACK_FLAG, - PROD_FLAG, - DTP_FLAG, - CMPS_FLAG, - ------------------------------------- - --EC数据标签-------------------------- - PLATFORM_TYPE, - STORE_NAME, - STORE_TYPE, - ------------------------------------- - --COUNTY数据标签---------------------- - REGION_TYPE, - --AIA数据标签------------------------- - INST_CODE, - AIA_HP_FLAG, - AIA_REMOVE, - ------------------------------------- - --XIE HE 数据标签--------------------- - NEW_CODE, - DEPT_NAME, - H_LEVEL, - REIMBURSE, - REIMBURSE_TYPE, - PRESCRIPTION_TYPE, - ------------------------------------- - --Merged Data部分-------------------- - MERGEDATA_FLAG, - MERGEDATA_FLAG_MKT, - MERGEDATA_FLAG_CHPA_DTP, - MERGEDATA_FLAG_DTP_NOROC, - MERGED_DATA_DTP_OTHERS, - EGFR_FLAG, - ------------------------------------- - NULL AS CORP_COD - from - DM.DM_TF_EXT_UNIONALL_SALES_MAPPING - " - in - Source - ``` - lineageTag: 312c3815-6670-40d9-95c7-499cad398ead - queryGroup: Fact_Sales - - annotation PBI_NavigationStepName = Navigation - - annotation PBI_ResultType = Text - expression Fact_Sales_SQL_limit = let Source = "--limit 10" @@ -266,3 +175,94 @@ expression Config_MarketRatio = ``` annotation PBI_ResultType = Table +expression Fact_Sales_SQL = ``` + let + Source = " + select + DATA_SOURCE, + MARKET, + KEY_COMPETITOR, + CLASS, + YYYYMM, + PACK_COD, + AUDIT_COD, + VA, + UT, + CU, + PT, + SALES_UNIT_CAL, + SALES_UNIT_CAL_LY, + SALES_VALUE_CAL, + SALES_VALUE_CAL_LY, + CONUTING_UNIT, + CONUTING_UNIT_LY, + PDOT, + PDOT_LY, + PRESCRIPTION, + PRESCRIPTION_LY, + ---关联主键----------------------------- + TO_DATE(CONCAT(YYYYMM, '01'), 'yyyyMMdd') AS DATE_KEY, + COALESCE(MARKET, '') || DATA_SOURCE AS MARKET_KEY, + COALESCE(PACK_COD, '') || DATA_SOURCE || NEW_CODE AS PACK_SOURCE, + COALESCE(AUDIT_COD, '') || DATA_SOURCE AS AUDIT_SOURCE, + COALESCE(AUDIT_COD, '') || DATA_SOURCE AS AUDIT_KEY, + COALESCE(MARKET, '') || COALESCE(CLASS, '') || DATA_SOURCE AS CLASS_KEY, + + COALESCE(STORE_TYPE, '') || DATA_SOURCE AS STORE_TYPE_SOURCE, + COALESCE(STORE_TYPE, '') || '-' || COALESCE(PLATFORM_TYPE, '') AS STORE_PLATFORM, + COALESCE(REIMBURSE_TYPE, '') || DATA_SOURCE AS REIMBURSETYPE_SOURCE, + COALESCE(REIMBURSE, '') || DATA_SOURCE AS REIMBURSE_SOURCE, + COALESCE(PRESCRIPTION_TYPE, '') || DATA_SOURCE AS PRESCRIPTION_SOURCE, + COALESCE(PLATFORM_TYPE, '') || DATA_SOURCE AS PLATFORM_TYPE_SOURCE, + COALESCE(dept_name, '') || DATA_SOURCE AS DEPT_SOURCE, + COALESCE(AUDIT_COD, '') || DATA_SOURCE AS INST_SOURCE, + COALESCE(AIA_HP_FLAG, '') || DATA_SOURCE AS HP_SOURCE, + ------------------------------------- + --Retail藏数逻辑标签------------------ + PACK_FLAG, + PROD_FLAG, + DTP_FLAG, + CMPS_FLAG, + ------------------------------------- + --EC数据标签-------------------------- + PLATFORM_TYPE, + STORE_NAME, + STORE_TYPE, + ------------------------------------- + --COUNTY数据标签---------------------- + REGION_TYPE, + --AIA数据标签------------------------- + INST_CODE, + AIA_HP_FLAG, + AIA_REMOVE, + ------------------------------------- + --XIE HE 数据标签--------------------- + NEW_CODE, + DEPT_NAME, + H_LEVEL, + REIMBURSE, + REIMBURSE_TYPE, + PRESCRIPTION_TYPE, + ------------------------------------- + --Merged Data部分-------------------- + MERGEDATA_FLAG, + MERGEDATA_FLAG_MKT, + MERGEDATA_FLAG_CHPA_DTP, + MERGEDATA_FLAG_DTP_NOROC, + MERGED_DATA_DTP_OTHERS, + TARGET_INS, + ------------------------------------- + NULL AS CORP_COD + from + DM.DM_TF_EXT_UNIONALL_SALES_MAPPING + " + in + Source + ``` + lineageTag: 497f395d-d390-4732-9549-1d1416916ed3 + queryGroup: Fact_Sales + + annotation PBI_NavigationStepName = Navigation + + annotation PBI_ResultType = Text + diff --git a/External All Channel.SemanticModel/definition/tables/CONFIG_ACCESS.tmdl b/External All Channel.SemanticModel/definition/tables/CONFIG_ACCESS.tmdl index b965a9e..534b8bc 100644 --- a/External All Channel.SemanticModel/definition/tables/CONFIG_ACCESS.tmdl +++ b/External All Channel.SemanticModel/definition/tables/CONFIG_ACCESS.tmdl @@ -85,86 +85,33 @@ table CONFIG_ACCESS ) RETURN IF ( - COUNTROWS ( CONFIG_ACCESS_ROLE ) = 1 - , SWITCH ( - userrole - , "nsd", + COUNTROWS ( CONFIG_ACCESS_ROLE ) = 1, + SWITCH ( + userrole, + "nsd", SELECTEDMEASURE ( ), + "rsd", SELECTEDMEASURE ( ), + "rsm", CALCULATE ( - SELECTEDMEASURE ( ) - , TREATAS ( - VALUES ( Dim_Market[MARKET] ), - Dim_RC_Merged_Data[MARKET] - ) - , TREATAS ( - VALUES ( Dim_Market[MARKET] ), - Dim_Remove_inst[MARKET] - ) - , KEEPFILTERS ( Dim_Remove_inst[aia_remove] = 1 ) - ) - , "rsd", - CALCULATE ( - SELECTEDMEASURE ( ) - , TREATAS ( - VALUES ( Dim_Market[MARKET] ), - Dim_RC_Merged_Data[MARKET] - ) - , TREATAS ( - VALUES ( Dim_Market[MARKET] ), - Dim_Remove_inst[MARKET] - ) - , KEEPFILTERS ( Dim_Remove_inst[aia_remove] = 1 ) - ) - , "rsm", - CALCULATE ( - SELECTEDMEASURE ( ) - , KEEPFILTERS ( + SELECTEDMEASURE ( ), + KEEPFILTERS ( TREATAS ( VALUES ( DM_AUTH_MERGED_DATA[parent_code] ), Dim_Org[rsd_kcode] ) ) - , TREATAS ( - VALUES ( Dim_Market[MARKET] ), - Dim_RC_Merged_Data[MARKET] - ) - , TREATAS ( - VALUES ( Dim_Market[MARKET] ), - Dim_Remove_inst[MARKET] - ) - , KEEPFILTERS ( Dim_Remove_inst[aia_remove] = 1 ) - ) - , "dsm", + ), + "dsm", CALCULATE ( - SELECTEDMEASURE ( ) - , KEEPFILTERS ( + SELECTEDMEASURE ( ), + KEEPFILTERS ( TREATAS ( VALUES ( DM_AUTH_MERGED_DATA[parent_code] ), Dim_Org[rsm_kcode] ) ) - , TREATAS ( - VALUES ( Dim_Market[MARKET] ), - Dim_RC_Merged_Data[MARKET] - ) - , TREATAS ( - VALUES ( Dim_Market[MARKET] ), - Dim_Remove_inst[MARKET] - ) - , KEEPFILTERS ( Dim_Remove_inst[aia_remove] = 1 ) ) - ) - , CALCULATE ( - SELECTEDMEASURE ( ) - , TREATAS ( - VALUES ( Dim_Market[MARKET] ), - Dim_RC_Merged_Data[MARKET] - ) - , TREATAS ( - VALUES ( Dim_Market[MARKET] ), - Dim_Remove_inst[MARKET] - ) - , KEEPFILTERS ( Dim_Remove_inst[aia_remove] = 1 ) - ) + ), + SELECTEDMEASURE ( ) ) column ACCESS_REPORT diff --git a/External All Channel.SemanticModel/definition/tables/Fact_Sales.tmdl b/External All Channel.SemanticModel/definition/tables/Fact_Sales.tmdl index 5367362..94fcdc8 100644 --- a/External All Channel.SemanticModel/definition/tables/Fact_Sales.tmdl +++ b/External All Channel.SemanticModel/definition/tables/Fact_Sales.tmdl @@ -790,7 +790,7 @@ table Fact_Sales Source ``` - partition Fact_Sales_XIEHE = m + partition Fact_Sales_XIEHE1 = m mode: import queryGroup: Fact_Sales source = ``` @@ -806,7 +806,85 @@ table Fact_Sales ){ [Name = CatalogName, Kind = "Database"] }[Data], - Fact_Sales_SQL &"WHERE DATA_SOURCE = 'XH Data(Quarterly)'"& Fact_Sales_SQL_limit& UsingLimit, + Fact_Sales_SQL &"WHERE DATA_SOURCE = 'XH Data(Quarterly)' AND YYYYMM <=202212"& Fact_Sales_SQL_limit& UsingLimit, + null, + [ + EnableFolding = true + ] + ) + in + Source + ``` + + partition Fact_Sales_XIEHE2 = m + mode: import + queryGroup: Fact_Sales + source = ``` + let + Source = + Value.NativeQuery( + Databricks.Catalogs( + ServerAddress, HttpPath, [ + Catalog = CatalogName, + Database = null, + EnableAutomaticProxyDiscovery = null,EnableQueryResultDownload="0" + ] + ){ + [Name = CatalogName, Kind = "Database"] + }[Data], + Fact_Sales_SQL &"WHERE DATA_SOURCE = 'XH Data(Quarterly)' AND YYYYMM >=202301 AND YYYYMM <=202312"& Fact_Sales_SQL_limit& UsingLimit, + null, + [ + EnableFolding = true + ] + ) + in + Source + ``` + + partition Fact_Sales_XIEHE3 = m + mode: import + queryGroup: Fact_Sales + source = ``` + let + Source = + Value.NativeQuery( + Databricks.Catalogs( + ServerAddress, HttpPath, [ + Catalog = CatalogName, + Database = null, + EnableAutomaticProxyDiscovery = null,EnableQueryResultDownload="0" + ] + ){ + [Name = CatalogName, Kind = "Database"] + }[Data], + Fact_Sales_SQL &"WHERE DATA_SOURCE = 'XH Data(Quarterly)' AND YYYYMM >=202401 AND YYYYMM <=202412"& Fact_Sales_SQL_limit& UsingLimit, + null, + [ + EnableFolding = true + ] + ) + in + Source + ``` + + partition Fact_Sales_XIEHE4 = m + mode: import + queryGroup: Fact_Sales + source = ``` + let + Source = + Value.NativeQuery( + Databricks.Catalogs( + ServerAddress, HttpPath, [ + Catalog = CatalogName, + Database = null, + EnableAutomaticProxyDiscovery = null,EnableQueryResultDownload="0" + ] + ){ + [Name = CatalogName, Kind = "Database"] + }[Data], + Fact_Sales_SQL &"WHERE DATA_SOURCE = 'XH Data(Quarterly)' AND YYYYMM >=202501 AND YYYYMM <=202512"& Fact_Sales_SQL_limit& UsingLimit, null, [ EnableFolding = true diff --git a/External All Channel.SemanticModel/diagramLayout.json b/External All Channel.SemanticModel/diagramLayout.json index 1b8f0a6..0e15b2d 100644 --- a/External All Channel.SemanticModel/diagramLayout.json +++ b/External All Channel.SemanticModel/diagramLayout.json @@ -1363,8 +1363,8 @@ { "ordinal": 3, "scrollPosition": { - "x": 0, - "y": 279.20001220703125 + "x": 108.20000076293945, + "y": 320.20001220703125 }, "nodes": [ {