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); }