|
|
@@ -1436,7 +1436,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 in(0,2)
|
|
|
<if test="depId !=null">
|
|
|
and b.department_id = #{depId}
|
|
|
</if>
|
|
|
@@ -1470,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 and a.delete_sign !=1
|
|
|
+ where a.process_status >4 and a.delete_sign in(0,2)
|
|
|
<if test="depId !=null">
|
|
|
and b.department_id = #{depId}
|
|
|
</if>
|