|
|
@@ -494,7 +494,7 @@
|
|
|
select
|
|
|
b.bill_no as billNo, b.order_no as orderNo, b.transaction_amount as transactionAmount,date_format(b.create_time,'%Y-%m-%d %H:%I:%S') as createTimes,
|
|
|
b.payer_id as payerId, b.payee_id as payeeId, u.nickname as payerName, a.nickname as payeeName, b.remarks,o.contract_no contractNo,
|
|
|
- b.transaction_subject as transactionSubject, b.transaction_channel as transactionChannel,
|
|
|
+ b.transaction_subject as transactionSubject, b.transaction_channel as transactionChannel, b.delete_sign deleteSign,
|
|
|
date_format(b.financial_pay_time,'%Y-%m-%d') as financialPayTimes,b.financial_pay_no as financialPayNo,
|
|
|
b.creater, ad.name as createrName, o.salesman_id as saleId, oa.name as saleName,b.type
|
|
|
from t_order_bill_new b
|
|
|
@@ -503,7 +503,7 @@
|
|
|
left join admin ad on b.creater = ad.id
|
|
|
left join t_order_new o on o.order_no = b.order_no
|
|
|
left join admin oa on oa.id = o.salesman_id
|
|
|
- where b.delete_sign != 1
|
|
|
+ where 1=1
|
|
|
<if test="b.orderNo != null and b.orderNo != """>
|
|
|
and b.order_no = #{b.orderNo,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
@@ -541,7 +541,7 @@
|
|
|
left join `user` a on b.payee_id = a.id
|
|
|
left join t_order_new o on o.order_no = b.order_no
|
|
|
left join admin oa on oa.id = o.salesman_id
|
|
|
- where b.delete_sign != 1
|
|
|
+ where 1=1
|
|
|
<if test="b.orderNo != null and b.orderNo != """>
|
|
|
and b.order_no = #{b.orderNo,jdbcType=VARCHAR}
|
|
|
</if>
|