|
@@ -104,7 +104,7 @@
|
|
|
on t.advertiser_id = x.advertiser_id
|
|
on t.advertiser_id = x.advertiser_id
|
|
|
join deepthink.bytedance_auth_list a
|
|
join deepthink.bytedance_auth_list a
|
|
|
on x.admin_advertiser_id = a.admin_advertiser_id
|
|
on x.admin_advertiser_id = a.admin_advertiser_id
|
|
|
- where (t.om_task_status is null or t.om_task_status not in (4,6,7,8))
|
|
|
|
|
|
|
+ where (t.om_task_status is null or t.om_task_status not in (6,7,8))
|
|
|
<if test="advertiserId != null">
|
|
<if test="advertiserId != null">
|
|
|
and t.advertiser_id = ${advertiserId}
|
|
and t.advertiser_id = ${advertiserId}
|
|
|
</if>
|
|
</if>
|
|
@@ -117,7 +117,7 @@
|
|
|
on t.advertiser_id = x.advertiser_id
|
|
on t.advertiser_id = x.advertiser_id
|
|
|
join deepthink.bytedance_auth_list a
|
|
join deepthink.bytedance_auth_list a
|
|
|
on x.admin_advertiser_id = a.admin_advertiser_id
|
|
on x.admin_advertiser_id = a.admin_advertiser_id
|
|
|
- where (t.om_task_status not in (1,2,6) or t.om_task_status is null)
|
|
|
|
|
|
|
+ where (t.om_task_status not in (1,2,4) or t.om_task_status is null)
|
|
|
and (t.end_time is null or t.end_time >= unix_timestamp(date_add(now(),Interval -65 day)))
|
|
and (t.end_time is null or t.end_time >= unix_timestamp(date_add(now(),Interval -65 day)))
|
|
|
<if test="advertiserId != null">
|
|
<if test="advertiserId != null">
|
|
|
and t.advertiser_id = ${advertiserId}
|
|
and t.advertiser_id = ${advertiserId}
|