Merge branch 'weiyimin' into 'master'

Weiyimin

See merge request zhaojianwei/bi-report!11

jobs/search_related/step1_2.job

+#step1_2.job
+type=command
+command=sh /home/bi/bi-report/lib/shell/waitsuccess.sh hive online bl_hdfs_maidian_updates
\ No newline at end of file

sqls/bak/meigou-detail-page/meigou-detail-page-dispense-pv.sql

@@ -266,37 +266,37 @@ FROM
 		    AND page_name = 'welfare_detail'
 			AND action='page_click_share'
 		)click
-                        JOIN
-                    (
-                        SELECT partition_date
-                             ,device_os_type AS device_type
-                             ,CASE WHEN active_type = '4'  THEN '老活跃设备'
-                                   WHEN active_type  IN ('1','2')  THEN '新增设备' END AS active_type
-                             ,array(CASE WHEN tmp.time = 'AI' THEN 'AI' ELSE '其他' END , '合计') as channel
-                             ,device_id
-                        FROM online.ml_device_day_active_status
-                                 LEFT JOIN
-                             (SELECT phone,time
-                              FROM offline.tmp_zhx_20191227
-                              WHERE flag='0204_danlei_channel')tmp
-                             on first_channel_source_type=tmp.phone
-                        WHERE partition_date>=regexp_replace((current_date - interval '90' day),'-','')
-                          AND partition_date<regexp_replace((current_date),'-','')
-                          AND active_type IN ('1','2','4')
-                          AND first_channel_source_type not IN ('yqxiu1','yqxiu2','yqxiu3','yqxiu4','yqxiu5','mxyc1','mxyc2','mxyc3'
-                            ,'wanpu','jinshan','jx','maimai','zhuoyi','huatian','suopingjingling','mocha','mizhe','meika','lamabang'
-                            ,'js-az1','js-az2','js-az3','js-az4','js-az5','jfq-az1','jfq-az2','jfq-az3','jfq-az4','jfq-az5','toufang1'
-                            ,'toufang2','toufang3','toufang4','toufang5','toufang6','TF-toufang1','TF-toufang2','TF-toufang3','TF-toufang4'
-                            ,'TF-toufang5','tf-toufang1','tf-toufang2','tf-toufang3','tf-toufang4','tf-toufang5','benzhan','promotion_aso100'
-                            ,'promotion_qianka','promotion_xiaoyu','promotion_dianru','promotion_malioaso','promotion_malioaso-shequ'
-                            ,'promotion_shike','promotion_julang_jl03','promotion_zuimei','','unknown')
-                          AND first_channel_source_type not LIKE 'promotion\_jf\_%'
-                    )mas
-                    ON click.cl_id=mas.device_id
-                        AND click.partition_date=mas.partition_date
-            )t1
-            LATERAL VIEW explode(t1.channel) t2 AS channel
-        GROUP BY t1.partition_date,t1.device_type,t1.active_type,t2.channel
-    )T1
+         JOIN
+        (
+            SELECT partition_date
+                 ,device_os_type AS device_type
+                 ,CASE WHEN active_type = '4'  THEN '老活跃设备'
+                       WHEN active_type  IN ('1','2')  THEN '新增设备' END AS active_type
+                 ,array(CASE WHEN tmp.time = 'AI' THEN 'AI' ELSE '其他' END , '合计') as channel
+                 ,device_id
+            FROM online.ml_device_day_active_status
+                     LEFT JOIN
+                 (SELECT phone,time
+                  FROM offline.tmp_zhx_20191227
+                  WHERE flag='0204_danlei_channel')tmp
+                 on first_channel_source_type=tmp.phone
+            WHERE partition_date>=regexp_replace((current_date - interval '90' day),'-','')
+              AND partition_date<regexp_replace((current_date),'-','')
+              AND active_type IN ('1','2','4')
+              AND first_channel_source_type not IN ('yqxiu1','yqxiu2','yqxiu3','yqxiu4','yqxiu5','mxyc1','mxyc2','mxyc3'
+                ,'wanpu','jinshan','jx','maimai','zhuoyi','huatian','suopingjingling','mocha','mizhe','meika','lamabang'
+                ,'js-az1','js-az2','js-az3','js-az4','js-az5','jfq-az1','jfq-az2','jfq-az3','jfq-az4','jfq-az5','toufang1'
+                ,'toufang2','toufang3','toufang4','toufang5','toufang6','TF-toufang1','TF-toufang2','TF-toufang3','TF-toufang4'
+                ,'TF-toufang5','tf-toufang1','tf-toufang2','tf-toufang3','tf-toufang4','tf-toufang5','benzhan','promotion_aso100'
+                ,'promotion_qianka','promotion_xiaoyu','promotion_dianru','promotion_malioaso','promotion_malioaso-shequ'
+                ,'promotion_shike','promotion_julang_jl03','promotion_zuimei','','unknown')
+              AND first_channel_source_type not LIKE 'promotion\_jf\_%'
+        )mas
+        ON click.cl_id=mas.device_id
+            AND click.partition_date=mas.partition_date
+    )t1
+    LATERAL VIEW explode(t1.channel) t2 AS channel
+    GROUP BY t1.partition_date,t1.device_type,t1.active_type,t2.channel
+)T1
 ORDER BY `日期` desc,`设备类型`,`活跃类型`,`渠道`