|
|
@@ -729,7 +729,8 @@ select
|
|
|
left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id left join admin d on b.salesman_id=d.id
|
|
|
left join department e on b.order_dep=e.id
|
|
|
<if test="processState==2 or processState==3 ">
|
|
|
- left join (select order_no,consultant_id,manager_id from t_order_task group by order_no,consultant_id,manager_id) x on a.order_no=x.order_no
|
|
|
+ left join (select order_no, consultant_id, manager_id from t_order_task a where consultant_id is not null and manager_id is not null
|
|
|
+ group by order_no, consultant_id, manager_id) x on a.order_no = x.order_no
|
|
|
</if>
|
|
|
where 1=1
|
|
|
<if test="processState==0">
|
|
|
@@ -827,17 +828,8 @@ select
|
|
|
left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id
|
|
|
left join admin d on b.salesman_id=d.id left join department e on b.order_dep=e.id
|
|
|
<if test="processState==2 or processState==3 ">
|
|
|
- left join (
|
|
|
- select
|
|
|
- order_no,
|
|
|
- consultant_id,
|
|
|
- manager_id
|
|
|
- from
|
|
|
- t_order_task
|
|
|
- group by
|
|
|
- order_no,
|
|
|
- consultant_id,
|
|
|
- manager_id) x on a.order_no=x.order_no
|
|
|
+ left join (select order_no, consultant_id, manager_id from t_order_task a where consultant_id is not null and manager_id is not null
|
|
|
+ group by order_no, consultant_id, manager_id) x on a.order_no = x.order_no
|
|
|
</if>
|
|
|
where 1=1
|
|
|
<if test="processState==0">
|