|
|
@@ -789,7 +789,7 @@
|
|
|
c.sort cSort,a.commodity_name as commodityName,a.commodity_quantity as commodityQuantity,b.patent_transfer patentTransfer ,
|
|
|
i.price,a.certificate_number as certificateNumber, a.commodity_id as commodityId,a.manager_id managerId,
|
|
|
a.consultant_id consultantId,a.project_status as projectStatus,a.set_up_amount setUpAmount,j.contract_term contractTerm,
|
|
|
- a.task_comment as taskComment ,a.commodity_price as commodityPrice, a.task_status as taskStatus,ts.type stopType,ts.status stopStatus,
|
|
|
+ a.task_comment as taskComment ,a.commodity_price as commodityPrice, a.task_status as taskStatus,ttm.stop_type stopType,ttm.stop_status stopStatus,
|
|
|
a.task_receiver as taskReceiver ,a.if_certification_fee ifCertificationFee , a.split_status splitStatus,
|
|
|
a.cost_reduction costReduction,a.official_cost officialCost,i.`type` ,d.name ,a.declaration_batch declarationBatch,
|
|
|
a.patent_type patentType,a.picture_url pictureUrl,j.service_life serviceLife ,j.service_year serviceYear,j.year_sum yearSum,
|
|
|
@@ -798,7 +798,7 @@
|
|
|
left join admin f on e.salesman_id=f.id left join department g on e.order_dep=g.id left join user h on e.buyer_id=h.id
|
|
|
left join business_project i on a.commodity_id=i.id left join business_category c on b.cid=c.id
|
|
|
left join admin d on a.task_receiver=d.id left join t_task_member j on a.id =j.tid
|
|
|
- left join t_task_mid ttm on a.id=ttm.tid left join task_stop ts on a.id = ts.tid
|
|
|
+ left join t_task_mid ttm on a.id=ttm.tid
|
|
|
where a.super_id is null and a.split_status in(0,1)
|
|
|
<if test="orderNo != null">
|
|
|
and a.order_no= #{orderNo,jdbcType=VARCHAR}
|