提交人：陈绍鑫

日期：2025/11/17 17：30
内容:备案申请

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

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<Map<String, Object>> 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<String,Object> 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<Map<String, Object>> hebinList=hebinList(zqfxlist,rzzllist);
+        List<Map<String, Object>> 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<Map<String, Object>> hebinList(List<Map<String, Object>> zqfxlist, List<Map<String, Object>> rzzllist) {
+    private List<Map<String, Object>> hebinLists(List<Map<String, Object>>... lists) {
         // 创建一个新的集合来存储合并后的数据
-        List<Map<String, Object>> mergedList = new ArrayList<>(rzzllist);  // 将rzzllist的元素拷贝到新集合中
+        List<Map<String, Object>> mergedList = new ArrayList<>();
-        mergedList.addAll(zqfxlist);  // 将zqfxlist的元素添加到新集合中
+
+        // 遍历所有传入的列表并将其合并
+        for (List<Map<String, Object>> list : lists) {
+            mergedList.addAll(list);  // 将当前列表的元素添加到新集合中
+        }
+
         return mergedList;
     }