Merge branch 'weiyimin' into 'master'

push codes

See merge request !26

pm/daily_recommend_strategy/etl/daily_recommend_strategy.sql

@@ -432,7 +432,7 @@ order by day_id,device_os_type,active_type,card_content_type,recommend_type;
 
 
 
-INSERT OVERWRITE TABLE pm.tl_pm_recommend_strategy_d PARTITION (PARTITION_DAY = ${partition_day})
+INSERT OVERWRITE TABLE pm.tl_pm_contentpage_ctr PARTITION (PARTITION_DAY = ${partition_day})
 
 SELECT mas.partition_date day_id
 		,device_os_type

pm/daily_recommend_strategy/report/content_ctr.sql

@@ -16,4 +16,4 @@ SELECT
     self_wel_click_pv as `关联卡片点击pv`
 FROM pm.tl_pm_contentpage_ctr
 WHERE partition_day>='20200730' and partition_day<=regexp_replace(DATE_SUB(current_date,1) ,'-','')
-order by 1 desc,2,3,4,5
\ No newline at end of file
+order by `日期` desc,`设备类型`,`活跃类型`,`灰度`,`页面`
\ No newline at end of file

pm/daily_recommend_strategy/report/home_recommend_strategy.sql

@@ -16,7 +16,7 @@ SELECT
     self_welfare_card as `来自I的商品卡片点击PV`,
     recommend_welfare_card as `来自I的推荐商品+查看全部商品点击pv`,
     recommend_content_card as `来自I的推荐内容点击pv`,
-    '未配置' as `来自I的推荐专题点击pv`,
+--    '未配置' as `来自I的推荐专题点击pv`,
     transfer_card as `来自I的转诊点击pv`,
     video_consultation as `来自I的视频面诊点击pv`FROM pm.tl_pm_recommend_strategy_d
 WHERE partition_day>='20200627' and partition_day<=regexp_replace(DATE_SUB(current_date,1) ,'-','')