|
@@ -279,7 +279,6 @@
|
|
|
sop_user_logs ul LEFT JOIN qw_sop qs on ul.sop_id=qs.id
|
|
sop_user_logs ul LEFT JOIN qw_sop qs on ul.sop_id=qs.id
|
|
|
WHERE
|
|
WHERE
|
|
|
ul.`status` = '1'
|
|
ul.`status` = '1'
|
|
|
- and qs.is_rating=1
|
|
|
|
|
and qs.type=2
|
|
and qs.type=2
|
|
|
and qs.send_type in (2,11)
|
|
and qs.send_type in (2,11)
|
|
|
and qs.`status` in (2,3)
|
|
and qs.`status` in (2,3)
|
|
@@ -300,7 +299,7 @@
|
|
|
and qs.type=2
|
|
and qs.type=2
|
|
|
and qs.send_type in (2,11)
|
|
and qs.send_type in (2,11)
|
|
|
and qs.`status` in (2,3)
|
|
and qs.`status` in (2,3)
|
|
|
- AND ( DATEDIFF( CURRENT_DATE, ul.start_time ) ) < #{notStudyDays}
|
|
|
|
|
|
|
+
|
|
|
ORDER BY id ASC
|
|
ORDER BY id ASC
|
|
|
LIMIT #{offset}, #{pageSize}
|
|
LIMIT #{offset}, #{pageSize}
|
|
|
</select>
|
|
</select>
|
