diff --git a/FineReport/财务主题/报表/税金/2_税金汇总表.sql b/FineReport/财务主题/报表/税金/2_税金汇总表.sql index 5661940..1544288 100644 --- a/FineReport/财务主题/报表/税金/2_税金汇总表.sql +++ b/FineReport/财务主题/报表/税金/2_税金汇总表.sql @@ -20,9 +20,12 @@ WITH corp AS ( FROM "dwr"."fact_fim_subject_balance" t1 JOIN corp t2 ON t1.corp_code = t2.corp_code - WHERE - t1.acnt_year = '${YEAR(sQueryDate)}' - AND t1.acnt_mon = '${FORMAT(sQueryDate,"MM")}' + WHERE 1 = 1 + -- t1.acnt_year = '${YEAR(sQueryDate)}' + -- AND t1.acnt_mon = '${FORMAT(sQueryDate,"MM")}' + AND concat(acnt_year,'-',acnt_mon) <= '${sQueryDate}' + AND concat(acnt_year,'-',acnt_mon) >= '${sQueryStartDate}' + AND t1.subject_code LIKE '2221%' GROUP BY LEFT(subject_code,6) @@ -62,9 +65,11 @@ WITH corp AS ( FROM "dwr"."fact_fim_subject_balance" t1 JOIN corp t2 ON t1.corp_code = t2.corp_code - WHERE - t1.acnt_year = '${YEAR(sQueryDate)}' - AND t1.acnt_mon = '${FORMAT(sQueryDate,"MM")}' + WHERE 1 = 1 + -- t1.acnt_year = '${YEAR(sQueryDate)}' + -- AND t1.acnt_mon = '${FORMAT(sQueryDate,"MM")}' + AND concat(acnt_year,'-',acnt_mon) <= '${sQueryDate}' + AND concat(acnt_year,'-',acnt_mon) >= '${sQueryStartDate}' AND t1.subject_code LIKE '2221%' ) SELECT