|
|
@@ -1648,7 +1648,7 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
case a.sales_type when 6 then 1 else 0 end gxfg,
|
|
|
case a.sales_type when 7 then 1 else 0 end qtfg
|
|
|
from t_order_new a left join department b on a.order_dep =b.id
|
|
|
- where a.delete_sign in (0,2) and a.process_status > 0
|
|
|
+ where a.delete_sign in (0,2) and a.process_status > 0 and a.approval in (0,1,2)
|
|
|
<if test=" startDate !=null and endDate != null">
|
|
|
and a.create_time between #{startDate} and #{endDate}
|
|
|
</if>
|