diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml
index 28608db..7a1c273 100644
--- a/.idea/sqldialects.xml
+++ b/.idea/sqldialects.xml
@@ -8,6 +8,7 @@
+
diff --git a/FineReport/财务主题/报表/税金/2_税金汇总表.sql b/FineReport/财务主题/报表/税金/2_税金汇总表.sql
index 1544288..a114170 100644
--- a/FineReport/财务主题/报表/税金/2_税金汇总表.sql
+++ b/FineReport/财务主题/报表/税金/2_税金汇总表.sql
@@ -72,43 +72,59 @@ WITH corp AS (
AND concat(acnt_year,'-',acnt_mon) >= '${sQueryStartDate}'
AND t1.subject_code LIKE '2221%'
)
-SELECT
- fin0."税种",
- IFNULL(fin1."期初余额",0) AS "期初余额",
- IFNULL(fin1."本期应交",0) AS "本期应交"
-FROM
- ( SELECT 1 AS seq, '增值税' AS "科目编号",'增值税' AS "税种"
- UNION ALL
- SELECT 2 AS seq, '222102' AS "科目编号",'消费税' AS "税种"
- UNION ALL
- SELECT 3 AS seq, '222105' AS "科目编号",'企业所得税' AS "税种"
- UNION ALL
- SELECT 4 AS seq, '222104' AS "科目编号",'城市维护建设税' AS "税种"
- UNION ALL
- SELECT 5 AS seq, '222113' AS "科目编号",'教育费附加' AS "税种"
- UNION ALL
- SELECT 6 AS seq, '222114' AS "科目编号",'地方教育费附加' AS "税种"
- UNION ALL
- SELECT 7 AS seq, '222106' AS "科目编号",'个人所得税' AS "税种"
- UNION ALL
- SELECT 8 AS seq, '222107' AS "科目编号",'房产税' AS "税种"
- UNION ALL
- SELECT 9 AS seq, '222110' AS "科目编号",'土地使用税' AS "税种"
- UNION ALL
- SELECT 10 AS seq, '222108' AS "科目编号",'车船税' AS "税种"
- UNION ALL
- SELECT 11 AS seq, '222109' AS "科目编号",'印花税' AS "税种"
- UNION ALL
- SELECT 12 AS seq, '222112' AS "科目编号",'资源税' AS "税种"
- UNION ALL
- SELECT 13 AS seq, '222118' AS "科目编号",'契税' AS "税种"
- UNION ALL
- SELECT 14 AS seq, '222125' AS "科目编号",'环境保护费' AS "税种"
- UNION ALL
- SELECT 15 AS seq, '222121' AS "科目编号",'文化事业建设费' AS "税种"
- UNION ALL
- SELECT 16 AS seq, '其他税' AS "科目编号",'其他税' AS "税种"
- ) fin0
- LEFT JOIN subject_result fin1 ON fin0."科目编号" = fin1."科目编号"
-ORDER BY
- fin0.seq
\ No newline at end of file
+ SELECT
+ fin0."税种",
+ IFNULL(fin1."期初余额",0) AS "期初余额",
+ IFNULL(fin1."本期应交",0) AS "本期应交",
+ IFNULL(fin3.实际入库,0) AS "实际入库",
+ IFNULL(fin3.退税金额,0) AS "退税金额"
+ FROM
+ ( SELECT 1 AS seq, '增值税' AS "科目编号",'增值税' AS "税种"
+ UNION ALL
+ SELECT 2 AS seq, '222102' AS "科目编号",'消费税' AS "税种"
+ UNION ALL
+ SELECT 3 AS seq, '222105' AS "科目编号",'企业所得税' AS "税种"
+ UNION ALL
+ SELECT 4 AS seq, '222104' AS "科目编号",'城市维护建设税' AS "税种"
+ UNION ALL
+ SELECT 5 AS seq, '222113' AS "科目编号",'教育费附加' AS "税种"
+ UNION ALL
+ SELECT 6 AS seq, '222114' AS "科目编号",'地方教育费附加' AS "税种"
+ UNION ALL
+ SELECT 7 AS seq, '222106' AS "科目编号",'个人所得税' AS "税种"
+ UNION ALL
+ SELECT 8 AS seq, '222107' AS "科目编号",'房产税' AS "税种"
+ UNION ALL
+ SELECT 9 AS seq, '222110' AS "科目编号",'土地使用税' AS "税种"
+ UNION ALL
+ SELECT 10 AS seq, '222108' AS "科目编号",'车船税' AS "税种"
+ UNION ALL
+ SELECT 11 AS seq, '222109' AS "科目编号",'印花税' AS "税种"
+ UNION ALL
+ SELECT 12 AS seq, '222112' AS "科目编号",'资源税' AS "税种"
+ UNION ALL
+ SELECT 13 AS seq, '222118' AS "科目编号",'契税' AS "税种"
+ UNION ALL
+ SELECT 14 AS seq, '222125' AS "科目编号",'环境保护费' AS "税种"
+ UNION ALL
+ SELECT 15 AS seq, '222121' AS "科目编号",'文化事业建设费' AS "税种"
+ UNION ALL
+ SELECT 16 AS seq, '其他税' AS "科目编号",'其他税' AS "税种"
+ ) fin0
+ LEFT JOIN subject_result fin1 ON fin0."科目编号" = fin1."科目编号"
+ LEFT JOIN
+ (
+ select
+ tax_name AS "税种" -- 税种
+ ,SUM(actual_amt) AS "实际入库"
+ ,SUM(refund_amt) AS "退税金额"
+ from dwi.dwi_fim_tax_payed t1
+ JOIN corp t2 ON t1.corp_code = t2.corp_code
+ WHERE TO_CHAR(stat_date, 'YYYY-MM') <= '${sQueryDate}'
+ AND TO_CHAR(stat_date, 'YYYY-MM') >= '${sQueryStartDate}'
+ GROUP By tax_name
+ )fin3
+ on fin0.税种 = fin3.税种
+ ORDER BY
+ fin0.seq
+;
\ No newline at end of file