From 72ca9d1a14ddbd24d238bb75230ec6111577e2ca Mon Sep 17 00:00:00 2001 From: yangkunan Date: Thu, 17 Oct 2024 18:02:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A8=8E=E9=87=91=E6=B1=87=E6=80=BB=E8=A1=A8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E9=97=B4=E5=8C=BA=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FineReport/财务主题/报表/税金/2_税金汇总表.sql | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) 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