wenlukang1
/
CTSK_DEV
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交人：刘森澳 

日期：2025/11/12 16:54
内容：担保明细新增字段
This commit is contained in:
16358 2025-11-12 16:55:10 +08:00
parent c8da9848e5
commit ef59d6a83c
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/GuaranteeContractOverPlugin.java
View File

@ -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");

15
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/report/GuaranteeContractPatchPlugin.java
View File

@ -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");