|
|
@@ -1762,9 +1762,11 @@
|
|
|
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.picture_url pictureUrl
|
|
|
+ a.commodity_quantity commodityQuantity,a.task_comment taskComment,a.picture_url pictureUrl,
|
|
|
+ d.service_life serviceLife ,d.service_year serviceYear,d.year_sum yearSum
|
|
|
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
|
|
|
+ left join t_task_member d on a.id=d.tid
|
|
|
<if test="shiroType ==2">
|
|
|
left join department d on b.order_dep =d.id
|
|
|
</if>
|