|
|
@@ -1689,7 +1689,8 @@ progress_tid = values(progress_tid)
|
|
|
a.task_comment as taskComment ,a.commodity_price as commodityPrice, a.task_status as taskStatus, a.task_receiver as taskReceiver ,
|
|
|
a.split_status splitStatus,a.split_super splitSuper,a.split_aid splitAid,a.split_time splitTime,a.patent_type patentType,ttm.contract_term contractTerm,
|
|
|
a.picture_url pictureUrl, ttm.service_life serviceLife ,ttm.service_year serviceYear,ttm.year_sum yearSum,
|
|
|
- tm.last_year lastYear,tm.last_year_capital lastYearCapital,tm.last_year_income lastYearIncome
|
|
|
+ tm.last_year lastYear,tm.last_year_capital lastYearCapital,tm.last_year_income lastYearIncome,
|
|
|
+ a.ht_member htMember,a.additional_deduction additionalDeduction,a.rd_awardsubsidy rdAwardsubsidy
|
|
|
from t_order_task a 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 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 i.cid=c.id left join admin d on a.task_receiver=d.id
|