|
|
@@ -987,11 +987,11 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
and a.salesman_id = #{aid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="specially == 10">
|
|
|
- and a.process_status = 1 and a.order_status = 1
|
|
|
+ and a.process_status = 1 and a.order_status in (0,1,2)
|
|
|
and mg.manager_id= #{aid}
|
|
|
</if>
|
|
|
<if test="specially == 1">
|
|
|
- and a.process_status = 2 and a.order_status = 1
|
|
|
+ and a.process_status = 2 and a.order_status in (0,1,2)
|
|
|
</if>
|
|
|
<if test="specially == 2">
|
|
|
and a.order_status in(3,5)
|
|
|
@@ -1153,11 +1153,11 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
and a.salesman_id = #{aid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="specially == 10">
|
|
|
- and a.process_status = 1 and a.order_status = 1
|
|
|
+ and a.process_status = 1 and a.order_status in (0,1,2)
|
|
|
and mg.manager_id= #{aid}
|
|
|
</if>
|
|
|
<if test="specially == 1">
|
|
|
- and a.process_status = 2 and a.order_status = 1
|
|
|
+ and a.process_status = 2 and a.order_status in (0,1,2)
|
|
|
</if>
|
|
|
<if test="specially == 2">
|
|
|
and a.order_status in(3,5)
|
|
|
@@ -1981,9 +1981,10 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
from t_order_new where delete_sign in (0,2)
|
|
|
</select>
|
|
|
<select id="getProcessName" resultType="com.goafanti.order.bo.OrderProcessName">
|
|
|
- select a.order_no orderNo,a.approval ,b.name yxy ,yxgly.name yxgly,d.name cwzy,zc.name zc,
|
|
|
- zxsgly.name zxsgly,dsz.name dsz
|
|
|
+ select a.order_no orderNo,a.approval,a.process_status processStatus ,b.name yxy,mg.name yxjl,
|
|
|
+ yxgly.name yxgly,d.name cwzy,zc.name zc, zxsgly.name zxsgly,dsz.name dsz
|
|
|
from t_order_new a left join admin b on a.salesman_id =b.id
|
|
|
+ left join admin mg on b.manager_id =mg.id
|
|
|
left join department c on a.order_dep =c.id
|
|
|
left join (select a.department_id depId,group_concat(a.name) name
|
|
|
from admin a left join user_role b on a.id=b.uid left join `role` c on b.rid =c.id
|