Merge branch 'weiyimin' into 'master'

push codes

See merge request !108

pm/daily_content/report/home_content_retention.sql

+
 select substr(day_id,1,6) `日期`
         ,device_os_type `系统`
         ,active_type `活跃`
@@ -10,6 +11,8 @@ select substr(day_id,1,6) `日期`
         ,concat(round(avg(if(no_click_uv_quality=0,NULL,no_click_uv_quality))*100,2),'%') as `未点击首页feed卡片设备次留率/全站次留率`
         ,concat(round(avg(if(home_good_click_retention_quality=0,NULL,home_good_click_retention_quality))*100,2),'%') as `当天点击首页feed卡片，且次日依旧点击的次留率/全站次留率`
 FROM pm.tl_pm_content_retention
-where partition_day>='20201110' and partition_day<=regexp_replace(DATE_SUB(current_date,1) ,'-','')
+where ((partition_day='20201110' and day_id<='20201109')
+       or (partition_day>'20201110' and partition_day<=regexp_replace(DATE_SUB(current_date,1) ,'-','')
+           and day_id=REGEXP_REPLACE(date_sub(concat_ws('-',substr(partition_day,1,4),substr(partition_day,5,2),substr(partition_day,7,2)),1), '-', '')))
 group by substr(day_id,1,6),device_os_type,active_type,channel
 order by `日期`,`系统`,`活跃`,`渠道`
\ No newline at end of file

pm/daily_push/etl/daily_push.sql

@@ -493,7 +493,7 @@ FROM
     FROM
     (
         select partition_day
-                ,device_id,msg_id,case when device_type='android' then 'android' else 'ios' end as device_os_type
+                ,device_id,msg_id
         from bl.bl_et_bg_trackingpushlog_inc_d
         where partition_day=regexp_replace(DATE_SUB(current_date,1) ,'-','')
         group by partition_day,device_id,msg_id