|
|
@@ -1195,7 +1195,7 @@ where delete_sign != 1 and outsource= #{o.outsource,jdbcType=INTEGER}
|
|
|
select
|
|
|
a.order_no as orderNo,a.create_time as createTime, date_format(a.sign_time,'%Y-%m-%d' ) as signDate,a.contract_no as contractNo,
|
|
|
b.nickname as userName ,a.process_status as processStatus,a.total_amount as totalAmount,a.order_status as orderStatus,
|
|
|
- a.liquidation_status as liquidationStatus,a.approval,c.name as salesmanName,dep.name as depName,f.name as financeName
|
|
|
+ a.liquidation_status as liquidationStatus,a.approval,c.name as salesmanName,dep.name as depName,g.name as financeName
|
|
|
<if test="specially == 2">
|
|
|
,f.name as initiateName ,e.reason ,date_format(e.create_time,'%Y-%m-%d' ) as backDate,e.id as backId
|
|
|
</if>
|
|
|
@@ -1205,7 +1205,7 @@ where delete_sign != 1 and outsource= #{o.outsource,jdbcType=INTEGER}
|
|
|
from t_order_new a left join `user` b on a.buyer_id=b.id
|
|
|
left join admin c on a.salesman_id=c.id
|
|
|
left join department dep on a.order_dep=dep.id
|
|
|
- left join admin f on dep.finance_id=f.id
|
|
|
+ left join admin g on dep.finance_id=g.id
|
|
|
left join admin d on a.finance_id=d.id
|
|
|
<if test="specially == 2">
|
|
|
left join (select * from t_order_back a where back_status=0) e on a.order_no=e.order_no
|