|
|
@@ -718,12 +718,12 @@
|
|
|
</if>
|
|
|
</select>
|
|
|
<select id="selectStatisticsOrderProjectList" resultType="com.goafanti.order.bo.OutOrderProject">
|
|
|
- SELECT a.order_no as orderNo, a.order_type orderType,a.sales_type as salesType, b.service_type AS serviceType,
|
|
|
+ SELECT a.order_no as orderNo, bc.sort sortType,a.sales_type as salesType, b.service_type AS serviceType,
|
|
|
a.liquidation_status as liquidationStatus,b2.big_customer as bigCustomer,b.project_type as projectType,b.dun_node_content DunNodeContent,
|
|
|
a.total_amount as totalAmount,a.approval ,a.sign_time as signTime,date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') as createTime,
|
|
|
b.buyer_name as buyerName,a.contract_no as contractNo, c.cname htlx,b.province_name province ,b.dep_name depName,
|
|
|
b.order_receivables orderReceivables,a.refund_amount refundAmount,a.settlement_amount as settlementAmount,
|
|
|
- b.invoice_amount as invicueAmount, b.cost_amount as costAmount,b.payment_amount as paymentAmount,
|
|
|
+ b.invoice_amount as invicueAmount, b.cost_amount as costAmount,b.payment_amount as paymentAmount,bp.lvl_type lvlType,
|
|
|
b.finance_name as financeName,b.salesman_name as salesmanName,b.expense_amount as expenseAmount,
|
|
|
e.commodity_name as commodityName,ttm.service_year as serviceYear,ttm.service_life as serviceLife,ttm.year_sum as yearSum,
|
|
|
date_format(e.task_distribution_time ,'%Y-%m-%d %H:%i:%S') as taskDistributionTime ,e.commodity_quantity as commodityQuantity,
|
|
|
@@ -737,6 +737,7 @@
|
|
|
left join user_mid b2 on a.buyer_id=b2.uid
|
|
|
left join t_order_task e on a.order_no =e.order_no and e.split_status in (0,2)
|
|
|
left join business_project bp on e.commodity_id =bp.id
|
|
|
+ left join business_category bc on bp.cid=bc.id
|
|
|
<if test="liabilitiesDepId !=null">
|
|
|
left join admin e2 on e.task_receiver=e2.id
|
|
|
</if>
|