chenwu/MarketAnalysis-Rebuild
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

20260519生产同步修复较多问题

Browse Source
This commit is contained in:
chenwu
2026-05-20 16:06:43 +08:00
parent b02475424a
commit 6e957a44f6
23 changed files with 5355 additions and 4427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
External All Channel.SemanticModel/definition/expressions.tmdl
View File

@@ -21,7 +21,7 @@ expression limit = "10" meta [IsParameterQuery=true, Type="Text", IsParameterQue
annotation PBI_ResultType = Text
/// 切换数据源Http路径使用
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]
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]
lineageTag: 9c59df5e-b5dc-4259-a64d-7ae346dcb3e7
queryGroup: 参数
@@ -30,7 +30,7 @@ expression HttpPath = "sql/protocolv1/o/1064580724995799/1118-074021-486fqthp" m
annotation PBI_NavigationStepName = Navigation
/// 切换数据目录使用
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]
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]
lineageTag: f262d2bb-985d-406a-aacb-2c1d5b1430ac
queryGroup: 参数
@@ -39,7 +39,7 @@ expression CatalogName = "catalog_e2_ngbi_qas" meta [IsParameterQuery=true, List
annotation PBI_NavigationStepName = Navigation
/// 切换服务器主机地址使用
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]
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]
lineageTag: 08b2d8cc-13df-48c6-970c-d788d6b1da4f
queryGroup: 参数
@@ -205,7 +205,7 @@ expression Fact_Sales_SQL = ```
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(AUDIT_COD, '') || DATA_SOURCE || REGION_TYPE AS AUDIT_KEY,
COALESCE(MARKET, '') || COALESCE(CLASS, '') || DATA_SOURCE AS CLASS_KEY,
COALESCE(STORE_TYPE, '') || DATA_SOURCE AS STORE_TYPE_SOURCE,

2
External All Channel.SemanticModel/definition/model.tmdl
View File

@@ -70,7 +70,7 @@ annotation PBI_QueryOrder = ["Measure THC","Dim_PackInfo_Retail","Dim_MergeDataS
annotation __TEdtr = 1
annotation __LastRPTime = 134132553209188708
annotation __LastRPTime = 134236262901892344
annotation PBI_ProTooling = ["CalcGroup","DaxQueryView_Desktop","TMDLView_Desktop","DevMode"]

15
External All Channel.SemanticModel/definition/tables/DM_AUTH_NONSALES_ORG.tmdl
View File

@@ -34,6 +34,7 @@ table DM_AUTH_NONSALES_ORG
[Name = CatalogName, Kind = "Database"]
}[Data],
"
WITH TEMP_TABLE (
SELECT
USER_KCODE,
TA
@@ -41,7 +42,19 @@ table DM_AUTH_NONSALES_ORG
dm.dm_auth_nonsales_org
WHERE
TA IS NOT NULL
GROUP BY 1,2
GROUP BY 1,2)
SELECT
*
FROM
TEMP_TABLE
UNION ALL
SELECT
USER_KCODE,
'ALL' TA
FROM
TEMP_TABLE
GROUP BY
1
"
& UsingLimit,
null,

2
External All Channel.SemanticModel/definition/tables/Dim_RC.tmdl
View File

@@ -598,7 +598,7 @@ table Dim_RC
annotation PBI_NavigationStepName = Navigation
annotation PBI_ResultType = Table
annotation PBI_ResultType = Exception
annotation TabularEditor_TableGroup = 04_DimTable

4
External All Channel.SemanticModel/definition/tables/Fact_Retail.tmdl
View File

@@ -352,7 +352,8 @@ table Fact_Retail
) B
ON A.PACK_CODE = B.PACK_CODE
where
(B.pack_code IS NULL and a.KPI_NAME in ('weig_dist_rate','weighted_spread_rate','num_dist_rate','digital_spread_rate')) OR a.KPI_NAME NOT IN ('weig_dist_rate','weighted_spread_rate','num_dist_rate','digital_spread_rate')
(B.pack_code IS not null and GEO_KEY <> 'ROC')
OR B.pack_code IS null
GROUP BY
A.PACK_CODE,
A.CORP_COD,
@@ -404,6 +405,7 @@ table Fact_Retail
end as STR_KPI_VAL_EN_1
FROM
dm_zk_retail_sales_kpi A
WHERE YYYYMM>=202101
"
& UsingLimit,
null,

60
External All Channel.SemanticModel/definition/tables/Measure.tmdl
View File

@@ -247,7 +247,7 @@ table Measure
measure 'External.Sales.KPI.Market' =
VAR PV = [External.Sales.KPI]
VAR CV = [External.MKTPack.Count]
VAR CV = IF ( ISFILTERED ( Config_PageFlag_FreeReportNIAD ), COUNTROWS ( Fact_Sales_NIAD ) , [External.MKTPack.Count])
VAR T =
SWITCH (
TRUE ( )
@@ -2731,13 +2731,25 @@ table Measure
|| ISFILTERED ( Dim_BrandDefaultMKT ),
IF (
[External.Sales.KPI.Market] <> 0,
CALCULATE (
[External.Sales.KPI]
, ALLSELECTED ( Dim_DataSource )
, REMOVEFILTERS ( Dim_PackInfo )
, TREATAS (
VALUES ( Fact_Sales[CLASS_KEY] ),
Dim_Class[CLASS_SOURCE]
IF (
ISFILTERED ( Config_PageFlag_FreeReportNIAD ),
CALCULATE (
[External.Sales.KPI],
ALLSELECTED ( Dim_DataSource ),
REMOVEFILTERS ( Dim_PackInfo ),
TREATAS (
VALUES ( Fact_Sales_NIAD[CLASS_SOURCE] ),
Dim_Class[CLASS_SOURCE]
)
),
CALCULATE (
[External.Sales.KPI],
ALLSELECTED ( Dim_DataSource ),
REMOVEFILTERS ( Dim_PackInfo ),
TREATAS (
VALUES ( Fact_Sales[CLASS_KEY] ),
Dim_Class[CLASS_SOURCE]
)
)
)
)
@@ -5130,13 +5142,25 @@ table Measure
|| ISFILTERED ( Dim_BrandDefaultMKT ),
IF (
[External.Sales.LY.KPI.Market] <> 0,
CALCULATE (
[External.Sales.LY.KPI],
ALLSELECTED ( Dim_DataSource ),
REMOVEFILTERS ( Dim_PackInfo ),
TREATAS (
VALUES ( Fact_Sales[CLASS_KEY] ),
Dim_Class[CLASS_SOURCE]
IF (
ISFILTERED ( Config_PageFlag_FreeReportNIAD ),
CALCULATE (
[External.Sales.LY.KPI],
ALLSELECTED ( Dim_DataSource ),
REMOVEFILTERS ( Dim_PackInfo ),
TREATAS (
VALUES ( Fact_Sales_NIAD[CLASS_SOURCE] ),
Dim_Class[CLASS_SOURCE]
)
),
CALCULATE (
[External.Sales.LY.KPI],
ALLSELECTED ( Dim_DataSource ),
REMOVEFILTERS ( Dim_PackInfo ),
TREATAS (
VALUES ( Fact_Sales[CLASS_KEY] ),
Dim_Class[CLASS_SOURCE]
)
)
)
)
@@ -7370,9 +7394,7 @@ table Measure
annotation PBI_FormatHint = {"isGeneralNumber":true}
measure 'External.Sales.KPI.Filter' =
CALCULATE([External.Value.MTH],MQY[Period]="mth")
measure 'External.Sales.KPI.Filter' = CALCULATE ( [01.Value], ALL ( Dim_Calendar ) )
displayFolder: OLD\External Sales
lineageTag: 301fa5ea-de21-48e3-a333-ac18f0dbef45
@@ -11006,7 +11028,7 @@ table Measure
measure 'External.Sales.LY.KPI.Market' =
VAR PV = [External.Sales.LY.KPI]
VAR CV = [External.MKTPack.Count]
VAR CV = IF ( ISFILTERED ( Config_PageFlag_FreeReportNIAD ), COUNTROWS ( Fact_Sales_NIAD ) , [External.MKTPack.Count])
VAR T =
SWITCH (
TRUE ( )