Merge branch 'yindanlei' into 'master'

Yindanlei

See merge request !41

pm/fangan_day/etl/fangan_day.sql

@@ -142,15 +142,15 @@ LEFT JOIN
                 SELECT
                     user_id
                     ,merchant_id
-                    ,substr(partition_date,1,6) AS consult_month
-                    ,min(partition_date) AS first_consult_date
+                    ,substr(partition_day,1,6) AS consult_month
+                    ,min(partition_day) AS first_consult_date
                     ,1 AS consult_num
-                FROM  online.AL_COMMUNITY_USER_VALID_CONSULT_DAY
+                FROM  ml.ML_C_ET_MSG_CONVERSATION_DIMEN_INC_D
                 WHERE
-                    partition_date  between '20200701' AND regexp_replace(date_sub(current_date(),1),'-','')
-                    AND is_valid_consult='true'
+                    partition_day  between '20200701' AND regexp_replace(date_sub(current_date(),1),'-','')
+                    AND is_valid='true'
                     AND merchant_id IS NOT NULL
-                GROUP BY user_id,merchant_id,substr(partition_date,1,6)
+                GROUP BY user_id,merchant_id,substr(partition_day,1,6)
             )T3
             FULL JOIN
             (
@@ -259,15 +259,15 @@ LEFT JOIN
                 SELECT
                     user_id
                     ,merchant_id
-                    ,substr(partition_date,1,6) AS consult_month
-                    ,min(partition_date) AS first_consult_date
+                    ,substr(partition_day,1,6) AS consult_month
+                    ,min(partition_day) AS first_consult_date
                     ,1 AS consult_num
-                FROM  online.AL_COMMUNITY_USER_VALID_CONSULT_DAY
+                FROM  ml.ML_C_ET_MSG_CONVERSATION_DIMEN_INC_D
                 WHERE
-                    partition_date  between '20200701' AND regexp_replace(date_sub(current_date(),1),'-','')
-                    AND is_valid_consult='true'
+                    partition_day  between '20200701' AND regexp_replace(date_sub(current_date(),1),'-','')
+                    AND is_valid='true'
                     AND merchant_id IS NOT NULL
-                GROUP BY user_id,merchant_id,substr(partition_date,1,6)
+                GROUP BY user_id,merchant_id,substr(partition_day,1,6)
             )T3
             FULL JOIN
             (

pm/fangan_day/job/step1_5.job

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