Skip to content

L
leaf-hlcm
Commit 0eb146b1 authored by TIANZHI.HU's avatar TIANZHI.HU
Browse files
Options

对账单打印bug修复 add by 39135 HuTianzhi

parent b8f6d5f4
Show whitespace changes
Inline Side-by-side
Showing with 1073 additions and 1064 deletions
src/main/resources/com/hand/hls/hlcm/cont/mapper/ConExportMapper.xml
View file @ 0eb146b1
...@@ -101,10 +101,13 @@ ...@@ -101,10 +101,13 @@
cwo.write_off_due_amount received_amount, cwo.write_off_due_amount received_amount,
(ccc.due_amount - (ccc.due_amount -
nvl((Select Sum(tn.write_off_due_amount) nvl((Select Sum(tn.write_off_due_amount)
From csh_write_off tn From csh_write_off tn,csh_transaction ct
Where tn.cashflow_id = cwo.cashflow_id Where tn.cashflow_id = cwo.cashflow_id
And tn.creation_date <= and tn.csh_transaction_id=ct.transaction_id
cwo.creation_date), and (ct.transaction_date<t.transaction_date
or (ct.transaction_date=t.transaction_date
and tn.write_off_date<=cwo.write_off_date
and tn.write_off_id<=cwo.write_off_id))),
0)) As unreceived_amount 0)) As unreceived_amount
From con_contract_cashflow ccc, From con_contract_cashflow ccc,
con_contract c, con_contract c,
...@@ -343,10 +346,13 @@ ...@@ -343,10 +346,13 @@
cwo.write_off_due_amount received_amount, cwo.write_off_due_amount received_amount,
(ccc.due_amount - (ccc.due_amount -
nvl((Select Sum(tn.write_off_due_amount) nvl((Select Sum(tn.write_off_due_amount)
From csh_write_off tn From csh_write_off tn,csh_transaction ct
Where tn.cashflow_id = cwo.cashflow_id Where tn.cashflow_id = cwo.cashflow_id
And tn.creation_date <= and tn.csh_transaction_id=ct.transaction_id
cwo.creation_date), and (ct.transaction_date<t.transaction_date
or (ct.transaction_date=t.transaction_date
and tn.write_off_date<=cwo.write_off_date
and tn.write_off_id<=cwo.write_off_id))),
0)) As unreceived_amount 0)) As unreceived_amount
From con_contract_cashflow ccc, From con_contract_cashflow ccc,
con_contract c, con_contract c,
...@@ -618,11 +624,13 @@ ...@@ -618,11 +624,13 @@
cwo.write_off_due_amount received_amount, cwo.write_off_due_amount received_amount,
(ccc.due_amount - (ccc.due_amount -
nvl((Select Sum(tn.write_off_due_amount) nvl((Select Sum(tn.write_off_due_amount)
From csh_write_off tn From csh_write_off tn,csh_transaction ct
Where tn.cashflow_id = Where tn.cashflow_id = cwo.cashflow_id
cwo.cashflow_id and tn.csh_transaction_id=ct.transaction_id
And tn.creation_date <= and (ct.transaction_date<t.transaction_date
cwo.creation_date), or (ct.transaction_date=t.transaction_date
and tn.write_off_date<=cwo.write_off_date
and tn.write_off_id<=cwo.write_off_id))),
0)) As unreceived_amount 0)) As unreceived_amount
From con_contract_cashflow ccc, From con_contract_cashflow ccc,
con_contract c, con_contract c,
...@@ -874,11 +882,13 @@ ...@@ -874,11 +882,13 @@
cwo.write_off_due_amount received_amount, cwo.write_off_due_amount received_amount,
(ccc.due_amount - (ccc.due_amount -
nvl((Select Sum(tn.write_off_due_amount) nvl((Select Sum(tn.write_off_due_amount)
From csh_write_off tn From csh_write_off tn,csh_transaction ct
Where tn.cashflow_id = Where tn.cashflow_id = cwo.cashflow_id
cwo.cashflow_id and tn.csh_transaction_id=ct.transaction_id
And tn.creation_date <= and (ct.transaction_date<t.transaction_date
cwo.creation_date), or (ct.transaction_date=t.transaction_date
and tn.write_off_date<=cwo.write_off_date
and tn.write_off_id<=cwo.write_off_id))),
0)) As unreceived_amount 0)) As unreceived_amount
From con_contract_cashflow ccc, From con_contract_cashflow ccc,
con_contract c, con_contract c,
...@@ -1079,7 +1089,6 @@ ...@@ -1079,7 +1089,6 @@
transaction_date, transaction_date,
write_off_date) write_off_date)
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment