|
|
@@ -853,6 +853,7 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
where a.delete_sign !=1
|
|
|
<if test="specially ==7">
|
|
|
and a.process_status > 4
|
|
|
+ and a.salesman_id = #{aid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="outsource != null">
|
|
|
and a.outsource= #{outsource,jdbcType=INTEGER}
|
|
|
@@ -963,6 +964,7 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
where a.delete_sign !=1
|
|
|
<if test="specially ==7">
|
|
|
and a.process_status > 4
|
|
|
+ and a.salesman_id = #{aid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="outsource != null">
|
|
|
and a.outsource= #{outsource,jdbcType=INTEGER}
|
|
|
@@ -1468,7 +1470,7 @@ select a.id, b.contract_no contractNo,a.order_no as orderNo,c.nickname as userNa
|
|
|
a.total_amount total
|
|
|
from t_order_new a left join admin b on a.salesman_id =b.id
|
|
|
left join department c on b.department_id =c.id left join district_glossory d on c.province =d.id
|
|
|
- where a.process_status >4
|
|
|
+ where a.process_status >4 and a.delete_sign !=1
|
|
|
<if test="depId !=null">
|
|
|
and b.department_id = #{depId}
|
|
|
</if>
|