anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改综合利率计算和显示

Browse Source
This commit is contained in:
tangfutang 2021-09-02 10:22:36 +08:00
parent 33f062ee93
commit c51894a2ff
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
View File

@ -900,8 +900,10 @@ function changeSettleMethod2(){
}
document.all( 'A_Group_0020' ).style.display = 'none';
showItem(0,"SUBSECTION_CONDIG",'none');
showItem(0,"COMPREHENSIVE_RATE",'none');
if ( settleMethod === 'segmented_financing' ) {
showItem(0,"SUBSECTION_CONDIG",'block');
showItem(0,"COMPREHENSIVE_RATE",'block');
document.all( 'A_Group_0020' ).style.display = 'block';
var param = 'CompClientID=<%=compClientID%>&flowunid=<%=flowunid%>&plannumber=<%=plannumber%>&planCName=<%=planCName%>&IsHistory=<%=ishistory%>&NodeNo=<%=nodeNo%>&calType=<%=calType%>';
AsControl.OpenView( '/Accounting/LoanSimulation/LCCalcSubsectionInfoTempList.jsp', param, 'subsection_list' );

15
calc/com/tenwa/reckon/executor/CashFlowExecutor.java
View File

@ -57,10 +57,19 @@ public class CashFlowExecutor {
dateList.add(cash.get("PLAN_DATE"));
}
if ("subsectionRate".equals(calcType) ){
String cleanLeaseMoney = cb.getCleanLeaseMoney();
netList.set(0,"-"+cleanLeaseMoney);
String subsectionSql = "select IS_BALANCE_LENDING,DISCOUNT,DISCOUNT_COLLECTION_PERIOD from lc_calc_subsection_info_temp where FLOWUNID='"+tcb.getDocId()+"'";
List<Map<String, String>> subsectionData =DataOperatorUtil.getDataBySql(tx, subsectionSql, null);
BigDecimal tempMoney = BigDecimal.ZERO;
int coss = 0;
for (Map<String, String> subsection :subsectionData) {
String ibl = subsection.get("IS_BALANCE_LENDING");
if(!"Y".equals(ibl)){
coss = Integer.parseInt( subsection.get("DISCOUNT_COLLECTION_PERIOD") );
}
tempMoney = new BigDecimal( netList.get(coss) );
netList.set(coss, ( tempMoney.subtract( new BigDecimal( subsection.get("DISCOUNT") ) ) ).toString() );
}
}
String irr="";
if("STAGE_IRR".equals(cb.getIrrType())){//°´ÆÚIRR
BigDecimal issueRate=IRRCalculateUtil.getIRR2(netList);