update

task/search_strategy_d.py

@@ -75,11 +75,12 @@ for t in range(0, task_days):
     sql = """SELECT t1.query as query
             ,t1.device_os_type as device_type
             ,t1.active_type as active_type
-            ,t1.channel as channel_type  
+            ,t1.channel as channel_type
             ,NVL(t3.search_pv,0) as 1_pv
             ,NVL(t3.search_uv,0) as 1_uv
             ,NVL(t4.hexin_card_click_pv,0) as 1_search_core_pv
             ,NVL(t4.neirong_card_click_pv,0) as 1_search_pv
+
     FROM
     (
         SELECT query,active_type,device_os_type,channel,search_pv,search_uv
@@ -608,8 +609,8 @@ for t in range(0, task_days):
         on t1.cl_id=dev.device_id and t1.partition_date = dev.partition_date
         GROUP BY t1.query,active_type,device_os_type,channel
     )t6
-    on t1.query=t6.query and t1.active_type=t6.active_type and t1.device_os_type = t6.device_os_type AND t1.channel = t6.channel""".format(last_30_day_str=last_30_day_str, today_str=today_str,
-                                                 yesterday_str=yesterday_str, one_week_age_str=one_week_age_str)
+    on t1.query=t6.query and t1.active_type=t6.active_type and t1.device_os_type = t6.device_os_type AND t1.channel = t6.channel
+""".format(last_30_day_str=last_30_day_str, today_str=today_str,yesterday_str=yesterday_str, one_week_age_str=one_week_age_str)
     device_df = spark.sql(sql)
     device_df.createOrReplaceTempView("data_table")