|
@@ -944,7 +944,7 @@
|
|
|
iac.id as "orderno",
|
|
iac.id as "orderno",
|
|
|
io.orderno as "bigOrderno",
|
|
io.orderno as "bigOrderno",
|
|
|
iac.agreement_id as "agreementId",
|
|
iac.agreement_id as "agreementId",
|
|
|
- iot.order_status as "orderstatus",
|
|
|
|
|
|
|
+ iac.orderstatus as "orderstatus",
|
|
|
iac.company_id as "companyId",
|
|
iac.company_id as "companyId",
|
|
|
agree.partner_companies_id as "partnerCompaniesId",
|
|
agree.partner_companies_id as "partnerCompaniesId",
|
|
|
ins.namesimple as "partnerCompaniesName",
|
|
ins.namesimple as "partnerCompaniesName",
|
|
@@ -964,11 +964,7 @@
|
|
|
su1.name as "userName",
|
|
su1.name as "userName",
|
|
|
su1.leader_name as "leaderName"
|
|
su1.leader_name as "leaderName"
|
|
|
from
|
|
from
|
|
|
- (
|
|
|
|
|
- select iot.suborder,iot.order_status from `ins_orders_track` iot
|
|
|
|
|
- GROUP BY iot.suborder ,iot.order_status
|
|
|
|
|
- ) iot
|
|
|
|
|
- left join ins_area_company iac ON iac.id = iot.suborder
|
|
|
|
|
|
|
+ ins_area_company iac
|
|
|
LEFT JOIN ptl_agreement agree ON iac.agreement_id = agree.id
|
|
LEFT JOIN ptl_agreement agree ON iac.agreement_id = agree.id
|
|
|
LEFT JOIN ins_orders io ON iac.orderno = io.orderno
|
|
LEFT JOIN ins_orders io ON iac.orderno = io.orderno
|
|
|
LEFT JOIN sys_user su1 on su1.id=io.userid
|
|
LEFT JOIN sys_user su1 on su1.id=io.userid
|
