|
|
@@ -2512,10 +2512,12 @@
|
|
|
</update>
|
|
|
|
|
|
<select id="selectStatisticsOrderProject" 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,a.liquidation_status as liquidationStatus,
|
|
|
- b2.big_customer as bigCustomer, b.dun_node_content as dunNodeContent,b.project_type as projectType, a.total_amount as totalAmount,a.approval ,a.sign_time as signTime,
|
|
|
- a.create_time as createTime,b.buyer_name as buyerName,a.contract_no as contractNo, d.bname htlx,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,
|
|
|
+ SELECT a.order_no as orderNo, a.order_type orderType,a.sales_type as salesType,b.service_type AS serviceType,
|
|
|
+ a.liquidation_status as liquidationStatus,b2.big_customer as bigCustomer, b.dun_node_content as dunNodeContent,
|
|
|
+ b.project_type as projectType, a.total_amount as totalAmount,a.approval ,a.sign_time as signTime,
|
|
|
+ a.create_time as createTime,b.buyer_name as buyerName,a.contract_no as contractNo, d2.cname htlx,
|
|
|
+ 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.finance_name as financeName,b.salesman_name as salesmanName, e.commodity_name as commodityName,ttm.service_year as serviceYear,
|
|
|
ttm.service_life as serviceLife,ttm.year_sum as yearSum,e.task_distribution_time as taskDistributionTime ,e.commodity_quantity as commodityQuantity,
|
|
|
e3.cost_amount as costAmount,e.project_status as projectStatus,e.task_start_time as taskStartTime,e.task_end_time as taskEndTime,
|
|
|
@@ -2548,7 +2550,7 @@
|
|
|
and d2.id = #{businessCategory}
|
|
|
</if>
|
|
|
<if test="projectName !=null">
|
|
|
- and d.commodity_name like CONCAT('%',#{projectName},'%')
|
|
|
+ and e.commodity_name like CONCAT('%',#{projectName},'%')
|
|
|
</if>
|
|
|
<if test="orderAmountType==1">
|
|
|
and a.total_amount < 10
|