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

Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
陈绍鑫 2025-05-09 16:41:27 +08:00
parent 1ceccc179b 9a93bf2537
commit 7d7fe497ba
2 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/tmc/BondSelectEntryOrgPlugin.java
View File

@ -57,9 +57,12 @@ public class BondSelectEntryOrgPlugin extends AbstractBillPlugIn implements Plug
evt.setCancel(true); evt.setCancel(true);
return; return;
} }
Date startdate = (Date)this.getView().getModel().getValue("startdate"); Date startdate = new Date();
if(startdate == null){ String entityId = this.getView().getEntityId();
if ("cfm_loanbill_bond".equals(entityId)){
startdate = (Date)this.getView().getModel().getValue("bizdate"); 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()); QFilter accountQFilter = new QFilter("org.id", QCP.equals, shkdEnryborrower.getPkValue());
//发行日期 >= 提款单放款日期 //发行日期 >= 提款单放款日期

76
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/tmc/inputBondEntryDataPlugin.java
View File

@ -39,7 +39,44 @@ public class inputBondEntryDataPlugin extends AbstractBillPlugIn implements Plug
//融资余额 //融资余额
this.getModel().setValue("shkd_notrepayamount", null, rowIndex); this.getModel().setValue("shkd_notrepayamount", null, rowIndex);
} else { } 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); 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); 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 @Override