|
|
@@ -935,7 +935,7 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
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.salesman_name as salesmanName,c.project_type projectType,
|
|
|
dep.name as depName,c.finance_name as financeName,c.invoice_amount invoiceAmount,a.settlement_amount settlementAmount,
|
|
|
- a.sales_type salesType, a.channel_id channelId ,a.other
|
|
|
+ a.sales_type salesType, a.channel_id channelId ,a.other,a.examine_name examineName
|
|
|
<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>
|
|
|
@@ -1414,7 +1414,7 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
e.reason,date_format(e.create_time,'%Y-%m-%d') as backDate,a.buyer_id as uid,a.order_dep as orderDep, g.location_province as locationProvince,
|
|
|
g.location_city as locationCity,g.location_area locationArea,g.postal_address postalAddress,outsource,a.primary_order primaryOrder,a.agreement_url agreementUrl,
|
|
|
h.name NowFinance,h.contact_mobile NowFinanceMobile,a.additional_order additionalOrder,i.name as oldSalesmanName, i.contact_mobile oldSalesmanMobile,
|
|
|
- a.service_content serviceContent
|
|
|
+ a.service_content serviceContent,a.examine_name examineName
|
|
|
from t_order_new a left join `user` b on a.buyer_id=b.id left join admin i on a.old_salesman_id=i.id
|
|
|
left join admin c on a.salesman_id=c.id left join department dep on a.order_dep=dep.id
|
|
|
left join admin d on a.finance_id=d.id left join admin h on dep.finance_id=h.id
|