|
|
@@ -252,7 +252,7 @@
|
|
|
arw.create_time,
|
|
|
30 type,
|
|
|
arw.currency,
|
|
|
- clc.money,
|
|
|
+ clc.money amount,
|
|
|
arw.remarks,
|
|
|
am.`name` accountManagementName,
|
|
|
am.account_opening accountManagementOpening,
|
|
|
@@ -266,6 +266,25 @@
|
|
|
ON arw.account_management_id = am.id AND am.del_flag = 0
|
|
|
WHERE arw.del_flag = 0
|
|
|
AND c.id = #{contractId}
|
|
|
+ UNION ALL
|
|
|
+ SELECT arw.id,
|
|
|
+ arw.create_time,
|
|
|
+ 40 AS type,
|
|
|
+ arw.currency,
|
|
|
+ trd.amount,
|
|
|
+ arw.remarks,
|
|
|
+ am.`name` accountManagementName,
|
|
|
+ am.account_opening accountManagementOpening,
|
|
|
+ arw.`name`,
|
|
|
+ arw.STATUS
|
|
|
+ FROM contract c
|
|
|
+ JOIN bytesailing_account.tax_refund_details trd ON trd.contract_id = c.id
|
|
|
+ AND trd.del_flag = 0
|
|
|
+ JOIN bytesailing_account.account_running_water arw ON trd.account_running_water_id = arw.id
|
|
|
+ AND arw.del_flag = 0
|
|
|
+ LEFT JOIN bytesailing_account.account_management am ON arw.account_management_id = am.id
|
|
|
+ AND am.del_flag = 0
|
|
|
+ WHERE c.id = #{contractId}
|
|
|
</select>
|
|
|
|
|
|
<select id="getCustomerMoney" resultType="com.fjhx.sale.entity.contract.vo.ContractVo">
|
caozj