|
|
@@ -2112,6 +2112,15 @@
|
|
|
<if test="shiroType ==2 or shiroType ==3">
|
|
|
left join department d on b.order_dep =d.id
|
|
|
</if>
|
|
|
+ inner join (select order_no ,GROUP_CONCAT(`type`)`type` ,GROUP_CONCAT(type_explain)type_explain
|
|
|
+ from t_order_approval
|
|
|
+ <if test="type !=null">
|
|
|
+ where `type` in
|
|
|
+ <foreach collection="type" item="item" separator="," open="(" close=")">
|
|
|
+ #{item}
|
|
|
+ </foreach>
|
|
|
+ </if>
|
|
|
+ group by order_no) toa on b.order_no=toa.order_no
|
|
|
where b.delete_sign in (0,2)
|
|
|
and a.process_status in (1,2,3,4)
|
|
|
<if test="shiroType ==1">
|
|
|
@@ -2185,6 +2194,15 @@
|
|
|
<if test="shiroType ==2 or shiroType ==3">
|
|
|
left join department d on b.order_dep =d.id
|
|
|
</if>
|
|
|
+ inner join (select order_no ,GROUP_CONCAT(`type`)`type` ,GROUP_CONCAT(type_explain)type_explain
|
|
|
+ from t_order_approval
|
|
|
+ <if test="type !=null">
|
|
|
+ where `type` in
|
|
|
+ <foreach collection="type" item="item" separator="," open="(" close=")">
|
|
|
+ #{item}
|
|
|
+ </foreach>
|
|
|
+ </if>
|
|
|
+ group by order_no) toa on b.order_no=toa.order_no
|
|
|
where b.delete_sign in (0,2)
|
|
|
and a.process_status in (1,2,3,4)
|
|
|
<if test="shiroType ==1">
|