From ef59d6a83c8ac5fd7c26e3076f39eeabfd1dcc0b Mon Sep 17 00:00:00 2001 From: 16358 <1635849544@qq.com> Date: Wed, 12 Nov 2025 16:55:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E5=88=98?= =?UTF-8?q?=E6=A3=AE=E6=BE=B3=20=E6=97=A5=E6=9C=9F=EF=BC=9A2025/11/12=2016?= =?UTF-8?q?:54=20=E5=86=85=E5=AE=B9=EF=BC=9A=E6=8B=85=E4=BF=9D=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/GuaranteeContractOverPlugin.java | 6 ++++++ .../report/GuaranteeContractPatchPlugin.java | 15 ++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/GuaranteeContractOverPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/GuaranteeContractOverPlugin.java index f5bf672..68688c3 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/GuaranteeContractOverPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/GuaranteeContractOverPlugin.java @@ -24,6 +24,8 @@ public class GuaranteeContractOverPlugin extends GuaranteeContractDetailFormPlug columns.add("billno"); columns.add("id"); columns.add("guaranteedorgtext"); + columns.add("shkd_fisexceedstock"); + columns.add("shkd_sfwslqy"); columns.add("creditortext"); columns.add("guaranteetext"); columns.add("currency"); @@ -49,7 +51,11 @@ public class GuaranteeContractOverPlugin extends GuaranteeContractDetailFormPlug packageDataEvent.getNoMergeKey().add("guaranteeorgtext"); packageDataEvent.getNoMergeKey().add("billno"); packageDataEvent.getNoMergeKey().add("id"); + packageDataEvent.getNoMergeKey().add("id"); + packageDataEvent.getNoMergeKey().add("id"); packageDataEvent.getNoMergeKey().add("guaranteedorgtext"); + packageDataEvent.getNoMergeKey().add("shkd_fisexceedstock"); + packageDataEvent.getNoMergeKey().add("shkd_sfwslqy"); packageDataEvent.getNoMergeKey().add("creditortext"); packageDataEvent.getNoMergeKey().add("guaranteetext"); packageDataEvent.getNoMergeKey().add("currency"); diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/GuaranteeContractPatchPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/GuaranteeContractPatchPlugin.java index dc3da46..65e1fd4 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/GuaranteeContractPatchPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/GuaranteeContractPatchPlugin.java @@ -43,10 +43,11 @@ public class GuaranteeContractPatchPlugin extends AbstractReportListDataPluginEx public void afterQuery(AfterQueryEvent event) { DataSet dataSet = event.getDataSet(); - //1、补充查询担保额度 + //1、补充查询担保额度/是否超股比/是否为第三方企业 StringBuilder sqlBuilder = new StringBuilder("SELECT \n" + " a.fbillno AS guaranteedOriBillno,\n" + - " b.fentryid AS guaranteedid,\n" + + " a.fisexceedstock AS shkd_fisexceedstock,\n" + + " a.fk_shkd_sfwslqy AS shkd_sfwslqy,\n" + " b.fguaranteequotaid AS shkd_guaranteequotaid\n" + "FROM \n" + " t_gm_guarcontract AS a\n" + @@ -69,7 +70,7 @@ public class GuaranteeContractPatchPlugin extends AbstractReportListDataPluginEx DynamicObject[] guaranteecontracts = BusinessDataServiceHelper.load("gm_guaranteecontract", "id,billno,currency,guaranteedebt_entry.shkd_parentbillno,guaranteedebt_entry.shkd_gsrcbilltype,guaranteedebt_entry.shkd_gsrcbillno," + "guaranteedebt_entry.shkd_gsrcbillid,guaranteedebt_entry.shkd_gcparty,guaranteedebt_entry.shkd_gdebtorgtext," + - "guaranteedebt_entry.shkd_gdebtorg,guaranteedebt_entry.shkd_gdebtcurrency,guaranteedebt_entry.shkd_gdebtamount," + + "guaranteedebt_entry.shkd_gdebtorg,guaranteedebt_entry.shkd_gdebtcurrency,guaranteedebt_entry.shkd_gdebtamount,guaranteedebt_entry.shkd_gdebalanceamount," + "guaranteedebt_entry.shkd_gdebtbalance,guaranteedebt_entry.shkd_gdebtstartdate,guaranteedebt_entry.shkd_gdebtenddate," + "guaranteedebt_entry.shkd_gcomment,guaranteedebt_entry.shkd_gstatus", new QFilter("id", "in", billIds).toArray()); if (!EmptyUtil.isEmpty(guaranteecontracts)) { @@ -136,6 +137,13 @@ public class GuaranteeContractPatchPlugin extends AbstractReportListDataPluginEx entry.set("shkd_gdebtbalance", debtBalance); } } + //补充债券余额 + Object shkdGdebtamount = entry.get("shkd_gdebtamount"); + Object shkdGdebtbalance = entry.get("shkd_gdebtbalance"); + BigDecimal debtAmountTemp = shkdGdebtamount != null ? new BigDecimal(shkdGdebtamount.toString()) : BigDecimal.ZERO; + BigDecimal debtBalanceTemp = shkdGdebtbalance != null ? new BigDecimal(shkdGdebtbalance.toString()) : BigDecimal.ZERO; + BigDecimal difference = debtAmountTemp.subtract(debtBalanceTemp); + entry.set("shkd_gdebalanceamount", difference); entry.set("shkd_gcomment", gcBIll.get("gcomment")); entry.set("shkd_gstatus", gcBIll.getBigDecimal("gratio").compareTo(BigDecimal.ZERO) == 0 ? "C" : (BigDecimal.ZERO.compareTo(debtBalance) != 0 ? "A" : "B")); @@ -157,6 +165,7 @@ public class GuaranteeContractPatchPlugin extends AbstractReportListDataPluginEx finish = join2.on("billno", "shkd_parentbillno").select(fieldNames3, fieldNames4).finish(); } + //3、根据参数进行过滤和排序 reportQueryParam = event.getReportQueryParam(); DataSet newFinish = refreshDataSet(reportQueryParam, finish, "gm_guaranteecontract");