Skip to content

L
leaf-hlcm
Commit 8ea6ee09 authored by stone's avatar stone
Browse files
Options

【fix】财务收支一览表

parent 1a56ea05
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 21 deletions
src/main/webapp/WEB-INF/classes/rpt/RPT5090/atm_update.lwm
View file @ 8ea6ee09
......@@ -3,7 +3,7 @@
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
SELECT to_char(v.calendar_date,'yyyy/mm/dd')calendar_date,
SELECT to_char(v.calendar_date,'yyyy/mm/dd')calendar_date,
v.named_day,
v.purchase_amount,
v.down_payment,
......@@ -35,7 +35,7 @@
(SELECT 1
FROM con_contract ct
WHERE ct.contract_status IN
('INCEPT', 'ETING', 'REPURING')
('INCEPT', 'PENDING','ETING', 'REPURING')
AND ct.contract_id = contract_id)) purchase_amount, --留购金
(SELECT SUM(due_amount - nvl(received_amount, 0))
FROM con_contract_cashflow
......@@ -45,7 +45,7 @@
(SELECT 1
FROM con_contract ct
WHERE ct.contract_status IN
('INCEPT', 'ETING', 'REPURING')
('INCEPT', 'PENDING','ETING', 'REPURING')
AND ct.contract_id = contract_id)) down_payment, --首付款
(SELECT SUM(due_amount)
FROM con_contract_cashflow ccc
......@@ -55,7 +55,7 @@
(SELECT 1
FROM con_contract ct
WHERE ct.contract_status IN
('INCEPT', 'ETING', 'REPURING')
('INCEPT', 'PENDING','ETING', 'REPURING')
AND ct.contract_id = contract_id)) lease_amount, --租金
(CASE
WHEN to_char(SYSDATE, 'dd') <= 20 AND
......@@ -66,7 +66,7 @@
FROM con_contract c
WHERE c.contract_status <> 'CANCEL'
AND to_char(add_months(c.lease_start_date, 1),
'yyyymmdd') = to_char(SYSDATE, 'yyyymmdd')
'yyyymm') = to_char(SYSDATE, 'yyyymm')
AND nvl(c.payment_deduction, 'NO_DEDUCTION') =
'NO_DEDUCTION'),0) +
NVL((SELECT SUM(nvl(c.lease_item_amount, 0) -
......@@ -74,7 +74,7 @@
FROM con_contract c
WHERE c.contract_status <> 'CANCEL'
AND to_char(add_months(c.lease_start_date, 1),
'yyyymmdd') = to_char(SYSDATE, 'yyyymmdd')
'yyyymm') = to_char(SYSDATE, 'yyyymm')
AND nvl(c.payment_deduction, 'NO_DEDUCTION') <>
'NO_DEDUCTION'),0)
WHEN to_char(SYSDATE, 'dd') > 20 AND
......@@ -83,20 +83,20 @@
NVL((SELECT SUM(nvl(c.lease_item_amount, 0))
FROM con_contract c
WHERE c.contract_status <> 'CANCEL'
AND to_char(c.lease_start_date, 'yyyymmdd') =
to_char(SYSDATE, 'yyyymmdd')
AND to_char(c.lease_start_date, 'yyyymm') =
to_char(SYSDATE, 'yyyymm')
AND nvl(c.payment_deduction, 'NO_DEDUCTION') =
'NO_DEDUCTION'),0)+
NVL((SELECT SUM(nvl(c.lease_item_amount, 0) -
nvl(c.down_payment, 0))
FROM con_contract c
WHERE c.contract_status <> 'CANCEL'
AND to_char(c.lease_start_date, 'yyyymmdd') =
to_char(SYSDATE, 'yyyymmdd')
AND to_char(c.lease_start_date, 'yyyymm') =
to_char(SYSDATE, 'yyyymm')
AND nvl(c.payment_deduction, 'NO_DEDUCTION') <>
'NO_DEDUCTION'),0)
ELSE
0
null
END) outflow_amount
FROM (SELECT s.calendar_date
FROM fnd_calendar_details s
......@@ -109,7 +109,7 @@
(SELECT 1
FROM con_contract t
WHERE t.contract_status IN
('INCEPT', 'ETING', 'REPURING')
('INCEPT', 'PENDING','ETING', 'REPURING')
AND t.contract_id = ccc.contract_id
AND t.data_class = 'NORMAL'))
ORDER BY s.calendar_date) t) v
......
src/main/webapp/WEB-INF/classes/rpt/RPT5090/atm_update_month.lwm
View file @ 8ea6ee09
......@@ -3,7 +3,7 @@
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
SELECT v.monthly,
SELECT v.monthly,
SUM(NVL(purchase_amount,0)) total_purchase_amount,
SUM(NVL(down_payment,0)) total_down_payment,
SUM(NVL(lease_amount,0)) total_lease_amount,
......@@ -35,7 +35,7 @@
(SELECT 1
FROM con_contract ct
WHERE ct.contract_status IN
('INCEPT', 'ETING', 'REPURING')
('INCEPT', 'PENDING','ETING', 'REPURING')
AND ct.contract_id = contract_id)) purchase_amount, --留购金
(SELECT SUM(due_amount - nvl(received_amount, 0))
FROM con_contract_cashflow
......@@ -45,7 +45,7 @@
(SELECT 1
FROM con_contract ct
WHERE ct.contract_status IN
('INCEPT', 'ETING', 'REPURING')
('INCEPT', 'PENDING','ETING', 'REPURING')
AND ct.contract_id = contract_id)) down_payment, --首付款
(SELECT SUM(due_amount)
FROM con_contract_cashflow ccc
......@@ -55,7 +55,7 @@
(SELECT 1
FROM con_contract ct
WHERE ct.contract_status IN
('INCEPT', 'ETING', 'REPURING')
('INCEPT', 'PENDING','ETING', 'REPURING')
AND ct.contract_id = contract_id)) lease_amount, --租金
(CASE
WHEN to_char(SYSDATE, 'dd') <= 20 AND
......@@ -66,7 +66,7 @@
FROM con_contract c
WHERE c.contract_status <> 'CANCEL'
AND to_char(add_months(c.lease_start_date, 1),
'yyyymmdd') = to_char(SYSDATE, 'yyyymmdd')
'yyyymm') = to_char(SYSDATE, 'yyyymm')
AND nvl(c.payment_deduction, 'NO_DEDUCTION') =
'NO_DEDUCTION'),0) +
NVL((SELECT SUM(nvl(c.lease_item_amount, 0) -
......@@ -74,11 +74,11 @@
FROM con_contract c
WHERE c.contract_status <> 'CANCEL'
AND to_char(add_months(c.lease_start_date, 1),
'yyyymmdd') = to_char(SYSDATE, 'yyyymmdd')
'yyyymm') = to_char(SYSDATE, 'yyyymm')
AND nvl(c.payment_deduction, 'NO_DEDUCTION') <>
'NO_DEDUCTION'),0)
WHEN to_char(SYSDATE, 'dd') > 20 AND
to_char(add_months(t.calendar_date, -1), 'yyyymmdd') =
to_char(add_months(t.calendar_date, -1), 'yyyymm') =
to_char(SYSDATE, 'yyyymm') || 20 THEN
NVL((SELECT SUM(nvl(c.lease_item_amount, 0))
FROM con_contract c
......@@ -109,7 +109,7 @@
(SELECT 1
FROM con_contract t
WHERE t.contract_status IN
('INCEPT', 'ETING', 'REPURING')
('INCEPT', 'PENDING','ETING', 'REPURING')
AND t.contract_id = ccc.contract_id
AND t.data_class = 'NORMAL'))
ORDER BY s.calendar_date) t) v
......
src/main/webapp/modules/rpt/RPT5090/export_excel_sheets.lsc
View file @ 8ea6ee09
......@@ -85,7 +85,6 @@
result: $ctx.parameter.return_status,
message: $ctx.parameter.return_message
};
document.write("<h1>通过document.write输出内容"+result+</h1>");
println(result);
]]></s:server-script>
</a:init-procedure>
......
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