From 7152952fa6d1b6e9f61e20c1c5989883d59e9fd8 Mon Sep 17 00:00:00 2001 From: csx <1981897232@qq.com> Date: Mon, 17 Nov 2025 18:26:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A=E9=99=88?= =?UTF-8?q?=E7=BB=8D=E9=91=AB=20=E6=97=A5=E6=9C=9F=EF=BC=9A2025/11/17=2017?= =?UTF-8?q?=EF=BC=9A30=20=E5=86=85=E5=AE=B9:=E5=A4=87=E6=A1=88=E7=94=B3?= =?UTF-8?q?=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/FilingApplicationSelectPlugin.java | 26 ++++++++++++++++-- .../SubmitOccupyFilingApplication.java | 27 ++++++++++++++++--- 2 files changed, 47 insertions(+), 6 deletions(-) diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/FilingApplicationSelectPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/FilingApplicationSelectPlugin.java index 1c7e37a..c70543e 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/FilingApplicationSelectPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/FilingApplicationSelectPlugin.java @@ -60,10 +60,32 @@ public class FilingApplicationSelectPlugin extends AbstractBillPlugIn implements } DynamicObject shkd_filingapplication = BusinessDataServiceHelper.loadSingle(newValue.getPkValue(), "shkd_filingapplication"); BigDecimal shkd_syed = shkd_filingapplication.getBigDecimal("shkd_syed"); - BigDecimal drawamount = (BigDecimal) this.getModel().getValue("drawamount"); + BigDecimal drawamount =BigDecimal.ZERO; + String entryname = this.getModel().getDataEntityType().getName(); + switch (entryname){ + case "cfm_loanbill": + drawamount=(BigDecimal) this.getModel().getValue("drawamount"); + break; + case "fl_leasecontractbill": + drawamount=(BigDecimal) this.getModel().getValue("amount"); + break; + case "cfm_loanbill_bond": + drawamount=(BigDecimal) this.getModel().getValue("drawamount"); + break; + case "fl_receiptbill": + drawamount=(BigDecimal) this.getModel().getValue("drawamount"); + break; + case "lc_lettercredit": + drawamount=(BigDecimal) this.getModel().getValue("amount"); + break; + default: + drawamount=(BigDecimal) this.getModel().getValue("drawamount"); + break; + + } if (shkd_syed.compareTo(drawamount)<0){ this.getModel().setValue("shkd_baed",null); - this.getView().showTipNotification("该备案申请剩余额度不足"); + this.getView().showTipNotification("该备案申请剩余额度不总"); return; } } diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/operation/SubmitOccupyFilingApplication.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/operation/SubmitOccupyFilingApplication.java index 7d113c5..56a7181 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/operation/SubmitOccupyFilingApplication.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/operation/SubmitOccupyFilingApplication.java @@ -103,8 +103,22 @@ public class SubmitOccupyFilingApplication extends AbstractOperationServicePlugI zqfxmap.put("shkd_org",fl_leasecontractbill.getLong("org.id")); rzzllist.add(zqfxmap); } + + //开证处理lc_lettercredit + List> kzcllist = new ArrayList<>(); + DynamicObject[] lc_lettercredits = BusinessDataServiceHelper.load("lc_lettercredit", "id,billno,org.id,amount,amountscaleupper", zqfxqFilter.toArray()); + for (DynamicObject lc_lettercredit : lc_lettercredits) { + Map zqfxmap=new HashMap<>(); + zqfxmap.put("shkd_djbh",lc_lettercredit.getString("billno")); + zqfxmap.put("shkd_djlx","开证处理"); + BigDecimal amountscaleupper = lc_lettercredit.getBigDecimal("amountscaleupper").divide(BigDecimal.valueOf(100)).add(BigDecimal.ONE); + zqfxmap.put("shkd_zyje",lc_lettercredit.getBigDecimal("amount").multiply(amountscaleupper)); + zqfxmap.put("shkd_org",lc_lettercredit.getLong("org.id")); + kzcllist.add(zqfxmap); + } + //合并 - List> hebinList=hebinList(zqfxlist,rzzllist); + List> hebinList=hebinLists(zqfxlist,rzzllist,kzcllist); // 使用Stream计算shkd_zyje的合计 BigDecimal hebintotal = hebinList.stream() // 将zqfxlist转为Stream .map(map -> (BigDecimal) map.get("shkd_zyje")) // 提取shkd_zyje的值 @@ -158,10 +172,15 @@ public class SubmitOccupyFilingApplication extends AbstractOperationServicePlugI /* * 合并集合方法 * */ - private List> hebinList(List> zqfxlist, List> rzzllist) { + private List> hebinLists(List>... lists) { // 创建一个新的集合来存储合并后的数据 - List> mergedList = new ArrayList<>(rzzllist); // 将rzzllist的元素拷贝到新集合中 - mergedList.addAll(zqfxlist); // 将zqfxlist的元素添加到新集合中 + List> mergedList = new ArrayList<>(); + + // 遍历所有传入的列表并将其合并 + for (List> list : lists) { + mergedList.addAll(list); // 将当前列表的元素添加到新集合中 + } + return mergedList; }