|
|
@@ -2182,11 +2182,11 @@
|
|
|
from t_order_task a left join t_order_new b on a.order_no =b.order_no
|
|
|
left join t_order_mid c on a.order_no =c.order_no
|
|
|
left join t_task_member e on a.id=e.tid
|
|
|
+ left join (select order_no ,GROUP_CONCAT(`type`)`type` ,GROUP_CONCAT(type_explain)type_explain
|
|
|
+ from t_order_approval group by order_no) toa on b.order_no=toa.order_no
|
|
|
<if test="shiroType ==2 or shiroType ==3">
|
|
|
left join department d on b.order_dep =d.id
|
|
|
</if>
|
|
|
- left join (select order_no ,GROUP_CONCAT(`type`)`type` ,GROUP_CONCAT(type_explain)type_explain
|
|
|
- from t_order_approval group by order_no) toa on b.order_no=toa.order_no
|
|
|
<if test="type !=null">
|
|
|
inner join (select order_no ,GROUP_CONCAT(`type`)`type` ,GROUP_CONCAT(type_explain)type_explain
|
|
|
from t_order_approval
|