Merge branch 'master' of git.wanmeizhensuo.com:zhaojianwei/bi-report

jobs/daily_content_data/step4.job

 #step4.job
 type=command
 dependencies=step3
-command=curl -X GET http://localhost:8553/api/report/sendEmail/weiyimin@igengmei.com/zhaojianwei@igengmei.com,mazhimo@igengmei.com/daily_content_data
\ No newline at end of file
+command=curl -X GET http://localhost:8553/api/report/sendEmail/liudi@igengmei.com,wangxin@igengmei.com,malinxi@igengmei.com,dengguangyu@igengmei.com/weiyimin@igengmei.com,zhaojianwei@igengmei.com,mazhimo@igengmei.com,zhaofei@igengmei.com,yindanlei@igengmei.com/daily_content_data
\ No newline at end of file

sqls/daily_content_data/daily_content_data.sql

@@ -45,8 +45,6 @@ SELECT
 		,per_my_diary_pv AS `我的日记页进入内容PV/UV`
 		,ai_rate AS `AI报告页进入内容UV/内容UV`
 		,per_ai_pv AS `AI报告页进入内容PV/UV`
-		,create_topic_num AS `真实发帖数`
-		,create_reply_num AS `真实评论数`
 		,diary_uv AS `日记UV`
 		,diary_pv AS `日记PV`
 		,diary_rate AS `日记UV/内容UV`

sqls/daily_content_data_insert/daily_content_data_insert.sql

@@ -46,8 +46,8 @@ SELECT
 		,COALESCE(ROUND(T6.my_diary_pv/T6.my_diary_uv,4),0) AS per_my_diary_pv
 		,COALESCE(ROUND(T6.ai_uv/T2.neirong_uv,4),0) AS ai_rate
 		,COALESCE(ROUND(T6.ai_pv/T6.ai_uv,4),0) AS per_ai_pv
-		,COALESCE(T7.num,0) AS create_topic_num
-		,COALESCE(T8.num,0) AS create_reply_num
+		,null AS create_topic_num
+		,null AS create_reply_num
 		,COALESCE(T2.diary_uv,0) AS diary_uv
 		,COALESCE(T2.diary_pv,0) AS diary_pv
 		,COALESCE(ROUND(T2.diary_uv/T2.neirong_uv,4),0) AS diary_rate

sqls/hive_insert/exec_sql.sql

-INSERT INTO TABLE pm.tl_pm_zjw select * from offline.tmp_zhx_20191227 where time = 'AI'
\ No newline at end of file