|
|
@@ -2074,14 +2074,13 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
</select>
|
|
|
<select id="getProcessName" resultType="com.goafanti.order.bo.OrderProcessName">
|
|
|
select a.order_no orderNo,a.approval,a.process_status processStatus ,b.name yxy,mg.name yxjl,
|
|
|
- yxgly.name yxgly,d.name cwzy,zc.name zc, zxsgly.name zxsgly,dsz.name dsz,rf.name retrialFinanceName
|
|
|
+ yxgly.name yxgly,d.name cwzy,zc.name zc, zxsgly.name zxsgly,dsz.name dsz
|
|
|
from t_order_new a left join admin b on a.salesman_id =b.id
|
|
|
left join admin mg on b.manager_id =mg.id left join department c on a.order_dep =c.id
|
|
|
- left join admin rf on c.retrial_finance_id=rf.id
|
|
|
left join (select a.department_id depId,group_concat(a.name) name
|
|
|
from admin a left join user_role b on a.id=b.uid left join `role` c on b.rid =c.id
|
|
|
where c.role_type ='9996' and a.status ='0' group by a.department_id )yxgly on c.id =yxgly.depId
|
|
|
- left join (select order_no ,group_concat(aname)name from t_order_examine group by order_no ) d on a.order_no=d.order_no
|
|
|
+ left join (select order_no ,group_concat(aname)name from t_order_examine WHERE type=0 group by order_no ) d on a.order_no=d.order_no
|
|
|
left join (select group_concat(a.name) name
|
|
|
from admin a left join user_role b on a.id=b.uid left join `role` c on b.rid =c.id
|
|
|
where c.role_type in ('99998','99988') and a.status ='0' ) zc on 1=1
|
|
|
@@ -2157,7 +2156,7 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
</select>
|
|
|
<select id="selectOrderFinance" resultType="com.goafanti.organization.bo.OrganizationListOut">
|
|
|
select b.id,b.finance_id financeId,c.name financeName,b.retrial_finance_id retrialFinanceId,
|
|
|
- d.retrialFinanceName
|
|
|
+ d.name retrialFinanceName
|
|
|
from t_order_new a left join department b on a.order_dep = b.id
|
|
|
left join admin c on b.finance_id=c.id
|
|
|
left join admin d on b.retrial_finance_id=d.id
|