diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml
index 7a1c273..3845398 100644
--- a/.idea/sqldialects.xml
+++ b/.idea/sqldialects.xml
@@ -11,6 +11,7 @@
+
diff --git a/FineReport/财务主题/报表/费用/4-财务费用汇总表.sql b/FineReport/财务主题/报表/费用/4-财务费用汇总表.sql
index 8c23e2e..21841b9 100644
--- a/FineReport/财务主题/报表/费用/4-财务费用汇总表.sql
+++ b/FineReport/财务主题/报表/费用/4-财务费用汇总表.sql
@@ -44,8 +44,8 @@ WITH corp AS (
UNION ALL
SELECT
'减:利息收入' AS subject_name -- 科目名称
- ,SUM(debit_amt_m) AS debit_amt_m -- 借方金额_当月累计
- ,SUM(debit_amt_y) AS debit_amt_y -- 借方金额_当年累计
+ ,SUM(debit_amt_m) * -1 AS debit_amt_m -- 借方金额_当月累计
+ ,SUM(debit_amt_m) * -1 AS debit_amt_y -- 借方金额_当年累计
,0 AS debit_amt_last_m -- 借方金额_上年同期
,0 AS debit_amt_last_y -- 借方金额_上年累计
FROM base_info_curr
@@ -103,8 +103,8 @@ WITH corp AS (
'减:利息收入' AS subject_name -- 科目名称
,0 AS debit_amt_m -- 借方金额_当月累计
,0 AS debit_amt_y -- 借方金额_当年累计
- ,SUM(debit_amt_m) AS debit_amt_last_m -- 借方金额_上年同期
- ,SUM(debit_amt_y) AS debit_amt_last_y -- 借方金额_上年累计
+ ,SUM(debit_amt_m) * -1 AS debit_amt_last_m -- 借方金额_上年同期
+ ,SUM(debit_amt_y) * -1 AS debit_amt_last_y -- 借方金额_上年累计
FROM base_info_last
WHERE subject_code LIKE '660302%'
UNION ALL
@@ -147,6 +147,14 @@ WITH corp AS (
-- FROM base_info_last
-- WHERE subject_code like '6603%'
)
+SELECT
+ subject_name
+,debit_amt_m -- 借方金额_当月累计
+,debit_amt_y -- 借方金额_当年累计
+,debit_amt_last_m -- 借方金额_上年同期
+,debit_amt_last_y -- 借方金额_上年累计
+FROM
+(
SELECT
subject_name AS subject_name -- 科目名称
,IFNULL(SUM(debit_amt_m ) / 10000,0) AS debit_amt_m -- 借方金额_当月累计
@@ -156,5 +164,29 @@ SELECT
FROM subject_result
GROUP BY
subject_name
+-- ORDER BY
+-- DECODE(subject_name,'利息支出','a','减:利息收入','b','汇兑损益','c','金融机构手续费','d','其他','e')
+UNION ALL
+SELECT
+ '合计' AS subject_name -- 科目名称
+ ,IFNULL(SUM(CASE WHEN subject_name = '减:利息收入' THEN -1 * debit_amt_m ELSE debit_amt_m END) / 10000,0) AS debit_amt_m -- 借方金额_当月累计
+ ,IFNULL(SUM(CASE WHEN subject_name = '减:利息收入' THEN -1 * debit_amt_y ELSE debit_amt_y END) / 10000,0) AS debit_amt_y -- 借方金额_当年累计
+ ,IFNULL(SUM(CASE WHEN subject_name = '减:利息收入' THEN -1 * debit_amt_last_m ELSE debit_amt_last_m END ) / 10000,0) AS debit_amt_last_m -- 借方金额_上年同期
+ ,IFNULL(SUM(CASE WHEN subject_name = '减:利息收入' THEN -1 * debit_amt_last_y ELSE debit_amt_last_y END) / 10000,0) AS debit_amt_last_y -- 借方金额_上年累计
+FROM subject_result
+)t
+
ORDER BY
- DECODE(subject_name,'利息支出','a','减:利息收入','b','汇兑损益','c','金融机构手续费','d','其他','e')
\ No newline at end of file
+ DECODE(subject_name,'利息支出','a','减:利息收入','b','汇兑损益','c','金融机构手续费','d','其他','e')
+
+
+
+select
+ stat_date,--年月,日期格式
+ corp_code,--公司编码
+ tax_name, --税种
+ actual_amt, --实际入库
+ refund_amt --退税金额
+from dwi.dwi_fim_tax_payed
+WHERE LEFT(stat_date,7) = '2024-10'
+ AND corp_code = '0106'