|
|
@@ -12,7 +12,7 @@
|
|
|
<result property="customerName" column="customer_name"/>
|
|
|
<result property="supplierName" column="supplier_name"/>
|
|
|
<result property="platformName" column="platform_name"/>
|
|
|
- <result property="taskName" column="stage" />
|
|
|
+ <result property="taskName" column="stage"/>
|
|
|
<result property="quotaDisburseBatch" column="quota_disburse_batch"/>
|
|
|
<result property="gmtModified" column="gmt_modified"/>
|
|
|
<association property="status" column="status" resultMap="dictionaryResult"/>
|
|
|
@@ -96,10 +96,10 @@
|
|
|
SELECT t.id,
|
|
|
t.business_number,
|
|
|
t.refund_number,
|
|
|
- t.contract_no contract_number,
|
|
|
+ t.contract_no contract_number,
|
|
|
t.quota_disburse_batch,
|
|
|
t.refund_status,
|
|
|
- t5.platform_name trading_platform_name,
|
|
|
+ t5.platform_name trading_platform_name,
|
|
|
t1.project_name,
|
|
|
t3.corporate_name supplier_name,
|
|
|
t7.corporate_name customer_name,
|
|
|
@@ -141,7 +141,7 @@
|
|
|
ledger_account_basic_info t3
|
|
|
WHERE t.id = t2.ledger_fund_goods_assign_id
|
|
|
AND t.ledger_account_basic_info_id = t3.id
|
|
|
- AND t2.cash_type IN ("outType_discount","performanceBond","retentionMoney")
|
|
|
+ AND t2.cash_type IN ("outType_discount", "performanceBond", "retentionMoney")
|
|
|
AND t.is_submit = 1
|
|
|
) tt
|
|
|
LEFT JOIN refund_management a
|
|
|
@@ -174,13 +174,14 @@
|
|
|
ledger_account_basic_info t3
|
|
|
WHERE t.id = t2.ledger_fund_goods_assign_id
|
|
|
AND t.ledger_account_basic_info_id = t3.id
|
|
|
- AND t2.cash_type IN ("outType_discount","performanceBond","retentionMoney")
|
|
|
+ AND t2.cash_type IN ("outType_discount", "performanceBond", "retentionMoney")
|
|
|
AND t.is_submit = 1
|
|
|
) tt
|
|
|
LEFT JOIN refund_management a ON a.contract_no = tt.contract_no
|
|
|
AND a.quota_disburse_batch = tt.quota_disburse_batch
|
|
|
WHERE a.id = #{value}
|
|
|
- AND tt.amount_type NOT IN (SELECT mm.amount_type FROM refund_details mm)
|
|
|
+ AND tt.amount_type NOT IN
|
|
|
+ (SELECT mm.amount_type FROM refund_details mm WHERE mm.refund_management_id = #{value})
|
|
|
)
|
|
|
</select>
|
|
|
|
Wangyafan