From 96e325cc48cb8fec2f9666022d3e0b5225bd04e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E8=B4=B5=E5=BC=BA?= Date: Mon, 7 Jul 2025 18:22:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=90=86=E8=B4=A2=E6=94=B6=E7=9B=8A=E8=AE=A1?= =?UTF-8?q?=E6=8F=90=E6=8A=A5=E8=A1=A8=E6=B7=BB=E5=8A=A0=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E6=97=A5<=E8=AE=A1=E6=8F=90=E6=97=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jhzj7/fi/fi/plugin/report/FinancialListReport.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/report/FinancialListReport.java b/main/java/shjh/jhzj7/fi/fi/plugin/report/FinancialListReport.java index 8cfea23..34f4507 100644 --- a/main/java/shjh/jhzj7/fi/fi/plugin/report/FinancialListReport.java +++ b/main/java/shjh/jhzj7/fi/fi/plugin/report/FinancialListReport.java @@ -72,12 +72,18 @@ public class FinancialListReport extends AbstractReportListDataPlugin implements Date filterDate = param.getFilter().getDate("shjh_filterdate"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy"); String filterYear = sdf.format(filterDate); - + SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd"); + String filterDateStr = sdf2.format(filterDate); // 4. 应用过滤条件 mainDataSet = mainDataSet.filter( "shjh_expiredate IS NULL OR " + // 保留到期日为空的记录 "year(shjh_expiredate) >= " + filterYear // 计提日年份 <= 到期日年份 ); + + mainDataSet = mainDataSet.filter( + "shjh_buydate IS NULL OR " + // 保留购买日期日为空的记录 + "shjh_buydate < to_date('" + filterDateStr + "','yyyy-MM-dd') "//购买日<计提日 + ); // 3. 查询理财收益预提数据 // DataSet addDataSet = QueryServiceHelper.queryDataSet( // this.getClass().getName() + "1",