Merge branch 'weiyimin' into 'master'

push codes

See merge request !82

pm/daily_content/report/ai_content_by_month.sql

@@ -3,13 +3,14 @@ SELECT
         ,device_os_type AS `系统`
         ,active_type AS `活跃`
         ,channel as `渠道`
-        ,dau AS `DAU`
+        ,dau AS `dau`
+        ,ai_report_uv AS `ai结果页uv`
         ,ai_report_card_click_uv AS `ai结果页内容卡片点击uv`
         ,ai_report_card_click_pv AS `ai结果页内容卡片点击pv`
         ,ai_report_good_click AS `来源于ai结果页的good click`
-        ,CONCAT(ROUND(ai_report_card_click_uv/dau*100,2),'%') AS `ai结果页内容卡片点击uv/DAU`
-        ,CONCAT(ROUND(ai_report_card_click_pv/dau*100,2),'%') AS `ai结果页内容卡片点击pv/DAU`
-        ,CONCAT(ROUND(ai_report_good_click/dau*100,2),'%') AS `来源于ai结果页的good click/DAU`
+        ,CONCAT(ROUND(ai_report_card_click_uv/ai_report_uv*100,2),'%') AS `ai结果页内容卡片点击uv/DAU`
+        ,CONCAT(ROUND(ai_report_card_click_pv/ai_report_uv*100,2),'%') AS `ai结果页内容卡片点击pv/DAU`
+        ,CONCAT(ROUND(ai_report_good_click/ai_report_uv*100,2),'%') AS `来源于ai结果页的good click/DAU`
 FROM
 (
     select substr(day_id,1,6) as month
@@ -17,10 +18,11 @@ FROM
             ,active_type
             ,channel
             ,round(avg(dau),0) as dau
+            ,round(avg(ai_report_uv),0) as ai_report_uv
             ,round(avg(ai_report_card_click_uv),0) as ai_report_card_click_uv
             ,round(avg(ai_report_card_click_pv),0) as ai_report_card_click_pv
             ,round(avg(ai_report_good_click),0) as ai_report_good_click
-    FROM pm.tl_pm_content_v2
+    FROM pm.tl_pm_content_v3
     where partition_day>='20201018' and partition_day <= regexp_replace(DATE_SUB(current_date,1) ,'-','')
     group by substr(day_id,1,6),device_os_type,active_type,channel
 )t1

pm/daily_content/report/ai_content_detail.sql

@@ -4,12 +4,13 @@ SELECT
         ,active_type AS `活跃`
         ,channel as `渠道`
         ,dau AS `DAU`
+        ,ai_report_uv as `ai结果页uv`
         ,ai_report_card_click_uv AS `ai结果页内容卡片点击uv`
         ,ai_report_card_click_pv AS `ai结果页内容卡片点击pv`
         ,ai_report_good_click AS `来源于ai结果页的good click`
-        ,NVL(CONCAT(ROUND(ai_report_card_click_uv/dau*100,2),'%'),0) AS `ai结果页内容卡片点击uv/DAU`
-        ,NVL(CONCAT(ROUND(ai_report_card_click_pv/dau*100,2),'%'),0) AS `ai结果页内容卡片点击pv/DAU`
-        ,NVL(CONCAT(ROUND(ai_report_good_click/dau*100,2),'%'),0) AS `来源于ai结果页的good click/DAU`
-FROM pm.tl_pm_content_v2
+        ,NVL(CONCAT(ROUND(ai_report_card_click_uv/ai_report_uv*100,2),'%'),0) AS `ai结果页内容卡片点击uv/DAU`
+        ,NVL(CONCAT(ROUND(ai_report_card_click_pv/ai_report_uv*100,2),'%'),0) AS `ai结果页内容卡片点击pv/DAU`
+        ,NVL(CONCAT(ROUND(ai_report_good_click/ai_report_uv*100,2),'%'),0) AS `来源于ai结果页的good click/DAU`
+FROM pm.tl_pm_content_v3
 where partition_day>='20201018' and partition_day <= regexp_replace(DATE_SUB(current_date,1) ,'-','')
 order by `日期`,`系统`,`活跃`,`渠道`
\ No newline at end of file

pm/daily_content/report/home_content_by_month.sql

@@ -28,7 +28,7 @@ FROM
             ,round(avg(home_card_click_pv),0) as home_card_click_pv
             ,round(avg(home_good_click),0) as home_good_click
             ,round(avg(page_stay_per_device),2) as page_stay_per_device
-    FROM pm.tl_pm_content_v2
+    FROM pm.tl_pm_content_v3
     where partition_day>='20201018' and partition_day <= regexp_replace(DATE_SUB(current_date,1) ,'-','')
     group by substr(day_id,1,6),device_os_type,active_type,channel
 )t1

pm/daily_content/report/home_content_detail.sql

@@ -14,6 +14,6 @@ SELECT
         ,NVL(CONCAT(ROUND(home_card_click_pv/dau*100,2),'%'),0) AS `首页卡片点击pv/DAU`
         ,NVL(CONCAT(ROUND(home_good_click/dau*100,2),'%'),0) AS `来源于首页的good click/DAU`
         ,NVL(page_stay_per_device,0) AS `单设备内容浏览时长(m)`
-FROM pm.tl_pm_content_v2
+FROM pm.tl_pm_content_v3
 where partition_day>='20201018' and partition_day <= regexp_replace(DATE_SUB(current_date,1) ,'-','')
 order by `日期`,`系统`,`活跃`,`渠道`
\ No newline at end of file