|
|
@@ -792,7 +792,7 @@
|
|
|
a.task_comment as taskComment ,a.commodity_price as commodityPrice, a.task_status as taskStatus,
|
|
|
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.patent_type patentType,a.picture_url pictureUrl
|
|
|
from t_order_task a left join business_project b on a.commodity_id=b.id
|
|
|
left join t_order_new e on a.order_no=e.order_no
|
|
|
left join admin f on e.salesman_id=f.id left join department g on
|
|
|
@@ -1765,7 +1765,7 @@
|
|
|
c.salesman_name salesmanName,c.finance_name financeName,a.commodity_name projectName,a.member_type memberType,
|
|
|
b.delete_sign deleteSign ,b.total_amount totalAmount ,b.sales_type salesType ,b.other,
|
|
|
a.process_status status,a.commodity_id commodityId,a.commodity_name commodityName,
|
|
|
- a.commodity_quantity commodityQuantity,a.task_comment taskComment
|
|
|
+ a.commodity_quantity commodityQuantity,a.task_comment taskComment,a.picture_url pictureUrl
|
|
|
from t_order_task a left join t_order_new b on a.order_no =b.order_no
|
|
|
left join t_order_mid c on a.order_no =c.order_no
|
|
|
<if test="shiroType ==2">
|