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",