Commit 468e9ac8 authored by TIANZHI.HU's avatar TIANZHI.HU

对账单打印更新 add by 39135 HuTianzhi

parent f25966f9
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<select id="selectCashflowList" parameterType="integer" resultType="java.util.LinkedHashMap"> <select id="selectCashflowList" parameterType="integer" resultType="java.util.LinkedHashMap">
Select Select
contract_id, contract_id,
cashflow_id, cashflow_id,
write_off_id, write_off_id,
...@@ -806,35 +806,20 @@ ...@@ -806,35 +806,20 @@
nvl(cc2.write_off_flag, 'NOT') != nvl(cc2.write_off_flag, 'NOT') !=
'NOT')) 'NOT'))
And rownum = 1)) due_date, And rownum = 1)) due_date,
nvl(t1.due_amount, nvl(t1.due_amount,
(Select cc2.due_amount (Select cc2.due_amount
From con_contract_cashflow cc2 From con_contract_cashflow cc2
Where cc2.contract_id = t2.contract_id Where cc2.contract_id = t2.contract_id
And cc2.times = t2.times And cc2.times = t2.times
And cc2.cf_item Not In (0, 9) And cc2.cf_item Not In (0, 9)
And ((cc2.cf_direction = 'INFLOW' And And ((cc2.cf_direction = 'INFLOW' And
cc2.cf_status = 'RELEASE') Or cc2.cf_status = 'RELEASE') Or
(t2.contract_status In (t2.contract_status In
('REPURING', 'REPUR') And ('REPURING', 'REPUR') And
cc2.cf_direction = 'NONCASH' And cc2.cf_direction = 'NONCASH' And
cc2.cf_status = 'BLOCK' And cc2.cf_status = 'BLOCK' And
nvl(cc2.write_off_flag, 'NOT') != nvl(cc2.write_off_flag, 'NOT') != 'NOT'))
'NOT')) And rownum = 1) ) As due_amount,
And rownum = 1) -
nvl((Select nvl(Sum(cc2.received_amount), 0)
From con_contract_cashflow cc2
Where cc2.contract_id = t2.contract_id
And cc2.times = t2.times
And cc2.cf_item Not In (0, 9)
And ((cc2.cf_direction = 'INFLOW' And
cc2.cf_status = 'RELEASE') Or
(t2.contract_status In
('REPURING', 'REPUR') And
cc2.cf_direction = 'NONCASH' And
cc2.cf_status = 'BLOCK' And
nvl(cc2.write_off_flag, 'NOT') !=
'NOT'))),
0)) As due_amount,
nvl(t1.transaction_date, t2.transaction_date) transaction_date, nvl(t1.transaction_date, t2.transaction_date) transaction_date,
nvl(t1.write_off_date, t2.write_off_date) write_off_date, nvl(t1.write_off_date, t2.write_off_date) write_off_date,
nvl(t1.received_amount, 0) As received_amount, nvl(t1.received_amount, 0) As received_amount,
...@@ -1102,10 +1087,10 @@ ...@@ -1102,10 +1087,10 @@
And nvl(cc2.received_amount, 0) != 0), And nvl(cc2.received_amount, 0) != 0),
-1)))) -1))))
Order By times, Order By times,
--cf_item,
--due_amount Desc, --due_amount Desc,
transaction_date, transaction_date,
write_off_date, write_off_date,
cf_item,
write_off_id) write_off_id)
</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