|
@@ -3,25 +3,28 @@
|
|
|
<mapper namespace="cn.com.ctop.finance.payment.mapper.FinancePaymentRechargeApplicationMapper">
|
|
|
|
|
|
<select id="queryAuditProcess" resultType="com.alibaba.fastjson.JSONObject">
|
|
|
- (SELECT t1.audit_status as 'auditStatus', t1.recharge_id as 'userId', t2.realname as 'userName', t4.role_name as 'roleName', t1.approval_content as 'approvalContent', t1.files as 'files', t1.create_time as 'time'
|
|
|
- FROM finance_payment_recharge_application_record t1
|
|
|
- LEFT JOIN sys_user t2 ON t1.revieweder_id = t2.id
|
|
|
- LEFT JOIN sys_user_role t3 ON t2.id = t3.user_id
|
|
|
- LEFT JOIN sys_role t4 ON t3.role_id = t4.id
|
|
|
- WHERE t1.recharge_id = #{id}
|
|
|
- ORDER BY t1.create_time)
|
|
|
- UNION ALL
|
|
|
- SELECT t1.audit_status,
|
|
|
- t1.applicanter_id,
|
|
|
- t1.applicanter,
|
|
|
- t4.role_name,
|
|
|
- t1.approval_content,
|
|
|
- t1.files,
|
|
|
- t1.update_time
|
|
|
- FROM finance_payment_recharge_application t1
|
|
|
- LEFT JOIN sys_user_role t3 ON t1.applicanter_id = t3.user_id
|
|
|
- LEFT JOIN sys_role t4 ON t3.role_id = t4.id
|
|
|
- WHERE t1.id = #{id}
|
|
|
+ SELECT *
|
|
|
+ FROM (
|
|
|
+ SELECT t1.audit_status as 'auditStatus', t1.recharge_id as 'userId', t2.realname as 'userName', t4.role_name as 'roleName', t1.approval_content as 'approvalContent', t1.files as 'files', t1.create_time as 'time'
|
|
|
+ FROM finance_payment_recharge_application_record t1
|
|
|
+ LEFT JOIN sys_user t2 ON t1.revieweder_id = t2.id
|
|
|
+ LEFT JOIN sys_user_role t3 ON t2.id = t3.user_id
|
|
|
+ LEFT JOIN sys_role t4 ON t3.role_id = t4.id
|
|
|
+ WHERE t1.recharge_id = #{id}
|
|
|
+ UNION ALL
|
|
|
+ SELECT t1.audit_status,
|
|
|
+ '-',
|
|
|
+ '-',
|
|
|
+ t4.role_name,
|
|
|
+ t1.approval_content,
|
|
|
+ t1.files,
|
|
|
+ t1.update_time
|
|
|
+ FROM finance_payment_recharge_application t1
|
|
|
+ LEFT JOIN sys_user_role t3 ON t1.applicanter_id = t3.user_id
|
|
|
+ LEFT JOIN sys_role t4 ON t3.role_id = t4.id
|
|
|
+ WHERE t1.id = #{id}
|
|
|
+ ) t
|
|
|
+ ORDER BY t.time
|
|
|
</select>
|
|
|
|
|
|
|
|
@@ -44,7 +47,9 @@
|
|
|
t1.audit_status as 'auditStatus',
|
|
|
t1.payment_media as 'paymentMedia',
|
|
|
t1.recharge_type as 'rechargeType',
|
|
|
- t2.rebate_rate as 'rebateRate'
|
|
|
+ t2.rebate_rate as 'rebateRate',
|
|
|
+ t1.revieweder_id as 'reviewederId',
|
|
|
+ t1.revieweder as 'revieweder'
|
|
|
FROM finance_payment_recharge_application t1
|
|
|
LEFT JOIN finance_payment_recharge_account t2 ON t1.id = t2.recharge_id
|
|
|
<where>
|