From 9a93bf2537caee64b8a7dff6b186081c362f8124 Mon Sep 17 00:00:00 2001 From: 16358 <1635849544@qq.com> Date: Fri, 9 May 2025 13:58:45 +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/5/09=2013?= =?UTF-8?q?=EF=BC=9A58=20=E5=86=85=E5=AE=B9=EF=BC=9A1=E3=80=81=E8=B5=84?= =?UTF-8?q?=E9=87=91=E7=94=A8=E9=80=94=E5=88=86=E5=BD=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/tmc/BondSelectEntryOrgPlugin.java | 7 +- .../plugin/tmc/inputBondEntryDataPlugin.java | 76 +++++++++---------- 2 files changed, 43 insertions(+), 40 deletions(-) diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/tmc/BondSelectEntryOrgPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/tmc/BondSelectEntryOrgPlugin.java index 46beab9..f71194f 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/tmc/BondSelectEntryOrgPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/tmc/BondSelectEntryOrgPlugin.java @@ -57,9 +57,12 @@ public class BondSelectEntryOrgPlugin extends AbstractBillPlugIn implements Plug evt.setCancel(true); return; } - Date startdate = (Date)this.getView().getModel().getValue("startdate"); - if(startdate == null){ + Date startdate = new Date(); + String entityId = this.getView().getEntityId(); + if ("cfm_loanbill_bond".equals(entityId)){ startdate = (Date)this.getView().getModel().getValue("bizdate"); + }else{ + startdate = (Date)this.getView().getModel().getValue("startdate"); } QFilter accountQFilter = new QFilter("org.id", QCP.equals, shkdEnryborrower.getPkValue()); //发行日期 >= 提款单放款日期 diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/tmc/inputBondEntryDataPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/tmc/inputBondEntryDataPlugin.java index 98b56af..457abc2 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/tmc/inputBondEntryDataPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/tmc/inputBondEntryDataPlugin.java @@ -39,7 +39,44 @@ public class inputBondEntryDataPlugin extends AbstractBillPlugIn implements Plug //融资余额 this.getModel().setValue("shkd_notrepayamount", null, rowIndex); } else { - DynamicObject cfm_loancontractbill = BusinessDataServiceHelper.loadSingle(cfm_loanbill_bond.get("id"), "cfm_loanbill_bond"); + DynamicObject cfm_loanbill = BusinessDataServiceHelper.loadSingle(cfm_loanbill_bond.get("id"), "cfm_loanbill_bond"); + //债券简码 + this.getModel().setValue("shkd_shortname", cfm_loanbill.get("shortname"), rowIndex); + //债券发行人 + this.getModel().setValue("shkd_entryorg", cfm_loanbill.get("org"), rowIndex); + //起息日期 + this.getModel().setValue("shkd_startintdate", cfm_loanbill.get("startintdate"), rowIndex); + //到期日期 + this.getModel().setValue("shkd_entryexpiredate", cfm_loanbill.get("expiredate"), rowIndex); + //发行金额 + this.getModel().setValue("shkd_entryamount", cfm_loanbill.get("drawamount"), rowIndex); + //发行利率 + this.getModel().setValue("shkd_startloanrate", cfm_loanbill.get("startloanrate"), rowIndex); + //融资余额 + this.getModel().setValue("shkd_notrepayamount", cfm_loanbill.get("notrepayamount"), rowIndex); + } + } + if ("shkd_loanbill".equals(name)) { + DynamicObjectCollection shkdBankcontractEntry = this.getModel().getEntryEntity("shkd_bankcontract_entry"); + DynamicObject temp = shkdBankcontractEntry.get(rowIndex); + DynamicObject shkdLoanbill = temp.getDynamicObject("shkd_loanbill"); + if (shkdLoanbill == null) { + //借款人 + this.getModel().setValue("shkd_enryborrower", null, rowIndex); + //贷款人 + this.getModel().setValue("shkd_textcreditor", null, rowIndex); + //起息日期 + this.getModel().setValue("shkd_startintdate1", null, rowIndex); + //到期日期 + this.getModel().setValue("shkd_entryexpiredate1", null, rowIndex); + //提款金额 + this.getModel().setValue("shkd_drawamount", null, rowIndex); + //融资利率 + this.getModel().setValue("shkd_startloanrate1", null, rowIndex); + //融资余额 + this.getModel().setValue("shkd_notrepayamount1", null, rowIndex); + } else { + DynamicObject cfm_loancontractbill = BusinessDataServiceHelper.loadSingle(shkdLoanbill.get("id"), "cfm_loanbill"); //借款人 this.getModel().setValue("shkd_enryborrower", cfm_loancontractbill.get("org"), rowIndex); //贷款人 @@ -56,43 +93,6 @@ public class inputBondEntryDataPlugin extends AbstractBillPlugIn implements Plug this.getModel().setValue("shkd_notrepayamount1", cfm_loancontractbill.get("notrepayamount"), rowIndex); } } - if ("shkd_loanbill".equals(name)) { - DynamicObjectCollection shkdBankcontractEntry = this.getModel().getEntryEntity("shkd_bankcontract_entry"); - DynamicObject temp = shkdBankcontractEntry.get(rowIndex); - DynamicObject shkdLoanbill = temp.getDynamicObject("shkd_loanbill"); - if (shkdLoanbill == null) { - //债券简码 - this.getModel().setValue("shkd_shortname", null, rowIndex); - //债券发行人 - this.getModel().setValue("shkd_entryorg", null, rowIndex); - //起息日期 - this.getModel().setValue("shkd_startintdate", null, rowIndex); - //到期日期 - this.getModel().setValue("shkd_entryexpiredate", null, rowIndex); - //发行金额 - this.getModel().setValue("shkd_entryamount", null, rowIndex); - //发行利率 - this.getModel().setValue("shkd_startloanrate", null, rowIndex); - //融资余额 - this.getModel().setValue("shkd_notrepayamount", null, rowIndex); - } else { - DynamicObject cfm_loanbill_bond = BusinessDataServiceHelper.loadSingle(shkdLoanbill.get("id"), "cfm_loanbill_bond"); - //债券简码 - this.getModel().setValue("shkd_shortname", cfm_loanbill_bond.get("shortname"), rowIndex); - //债券发行人 - this.getModel().setValue("shkd_entryorg", cfm_loanbill_bond.get("org"), rowIndex); - //起息日期 - this.getModel().setValue("shkd_startintdate", cfm_loanbill_bond.get("startintdate"), rowIndex); - //到期日期 - this.getModel().setValue("shkd_entryexpiredate", cfm_loanbill_bond.get("expiredate"), rowIndex); - //发行金额 - this.getModel().setValue("shkd_entryamount", cfm_loanbill_bond.get("drawamount"), rowIndex); - //发行利率 - this.getModel().setValue("shkd_startloanrate", cfm_loanbill_bond.get("startloanrate"), rowIndex); - //融资余额 - this.getModel().setValue("shkd_notrepayamount", cfm_loanbill_bond.get("notrepayamount"), rowIndex); - } - } } @Override