|
|
@@ -64,7 +64,8 @@
|
|
|
a.bank_card_num as "bankCardNum",
|
|
|
a.bank_name as "bankName",
|
|
|
a.bank_num as "bankNum",
|
|
|
- a.account_id as "accountId"
|
|
|
+ a.account_id as "accountId",
|
|
|
+ a.approval as "approval"
|
|
|
from sys_amount_auditing a
|
|
|
left join sys_user_account_history b on a.id = b.auditiing_id
|
|
|
left join sys_user su on su.id =a.user_id
|
|
|
@@ -134,6 +135,7 @@
|
|
|
a.bank_name as "bankName",
|
|
|
a.bank_num as "bankNum",
|
|
|
a.account_id as "accountId",
|
|
|
+ a.approval as "approval",
|
|
|
sd.management_source AS source
|
|
|
from sys_amount_auditing a
|
|
|
left join sys_user_account_history b on a.id = b.auditiing_id
|
|
|
@@ -146,9 +148,10 @@
|
|
|
<if test="auditingStatus !=null and auditingStatus != ''">
|
|
|
a.auditing_status=#{auditingStatus}
|
|
|
</if>
|
|
|
- <if test="auditingStatus !=null and auditingStatus != '' and auditingStatus == 2">
|
|
|
+ <!-- <if test="auditingStatus !=null and auditingStatus != '' and auditingStatus == 2">
|
|
|
and a.approval != 1
|
|
|
</if>
|
|
|
+ -->
|
|
|
<if test="amountStatus !=null and amountStatus != ''">
|
|
|
and a.amount_status=#{amountStatus}
|
|
|
</if>
|
|
|
@@ -280,9 +283,10 @@
|
|
|
<if test="vo.auditingStatus !=null and vo.auditingStatus != ''">
|
|
|
a.auditing_status=#{vo.auditingStatus}
|
|
|
</if>
|
|
|
- <if test="vo.auditingStatus !=null and vo.auditingStatus != '' and vo.auditingStatus == 2">
|
|
|
+ <!--<if test="vo.auditingStatus !=null and vo.auditingStatus != '' and vo.auditingStatus == 2">
|
|
|
and a.approval != 1
|
|
|
</if>
|
|
|
+ -->
|
|
|
<if test="vo.amountStatus !=null and vo.amountStatus != ''">
|
|
|
and a.amount_status=#{vo.amountStatus}
|
|
|
</if>
|