From 5f7a0885a4ba6e86ed8b8dd4b306a12628659e7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E8=B4=B5=E5=BC=BA?= Date: Thu, 29 May 2025 11:20:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E6=8F=90=E6=8A=A5=E8=A1=A8=E8=A7=A3?= =?UTF-8?q?=E6=B4=BB=E6=97=A5=E6=9C=9F=E6=95=B0=E6=8D=AE=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shjh/jhzj7/fi/fi/plugin/report/RegularListReport.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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')"); //分组小计