Commit 8a729c00 authored by 许润龙's avatar 许润龙

Merge branch 'dev-20241030' into 'uat'

Dev 20241030

See merge request !65
parents 7ffe41a8 dd3acdde
......@@ -46,7 +46,7 @@ public interface DwdKuaishouAuthorInfoMapper extends BaseMapper<DwdDouyinAuthorI
" where publish_time &gt;= #{dto.start} and publish_time &lt;= #{dto.end} " +
") t1 left join ( " +
" select aweme_id,collect_set(json_object('activity_id',activity_id,'match_keywords',match_keywords)) as activity_info " +
" from dwd_fhl_activity_douyin_aweme_info " +
" from dwd_activity_douyin_aweme_info " +
" where " +
" publish_time &gt;= #{dto.start} " +
" and publish_time &lt;= #{dto.end} " +
......@@ -92,7 +92,7 @@ public interface DwdKuaishouAuthorInfoMapper extends BaseMapper<DwdDouyinAuthorI
" where publish_time &gt;= #{dto.start} and publish_time &lt;= #{dto.end} " +
") t1 left join ( " +
" select aweme_id,collect_set(json_object('activity_id',activity_id,'match_keywords',match_keywords)) as activity_info " +
" from dwd_fhl_activity_kuaishou_aweme_info " +
" from dwd_activity_kuaishou_aweme_info " +
" where " +
" publish_time &gt;= #{dto.start} " +
" and publish_time &lt;= #{dto.end} " +
......@@ -139,7 +139,7 @@ public interface DwdKuaishouAuthorInfoMapper extends BaseMapper<DwdDouyinAuthorI
" where publish_time &gt;= #{dto.start} and publish_time &lt;= #{dto.end} " +
") t1 left join ( " +
" select room_id,collect_set(json_object('activity_id',activity_id,'match_keywords',match_keywords)) as activity_info " +
" from dwd_fhl_activity_douyin_live_info " +
" from dwd_activity_douyin_live_info " +
" where publish_time &gt;= #{dto.start} and publish_time &lt;= #{dto.end} " +
" and " +
" <choose>" +
......@@ -184,7 +184,7 @@ public interface DwdKuaishouAuthorInfoMapper extends BaseMapper<DwdDouyinAuthorI
" where publish_time &gt;= #{dto.start} and publish_time &lt;= #{dto.end} " +
") t1 left join ( " +
" select room_id,collect_set(json_object('activity_id',activity_id,'match_keywords',match_keywords)) as activity_info " +
" from dwd_fhl_activity_kuaishou_live_info " +
" from dwd_activity_kuaishou_live_info " +
" where publish_time &gt;= #{dto.start} and publish_time &lt;= #{dto.end} " +
" and " +
" <choose>" +
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment