From ebc13bf54c2179e7c39728e69508fdc39a402b72 Mon Sep 17 00:00:00 2001 From: wenlukang1 Date: Wed, 23 Jul 2025 17:07:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E6=94=B6=E7=A5=A8=E6=8D=AE=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E6=8A=A5=E8=A1=A8=E6=8F=92=E4=BB=B63?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/BillReceivableReportFormPlugin.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/BillReceivableReportFormPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/BillReceivableReportFormPlugin.java index c2e8af6..d24a5d1 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/BillReceivableReportFormPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/BillReceivableReportFormPlugin.java @@ -1,7 +1,6 @@ package shkd.sys.sys.plugin.report; import kd.bos.algo.DataSet; -import kd.bos.algo.JoinDataSet; import kd.bos.algo.JoinType; import kd.bos.db.DB; import kd.bos.db.DBRoute; @@ -46,13 +45,11 @@ public class BillReceivableReportFormPlugin extends AbstractReportListDataPlugin " MAX(discountid) AS discountid," + " MAX(discounttradetype) AS discounttradetype," + " LISTAGG(" + - " TO_CHAR(discountdate, 'YYYY-MM-DD'), -- 格式化日期" + - " '；' " + - " ) WITHIN GROUP (ORDER BY discountdate) AS shkd_txrq, -- 按日期排序" + -// " -- 合并所有记录为 \"贴现人;金额; 贴现人;金额; ...\" 格式" + + " TO_CHAR(discountdate, 'YYYY-MM-DD')," + + " ';' " + + " ) WITHIN GROUP (ORDER BY discountdate) AS shkd_txrq," + " LISTAGG(" + " disfrecbodyname || ';' || TO_CHAR(discamt, '999,999,999,999.99')," + -// " ';' -- 用分号分隔" + " ) WITHIN GROUP (ORDER BY discountdate) AS shkd_txjg" + "FROM (" + " SELECT " + @@ -84,10 +81,10 @@ public class BillReceivableReportFormPlugin extends AbstractReportListDataPlugin " MAX(discountid) AS discountid," + " MAX(discounttradetype) AS discounttradetype," + " LISTAGG(" + - " TO_CHAR(bizdate, 'YYYY-MM-DD'), '\' " + + " TO_CHAR(bizdate, 'YYYY-MM-DD'), '/n'" + " ) WITHIN GROUP (ORDER BY bizdate) AS shkd_bsrq, " + " LISTAGG(" + - " endorsename || ';' || TO_CHAR(endorseamt, '999,999,999,999.99'),'\'" + + " endorsename || ';' || TO_CHAR(endorseamt, '999,999,999,999.99'),'/n'" + " ) WITHIN GROUP (ORDER BY bizdate) AS shkd_bsr," + " SUM(endorseamt) AS shkd_bsje" + "FROM (" +