update

task/core_indicators_monitoring.py

@@ -536,7 +536,7 @@ FROM
         AND t6.channel = t1.channel
 )t 
 
-""".format(start_date=last_30_day_str, end_date=today_str, )
+""".format(start_date=one_week_age_str, end_date=today_str, )
     device_df = spark.sql(sql)
 
     device_df.show(1, False)
@@ -545,7 +545,7 @@ FROM
         print(res)
         partition_date = res.partition_date
         device_os_type = res.device_os_type
-        active_type = res.device_os_type
+        active_type = res.active_type
         channel = res.channel
         dau = res.dau
         all_search_click_uv_724 = res.all_search_click_uv_724
@@ -573,7 +573,7 @@ FROM
             {search_success_rate},{sug_uesd_rate},{referrer_search_hexin_pv},{referrer_search_welfare_pv},{search_core_pv_div_dau},{search_core_two_div_dau},{search_neirong_two_div_dau},{search_neirong_per_duration},{referrer_search_neirong_pv},'{pid}',{search_neirong_pv_div_dau},{search_hexin_two_pv});""".format(
             partition_date=partition_date, device_os_type=device_os_type,
             active_type=active_type, channel=channel, dau=dau,
-            all_search_click_uv_724=all_search_click_uv_724,all_search_click_pv_724=all_search_click_uv_724,all_search_uv=all_search_uv,all_search_pv=all_search_pv,completed_user_rate=completed_user_rate,per_user_search_count=per_user_search_count,
+            all_search_click_uv_724=all_search_click_uv_724,all_search_click_pv_724=all_search_click_pv_724,all_search_uv=all_search_uv,all_search_pv=all_search_pv,completed_user_rate=completed_user_rate,per_user_search_count=per_user_search_count,
             search_success_rate=search_success_rate,sug_uesd_rate=sug_uesd_rate,referrer_search_hexin_pv=referrer_search_hexin_pv,
             referrer_search_welfare_pv=referrer_search_welfare_pv,search_core_pv_div_dau=search_core_pv_div_dau,
             search_core_two_div_dau=search_core_two_div_dau,search_neirong_two_div_dau=search_neirong_two_div_dau,