push codes

pm/daily_userpost/en-cn.properties

-daily_userpost=精华帖日报
+daily_userpost=新手精选帖日报
\ No newline at end of file

pm/wel_clue_by_channel/report/clue_by_channel.sql

@@ -18,7 +18,7 @@ SELECT
               ,first_channel_source_type
               ,concat_ws('-',substr(partition_date,1,4),substr(partition_date,5,2),substr(partition_date,7,2)) AS first_active_date
           FROM online.ml_device_day_active_status
-          WHERE partition_date >= REGEXP_REPLACE(trunc(date_sub(current_date(),1),'MM'),'-','')
+          WHERE partition_date >= REGEXP_REPLACE(trunc(date_sub(current_date(),8),'MM'),'-','')
             AND partition_date <=regexp_replace(date_sub(current_date(),1),'-','')
             AND active_type in ('1','2')
             AND first_channel_source_type not in ('yqxiu1','yqxiu2','yqxiu3','yqxiu4','yqxiu5','mxyc1','mxyc2','mxyc3'
@@ -70,7 +70,7 @@ SELECT
             (
                 SELECT user_id,merchant_id,SUBSTR(partition_day,1,6) AS consult_month,min(partition_day) as first_consult_date,1 as CONSULT_NUM
                 FROM ml.ml_c_et_msg_conversation_dimen_inc_d --新仓库私信表
-                WHERE partition_day >= REGEXP_REPLACE(trunc(date_sub(current_date(),1),'MM'),'-','')
+                WHERE partition_day >= REGEXP_REPLACE(trunc(date_sub(current_date(),8),'MM'),'-','')
                 AND partition_day <= regexp_replace(date_sub(current_date,1),'-','')
                 and is_valid='true'
                 GROUP BY user_id,merchant_id,SUBSTR(partition_day,1,6)
@@ -105,7 +105,7 @@ SELECT
                 SELECT sub_id,REGEXP_REPLACE(SUBSTR(call_time,0,10), '-', '') as partition_date
                 FROM  tl.tl_gm_sl_ali_virtual_phone_call_detail --通话记录表，call_type呼叫类型
                 WHERE partition_day=regexp_replace(date_sub(current_date(),1),'-','')
-                AND REGEXP_REPLACE(SUBSTR(call_time,0,10), '-', '')>=REGEXP_REPLACE(trunc(date_sub(current_date(),1),'MM'),'-','')
+                AND REGEXP_REPLACE(SUBSTR(call_time,0,10), '-', '')>=REGEXP_REPLACE(trunc(date_sub(current_date(),8),'MM'),'-','')
                 AND REGEXP_REPLACE(SUBSTR(call_time,0,10), '-', '')<=regexp_replace(date_sub(current_date,1),'-','')
                 AND start_time<release_time --通话时长大于30秒
             )a
@@ -136,6 +136,7 @@ SELECT
                 FROM tl.tl_gm_sl_lead_task  --线索任务表（用户点击授权后记入该表）
                 WHERE partition_day=regexp_replace(date_sub(current_date(),1),'-','')
                 AND source='2' --用户行为电话授权
+                and (user_id is NOT NULL or USER_ID <> '')
             )e
                 ON d.lead_task_id = e.id
             GROUP BY user_id,merchant_id,regexp_replace(SUBSTR(a.partition_date,1,6),'-','')
@@ -146,7 +147,7 @@ SELECT
     (
         SELECT user_id,partition_date,if(size(device_list) > 0, device_list [ 0 ], '') device_id
         FROM online.ml_user_updates
-        WHERE partition_date >= REGEXP_REPLACE(trunc(date_sub(current_date(),1),'MM'),'-','')
+        WHERE partition_date >= REGEXP_REPLACE(trunc(date_sub(current_date(),8),'MM'),'-','')
         AND partition_date <=regexp_replace(date_sub(current_date(),1),'-','')
     )t2
         on t1.user_id=t2.user_id and t1.DATE_DAY=t2.partition_date

pm/wel_clue_by_channel/report/welfare_by_channel.sql

@@ -18,7 +18,7 @@ SELECT
               ,first_channel_source_type
               ,concat_ws('-',substr(partition_date,1,4),substr(partition_date,5,2),substr(partition_date,7,2)) AS first_active_date
           FROM online.ml_device_day_active_status
-          WHERE partition_date >= REGEXP_REPLACE(trunc(date_sub(current_date(),1),'MM'),'-','')
+          WHERE partition_date >= REGEXP_REPLACE(trunc(date_sub(current_date(),8),'MM'),'-','')
             AND partition_date <=regexp_replace(date_sub(current_date(),1),'-','')
             AND active_type in ('1','2')
             AND first_channel_source_type not in ('yqxiu1','yqxiu2','yqxiu3','yqxiu4','yqxiu5','mxyc1','mxyc2','mxyc3'
@@ -51,7 +51,7 @@ SELECT
       (
         SELECT concat_ws('-',substr(partition_date,0,4),substr(partition_date,5,2),substr(partition_date,7,2)) AS action_date,cl_id
     		FROM online.bl_hdfs_maidian_updates
-    		WHERE partition_date >= REGEXP_REPLACE(trunc(date_sub(current_date(),1),'MM'),'-','')
+    		WHERE partition_date >= REGEXP_REPLACE(trunc(date_sub(current_date(),8),'MM'),'-','')
             AND partition_date <=regexp_replace(date_sub(current_date(),1),'-','')
     			AND page_name in ('welfare_detail','organization_detail','expert_detail')
     			AND action = 'page_view'