|
@@ -884,7 +884,7 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
,f.name as initiateName ,e.reason ,date_format(e.create_time,'%Y-%m-%d' ) as backDate,e.id as backId
|
|
,f.name as initiateName ,e.reason ,date_format(e.create_time,'%Y-%m-%d' ) as backDate,e.id as backId
|
|
|
</if>
|
|
</if>
|
|
|
<if test="specially == 4">
|
|
<if test="specially == 4">
|
|
|
- ,f.name as consultantName,a.settlement_amount as settlementAmount,if(isnull(g.order_no)=0,1,0) ischange
|
|
|
|
|
|
|
+ ,e.receiver_name as consultantName,a.settlement_amount as settlementAmount,if(isnull(g.order_no)=0,1,0) ischange
|
|
|
</if>
|
|
</if>
|
|
|
from t_order_new a left join `user` b on a.buyer_id=b.id left join t_order_mid c on a.order_no=c.order_no
|
|
from t_order_new a left join `user` b on a.buyer_id=b.id left join t_order_mid c on a.order_no=c.order_no
|
|
|
left join department dep on a.order_dep=dep.id
|
|
left join department dep on a.order_dep=dep.id
|
|
@@ -893,9 +893,7 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
left join admin f on e.initiate=f.id
|
|
left join admin f on e.initiate=f.id
|
|
|
</if>
|
|
</if>
|
|
|
<if test="specially == 4">
|
|
<if test="specially == 4">
|
|
|
- left join (select min(id)id,order_no from t_order_task where main=1 group by order_no) ex on ex.order_no=a.order_no
|
|
|
|
|
- left join t_order_task e on e.id = ex.id
|
|
|
|
|
- left join admin f on e.task_receiver=f.id
|
|
|
|
|
|
|
+ left join t_order_task e on a.order_no=e.order_no
|
|
|
left join (select order_no from new_order_change group by order_no)g on a.order_no=g.order_no
|
|
left join (select order_no from new_order_change group by order_no)g on a.order_no=g.order_no
|
|
|
</if>
|
|
</if>
|
|
|
<if test="specially == 9">
|
|
<if test="specially == 9">
|
|
@@ -962,7 +960,7 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
</if>
|
|
</if>
|
|
|
<if test="specially == 4">
|
|
<if test="specially == 4">
|
|
|
and a.process_status in (4,5,6,99)
|
|
and a.process_status in (4,5,6,99)
|
|
|
- and a.order_status not in(5,7)
|
|
|
|
|
|
|
+ and a.order_status in(1,2,3,4,6)
|
|
|
</if>
|
|
</if>
|
|
|
<if test="specially == 5">
|
|
<if test="specially == 5">
|
|
|
and a.order_dep in
|
|
and a.order_dep in
|
|
@@ -1113,7 +1111,7 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
</if>
|
|
</if>
|
|
|
<if test="specially == 4">
|
|
<if test="specially == 4">
|
|
|
and a.process_status in (4,5,6,99)
|
|
and a.process_status in (4,5,6,99)
|
|
|
- and a.order_status not in(5,7)
|
|
|
|
|
|
|
+ and a.order_status in(1,2,3,4,6)
|
|
|
</if>
|
|
</if>
|
|
|
<if test="specially == 5">
|
|
<if test="specially == 5">
|
|
|
and a.order_dep in
|
|
and a.order_dep in
|