From 82883674e037a582921b2044fdfb5945288b24e1 Mon Sep 17 00:00:00 2001 From: 16358 <1635849544@qq.com> Date: Fri, 14 Nov 2025 17:01:24 +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/14=2017?= =?UTF-8?q?:01=20=E5=86=85=E5=AE=B9=EF=BC=9A=E6=8B=85=E4=BF=9D=E5=90=88?= =?UTF-8?q?=E5=90=8C=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/GuaranteeContractPatchPlugin.java | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) 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 65e1fd4..c70de95 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 @@ -48,7 +48,8 @@ public class GuaranteeContractPatchPlugin extends AbstractReportListDataPluginEx " a.fbillno AS guaranteedOriBillno,\n" + " a.fisexceedstock AS shkd_fisexceedstock,\n" + " a.fk_shkd_sfwslqy AS shkd_sfwslqy,\n" + - " b.fguaranteequotaid AS shkd_guaranteequotaid\n" + + " b.fguaranteequotaid AS shkd_guaranteequotaid,\n" + + " b.fgratio AS shkd_gratio\n" + "FROM \n" + " t_gm_guarcontract AS a\n" + " LEFT JOIN t_gm_guaranteed_entry AS b \n" + @@ -137,13 +138,14 @@ 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); + //补充债券余额 责任金额 - 担保责任金额 = 责任余额 + //FIXME:逻辑修改：改为 责任余额 = 担保责任金额 / 担保比例 ；并且逻辑时机挪到最终dataset组成完成之后 +// 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")); @@ -166,11 +168,18 @@ public class GuaranteeContractPatchPlugin extends AbstractReportListDataPluginEx } - //3、根据参数进行过滤和排序 + //3、补充债券余额 + try { + finish = finish.addField("(shkd_gdebtbalance*100)/shkd_gratio", "shkd_gdebalanceamount"); + } catch (Exception e) { + finish = finish.addField("0", "shkd_gdebalanceamount"); + } + + //4、根据参数进行过滤和排序 reportQueryParam = event.getReportQueryParam(); DataSet newFinish = refreshDataSet(reportQueryParam, finish, "gm_guaranteecontract"); - //4、注入整合后的table数据 + //5、注入整合后的table数据 event.setDataSet(newFinish); }