|
|
|
|
@ -536,11 +536,20 @@
|
|
|
|
|
UNION
|
|
|
|
|
select
|
|
|
|
|
tc.*
|
|
|
|
|
from ocr_taskchild_picture tc, ocr_picture p
|
|
|
|
|
where tc.STATES = 5 and p.suspiciousfile =0
|
|
|
|
|
from ocr_taskchild_picture tc
|
|
|
|
|
where tc.STATES = 5
|
|
|
|
|
) as tcp
|
|
|
|
|
left join ocr_picture pic
|
|
|
|
|
on tcp.PICTUREID = pic.ID
|
|
|
|
|
<include refid="Base_Where_union">
|
|
|
|
|
</include>
|
|
|
|
|
and pic.suspiciousfile = 0
|
|
|
|
|
<if test="fromuptimeStart != null">
|
|
|
|
|
and tcp.fromuptime >= ${fromuptimeStart}
|
|
|
|
|
</if>
|
|
|
|
|
<if test="fromuptimeEnd != null">
|
|
|
|
|
and tcp.fromuptime <= ${fromuptimeEnd}
|
|
|
|
|
</if>
|
|
|
|
|
</select>
|
|
|
|
|
|
|
|
|
|
<select id="listmytask" resultType="cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPictureAppro"
|
|
|
|
|
|