|
|
@@ -1116,7 +1116,7 @@
|
|
|
left join admin f on e.initiate=f.id
|
|
|
</if>
|
|
|
<if test="specially == 4">
|
|
|
- left join (select * from t_order_task where main=1) e on e.order_no=a.order_no
|
|
|
+ left join t_order_task e on e.order_no=a.order_no
|
|
|
left join admin f on e.task_receiver=f.id
|
|
|
</if>
|
|
|
where a.delete_sign = 0
|
|
|
@@ -1140,6 +1140,7 @@
|
|
|
and a.approval = 1 and a.order_status=2
|
|
|
</if>
|
|
|
<if test="specially == 4">
|
|
|
+ and e.main=1
|
|
|
and a.process_status in (4,5,6,99)
|
|
|
and a.order_status not in(5,7)
|
|
|
</if>
|
|
|
@@ -1197,7 +1198,7 @@
|
|
|
left join admin f on e.initiate=f.id
|
|
|
</if>
|
|
|
<if test="specially == 4">
|
|
|
- left join (select * from t_order_task where main=1) e on e.order_no=a.order_no
|
|
|
+ left join t_order_task e on e.order_no=a.order_no
|
|
|
left join admin f on e.task_receiver=f.id
|
|
|
</if>
|
|
|
where a.delete_sign = 0
|
|
|
@@ -1220,7 +1221,8 @@
|
|
|
and a.approval = 1 and a.order_status=2
|
|
|
</if>
|
|
|
<if test="specially == 4">
|
|
|
- and a.process_status in (4,5,6)
|
|
|
+ and e.main=1
|
|
|
+ and a.process_status in (4,5,6,99)
|
|
|
and a.order_status not in(5,7)
|
|
|
</if>
|
|
|
<if test="specially == 5">
|