|
|
@@ -1751,20 +1751,14 @@
|
|
|
left join department d on b.order_dep =d.id
|
|
|
</if>
|
|
|
where b.delete_sign in (0,2) and b.approval in (0,1,2)
|
|
|
- <if test="shiroType ==0">
|
|
|
- and a.process_status in (1,2,3,4)
|
|
|
- </if>
|
|
|
+ and a.process_status in (1,2,3,4)
|
|
|
<if test="shiroType ==1">
|
|
|
- and a.process_status in (1,2,3,4)
|
|
|
- and b.salesman_id = #{aid}
|
|
|
+ and b.salesman_id = #{aid}
|
|
|
</if>
|
|
|
<if test="shiroType ==2">
|
|
|
- and a.process_status in (1,2,3)
|
|
|
and d.finance_id = #{aid}
|
|
|
</if>
|
|
|
- <if test="shiroType ==3">
|
|
|
- and a.process_status in (1,2,3)
|
|
|
- </if>
|
|
|
+
|
|
|
<if test="orderNo != null">
|
|
|
and a.order_no = #{orderNo}
|
|
|
</if>
|
|
|
@@ -1822,20 +1816,13 @@
|
|
|
left join department d on b.order_dep =d.id
|
|
|
</if>
|
|
|
where b.delete_sign in (0,2) and b.approval in (0,1,2)
|
|
|
- <if test="shiroType ==0">
|
|
|
- and a.process_status in (1,2,3,4)
|
|
|
- </if>
|
|
|
+ and a.process_status in (1,2,3,4)
|
|
|
<if test="shiroType ==1">
|
|
|
- and a.process_status in (1,2,3,4)
|
|
|
and b.salesman_id = #{aid}
|
|
|
</if>
|
|
|
<if test="shiroType ==2">
|
|
|
- and a.process_status in (1,2,3)
|
|
|
and d.finance_id = #{aid}
|
|
|
</if>
|
|
|
- <if test="shiroType ==3">
|
|
|
- and a.process_status in (1,2,3)
|
|
|
- </if>
|
|
|
<if test="orderNo != null">
|
|
|
and a.order_no = #{orderNo}
|
|
|
</if>
|