|
@@ -148,6 +148,12 @@
|
|
|
<if test="tenantId != null and tenantId != ''">
|
|
|
AND vto.tenant_id = #{tenantId}
|
|
|
</if>
|
|
|
+ <if test="studentCheckStatus != null">
|
|
|
+ AND (vto.order_from != 1
|
|
|
+ AND (SELECT COUNT(too.order_sn)
|
|
|
+ FROM top_old_order_goods too
|
|
|
+ WHERE vto.order_sn = too.order_sn AND too.rel_sign_id IS NOT NULL AND too.check_status = #{studentCheckStatus}) > 0)
|
|
|
+ </if>
|
|
|
<if test="orderSnList != null and orderSnList.size()!=0 ">
|
|
|
AND vto.order_sn in
|
|
|
<foreach collection="orderSnList" item="item" index="index" open="(" close=")" separator=",">
|
|
@@ -239,6 +245,11 @@
|
|
|
<if test="finishStatus != null">
|
|
|
AND ot.finish_status = #{finishStatus}
|
|
|
</if>
|
|
|
+ <if test="studentCheckStatus != null">
|
|
|
+ AND (SELECT COUNT(too.order_sn)
|
|
|
+ FROM top_old_order_goods too
|
|
|
+ WHERE ot.order_sn = too.order_sn AND too.rel_sign_id IS NOT NULL AND too.check_status = #{studentCheckStatus}) > 0
|
|
|
+ </if>
|
|
|
<if test="tenantId != null and tenantId != ''">
|
|
|
AND ot.tenant_id = #{tenantId}
|
|
|
</if>
|
|
@@ -320,6 +331,9 @@
|
|
|
<if test="repairSign != null and repairSign != '' and repairSign == 1">
|
|
|
AND o.order_id = 0
|
|
|
</if>
|
|
|
+ <if test="studentCheckStatus != null">
|
|
|
+ AND o.order_id = 0
|
|
|
+ </if>
|
|
|
<if test="invoiceStatus != null and invoiceStatus != ''">
|
|
|
AND o.invoice_status = #{invoiceStatus}
|
|
|
</if>
|