|
@@ -203,10 +203,13 @@
|
|
|
b.filter_mode,
|
|
b.filter_mode,
|
|
|
b.is_samp_send
|
|
b.is_samp_send
|
|
|
from sop_user_logs a
|
|
from sop_user_logs a
|
|
|
- inner join qw_sop b on a.sop_id = b.id
|
|
|
|
|
|
|
+ inner join qw_sop b on a.sop_id = b.id
|
|
|
|
|
+ inner join qw_sop_temp c on b.temp_id = c.id
|
|
|
|
|
+ inner join qw_sop_temp c on b.temp_id = c.id
|
|
|
where a.start_time <= Now()
|
|
where a.start_time <= Now()
|
|
|
- and a.status = 1
|
|
|
|
|
- and b.send_type != 4 and b.status in (2,3)
|
|
|
|
|
|
|
+ and a.status = 1
|
|
|
|
|
+ and b.send_type != 4 and b.status in (2,3)
|
|
|
|
|
+ and c.`status` = 1
|
|
|
<if test="sopIds != null and !sopIds.isEmpty()">
|
|
<if test="sopIds != null and !sopIds.isEmpty()">
|
|
|
and a.sop_id in
|
|
and a.sop_id in
|
|
|
<foreach collection="sopIds" open="(" close=")" index="index" item="item" separator=",">#{item}</foreach>
|
|
<foreach collection="sopIds" open="(" close=")" index="index" item="item" separator=",">#{item}</foreach>
|