From 351d371151eed470f373939e3cf37a188534d4c0 Mon Sep 17 00:00:00 2001
From: chenwu <zhuchenwu@chenwuzhu.cn>
Date: Thu, 14 May 2026 07:26:01 +0000
Subject: [PATCH] 20260514_PDOT_by_Month_Final
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复ec的niad部分只取了季度末的月份数据的bug，取整个季度的数据
ec的直取部分逻辑遇到值为NA的修改为空
---
 EC/03 ec_load_data.ipynb                      | 16 ++++++++--------
 UNIONALL/DM_TF_EXT_UNIONALL_MARKET_SALES.sql  |  6 +++---
 UNIONALL/DM_TF_EXT_UNIONALL_SALES_MAPPING.sql |  5 ++---
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/EC/03 ec_load_data.ipynb b/EC/03 ec_load_data.ipynb
index d435a7e..917708b 100644
--- a/EC/03 ec_load_data.ipynb	
+++ b/EC/03 ec_load_data.ipynb	
@@ -2075,12 +2075,12 @@
       "byteLimit": 2048000,
       "rowLimit": 10000
      },
-     "finishTime": 1778669714239,
+     "finishTime": 1778738278731,
      "inputWidgets": {},
      "nuid": "9e6100db-d97c-41a6-8b30-4f7a774c1903",
      "showTitle": false,
-     "startTime": 1778669709339,
-     "submitTime": 1778669597785,
+     "startTime": 1778738271903,
+     "submitTime": 1778738271208,
      "tableResultSettingsMap": {},
      "title": ""
     }
@@ -2267,12 +2267,12 @@
       "byteLimit": 2048000,
       "rowLimit": 10000
      },
-     "finishTime": 1778669717268,
+     "finishTime": 1778740588491,
      "inputWidgets": {},
      "nuid": "0c0fe2ec-f80e-4872-85bf-fd5d058cc8b8",
      "showTitle": false,
-     "startTime": 1778669714244,
-     "submitTime": 1778669597790,
+     "startTime": 1778740585423,
+     "submitTime": 1778740585345,
      "tableResultSettingsMap": {},
      "title": ""
     }
@@ -2312,8 +2312,8 @@
     "  NVL(KPI_name, '') AS KPI_name,\n",
     "\n",
     "  -- 数值型 KPI：先转 DOUBLE 再 NVL，兼容源字段为字符串的情况\n",
-    "  nvl(CAST(Kpi_val    AS decimal(30,10)),0) AS Kpi_val,\n",
-    "  nvl(CAST(Kpi_val_ly    AS decimal(30,10)),0) AS Kpi_val_ly,\n",
+    "  case when Kpi_val = 'NA'    tHEN NULL ELSE nvl(CAST(Kpi_val    AS decimal(30,10)),0) END AS Kpi_val,\n",
+    "  case when Kpi_val_ly = 'NA' tHEN NULL ELSE nvl(CAST(Kpi_val_ly AS decimal(30,10)),0) END AS Kpi_val_ly,\n",
     "\n",
     "  -- 字符串型 KPI（销售额/销量，含同比）\n",
     "  NVL(str_kpi_val,    '') AS str_kpi_val,\n",
diff --git a/UNIONALL/DM_TF_EXT_UNIONALL_MARKET_SALES.sql b/UNIONALL/DM_TF_EXT_UNIONALL_MARKET_SALES.sql
index a1c6b80..dd06915 100644
--- a/UNIONALL/DM_TF_EXT_UNIONALL_MARKET_SALES.sql
+++ b/UNIONALL/DM_TF_EXT_UNIONALL_MARKET_SALES.sql
@@ -63,7 +63,7 @@
 -- COMMAND ----------
 
 -- DBTITLE 1,测试跑数据
--- delete from DM.DM_TF_EXT_UNIONALL_MARKET_SALES where DATA_SOURCE IN ('Retail(Quarterly)') --, 
+-- delete from DM.DM_TF_EXT_UNIONALL_MARKET_SALES where DATA_SOURCE IN ('EC(Monthly)') --, 
 
 -- COMMAND ----------
 
@@ -83,9 +83,9 @@
 --         -- 'CHC(Quarterly)',
 --         -- 'IQVIA-COUNTY(Quarterly)',
 --         -- 'THC(Quarterly)'
---         'Retail(Quarterly)'
+--         -- 'Retail(Quarterly)'
 --         -- ,'DTP(Quarterly)',
---         -- 'EC(Monthly)'
+--         'EC(Monthly)'
 --         -- 'XH Data(Quarterly)'
 --       ) -- 谓词下推，最先过滤
 --   ),
diff --git a/UNIONALL/DM_TF_EXT_UNIONALL_SALES_MAPPING.sql b/UNIONALL/DM_TF_EXT_UNIONALL_SALES_MAPPING.sql
index 761a644..b044cc0 100644
--- a/UNIONALL/DM_TF_EXT_UNIONALL_SALES_MAPPING.sql
+++ b/UNIONALL/DM_TF_EXT_UNIONALL_SALES_MAPPING.sql
@@ -246,7 +246,6 @@ FROM
   ON T0.YYYYMM <= T1.others_month
 WHERE
   T0.DATA_SOURCE = 'EC(Monthly)'
-  AND SUBSTR(T0.YYYYMM, 5, 2) IN ('03', '06', '09', '12')
 UNION ALL 
 --RETAIL
 SELECT
@@ -476,7 +475,7 @@ FROM
 -- COMMAND ----------
 
 -- DBTITLE 1,测试代码
--- delete from dm.DM_TF_EXT_UNIONALL_SALES_MAPPING where DATA_SOURCE IN ( 'CHC(Quarterly)','THC(Quarterly)','Retail(Quarterly)')--'Retail(Quarterly)','EC(Monthly)'
+-- delete from dm.DM_TF_EXT_UNIONALL_SALES_MAPPING where DATA_SOURCE IN ( 'EC(Monthly)')--'Retail(Quarterly)','EC(Monthly)'
 
 -- COMMAND ----------
 
@@ -534,5 +533,5 @@ SELECT
 FROM 
   DM_TF_EXT_UNIONALL_SALES_MAPPING
 
--- WHERE DATA_SOURCE IN ( 'CHC(Quarterly)','THC(Quarterly)','Retail(Quarterly)')--'',
+-- WHERE DATA_SOURCE IN ( 'EC(Monthly)')--'',
 -- AND yyyymm>=202501