From 7b085cb5ffd4989e5db9a0102c2ffdef38bb0f9f Mon Sep 17 00:00:00 2001 From: wenlukang1 Date: Mon, 28 Jul 2025 11:08:27 +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=B69?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/plugin/report/BillReceivableReportFormPlugin.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 1817ceb..f494d9d 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 @@ -163,13 +163,13 @@ public class BillReceivableReportFormPlugin extends AbstractReportListDataPlugin //托收 private DataSet getCollectData(){ return DB.queryDataSet(this.getClass().getSimpleName(), DBRoute.of("fi"), - "SELECT " + + "/*dialect*/ SELECT " + " t1.fid AS pjid1," + " t2.fid AS discountid," + " t2.ftradetype AS discounttradetype," + " t4.freceivername AS shkd_tsyh," + " TO_CHAR(t2.FBIZDATE, 'YYYY-MM-DD') AS shkd_tsrq," + - " t2.fcollection AS shkd_tsje" + + " NVL(t2.fcollection, 0) AS shkd_tsje " + " FROM t_cdm_draftbill t1" + " LEFT JOIN t_cdm_draftbill_e t4 ON t4.fid = t1.fid" + " LEFT JOIN t_cdm_drafttrdbill_entry t3 ON t1.fid = t3.fdraftbillid" + @@ -247,8 +247,8 @@ public class BillReceivableReportFormPlugin extends AbstractReportListDataPlugin " MAX(CASE WHEN ftradetype = 'rlspledge' THEN fbizdate END) AS shkd_zyjcrq,\n" + " SUM(CASE WHEN ftradetype = 'rlspledge' THEN fs_billamount ELSE 0 END) AS shkd_zyjcje,\n" + " SUM(CASE WHEN ftradetype = 'pledge' THEN fs_billamount ELSE 0 END) AS shkd_zyjehj,\n" + - " TO_CHAR(SUM(CASE WHEN ftradetype = 'pledge' THEN fs_billamount ELSE 0 END) - " + - " SUM(CASE WHEN ftradetype = 'rlspledge' THEN fs_billamount ELSE 0 END), '999,999,999,999.99') " + + " SUM(CASE WHEN ftradetype = 'pledge' THEN fs_billamount ELSE 0 END) - " + + " SUM(CASE WHEN ftradetype = 'rlspledge' THEN fs_billamount ELSE 0 END) " + " AS shkd_zyje\n" + " FROM (\n" + " SELECT \n" +