Merge branch 'weiyimin' into 'master'

push codes

See merge request !90

pm/daily_recommend_strategy/etl/daily_recommend_strategy.sql

@@ -67,9 +67,9 @@ FROM
                   cl_id,
                   case when card_content_type in ('qa','answer') then 'qa'
                        when card_content_type in ('special_pool') then 'special' else card_content_type end as card_content_type,
-                  CASE when transaction_type in ('fmctr') then array('fmctr','合计')
+                  CASE when transaction_type in ('fmctr','samecity_fmctr') then array('fmctr','合计')
                        when transaction_type in ('high_quality_fmctr') then array('high_quality_fmctr','合计')
-                       WHEN (transaction_type like '%ctr' and transaction_type not in ('high_quality_ctr','high_quality_fmctr','fmctr')) THEN array('ctr预估','合计')
+                       WHEN (transaction_type like '%ctr' and transaction_type not in ('high_quality_ctr','high_quality_fmctr','fmctr','samecity_fmctr') ) THEN array('ctr预估','合计')
                        when transaction_type in ('high_quality_ctr') then array('high_quality_ctr','合计')
                        WHEN transaction_type like '%cvr' THEN array('cvr预估','合计')
                        WHEN transaction_type in ('-1','smr') THEN array('smr','合计')
@@ -97,9 +97,9 @@ FROM
                   case when card_content_type in ('qa','answer') then 'qa'
                        when card_content_type in ('special_pool') then 'special' else card_content_type end,
                   cl_id,
-                  CASE when transaction_type in ('fmctr') then array('fmctr','合计')
+                  CASE when transaction_type in ('fmctr','samecity_fmctr') then array('fmctr','合计')
                        when transaction_type in ('high_quality_fmctr') then array('high_quality_fmctr','合计')
-                       WHEN (transaction_type like '%ctr' and transaction_type not in ('high_quality_ctr','high_quality_fmctr','fmctr')) THEN array('ctr预估','合计')
+                       WHEN (transaction_type like '%ctr' and transaction_type not in ('high_quality_ctr','high_quality_fmctr','fmctr','samecity_fmctr')) THEN array('ctr预估','合计')
                        when transaction_type in ('high_quality_ctr') then array('high_quality_ctr','合计')
                        WHEN transaction_type like '%cvr' THEN array('cvr预估','合计')
                        WHEN transaction_type in ('-1','smr') THEN array('smr','合计')
@@ -132,9 +132,9 @@ FROM
                   cl_id,
                   case when params['card_content_type'] in ('qa','answer') then 'qa'
                        when params['card_content_type'] in ('special_pool') then 'special' else params['card_content_type'] end as card_content_type,
-                  CASE when params['transaction_type'] in ('fmctr') then array('fmctr','合计')
+                  CASE when params['transaction_type'] in ('fmctr','samecity_fmctr') then array('fmctr','合计')
                        when params['transaction_type'] in ('high_quality_fmctr') then array('high_quality_fmctr','合计')
-                       WHEN (params['transaction_type'] like '%ctr' and params['transaction_type'] not in ('high_quality_ctr','high_quality_fmctr','fmctr')) THEN array('ctr预估','合计')
+                       WHEN (params['transaction_type'] like '%ctr' and params['transaction_type'] not in ('high_quality_ctr','high_quality_fmctr','fmctr','samecity_fmctr')) THEN array('ctr预估','合计')
                        when params['transaction_type'] in ('high_quality_ctr') then array('high_quality_ctr','合计')
                        WHEN params['transaction_type'] like '%cvr' THEN array('cvr预估','合计')
                        WHEN params['transaction_type'] in ('-1','smr') THEN array('smr','合计')
@@ -161,9 +161,9 @@ FROM
                   cl_id,
                   case when params['card_content_type'] in ('qa','answer') then 'qa'
                        when params['card_content_type'] in ('special_pool') then 'special' else params['card_content_type'] end,
-                  CASE when params['transaction_type'] in ('fmctr') then array('fmctr','合计')
+                  CASE when params['transaction_type'] in ('fmctr','samecity_fmctr') then array('fmctr','合计')
                        when params['transaction_type'] in ('high_quality_fmctr') then array('high_quality_fmctr','合计')
-                       WHEN (params['transaction_type'] like '%ctr' and params['transaction_type'] not in ('high_quality_ctr','high_quality_fmctr','fmctr')) THEN array('ctr预估','合计')
+                       WHEN (params['transaction_type'] like '%ctr' and params['transaction_type'] not in ('high_quality_ctr','high_quality_fmctr','fmctr','samecity_fmctr')) THEN array('ctr预估','合计')
                        when params['transaction_type'] in ('high_quality_ctr') then array('high_quality_ctr','合计')
                        WHEN params['transaction_type'] like '%cvr' THEN array('cvr预估','合计')
                        WHEN params['transaction_type'] in ('-1','smr') THEN array('smr','合计')
@@ -248,7 +248,7 @@ FROM
                        when page_name in ('custom_special') then 'special' else null end,time_str,page_stay
         )a
         left join
-        (
+        (--在8月份新增了内容专题卡片，需要转换下id
           select id,visual_page_id,'special' as page_name
           from tl.tl_zx_api_special_pool
           where partition_day =regexp_replace(DATE_SUB(current_date,1) ,'-','')