diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/report/RegularListReport.java b/main/java/shjh/jhzj7/fi/fi/plugin/report/RegularListReport.java index cca29f3..5db8a77 100644 --- a/main/java/shjh/jhzj7/fi/fi/plugin/report/RegularListReport.java +++ b/main/java/shjh/jhzj7/fi/fi/plugin/report/RegularListReport.java @@ -108,10 +108,10 @@ public class RegularListReport extends AbstractReportListDataPlugin implements P "and to_date('" + filterDateStr + "','yyyy-MM-dd') <= " + "to_date(concat(year(shjh_depositstopdate),'-12-31'),'yyyy-MM-dd')"); - //过滤2----计提日<=解活日期所在年年末 - //解活日期:shjh_redeemdate + // 过滤2:仅对 shjh_redeemdate 非空记录,要求 计提日 <= 解活日期所在年年末 dataSet = dataSet.filter( - "to_date('" + filterDateStr + "','yyyy-MM-dd') <= " + + "shjh_redeemdate is null " + // 允许 shjh_redeemdate 为 null 的记录通过 + "or to_date('" + filterDateStr + "','yyyy-MM-dd') <= " + "to_date(concat(year(shjh_redeemdate),'-12-31'),'yyyy-MM-dd')"); //分组小计