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

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

Browse Source
This commit is contained in:
maliang 2021-09-16 18:28:04 +08:00
commit 579aa3c35f
7 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -903,9 +903,13 @@ function changeSettleMethod2(){
document.all( 'A_Group_0020' ).style.display = 'none';
showItem(0,"SUBSECTION_CONDIG",'none');
showItem(0,"COMPREHENSIVE_RATE",'none');
showItem(0,"INCOME_NUMBER",'block');
showItem(0,"YEAR_RATE",'block');
if ( settleMethod === 'segmented_financing' ) {
showItem(0,"SUBSECTION_CONDIG",'block');
showItem(0,"COMPREHENSIVE_RATE",'block');
showItem(0,"INCOME_NUMBER",'none');
showItem(0,"YEAR_RATE",'none');
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' );
@ -1549,8 +1553,14 @@ function changeSettleMethod3(){
var settleMethod=getItemValue(0,0,"SETTLE_METHOD");
document.all( 'A_Group_0020' ).style.display = 'none';
showItem(0,"SUBSECTION_CONDIG",'none');
showItem(0,"COMPREHENSIVE_RATE",'none');
showItem(0,"INCOME_NUMBER",'block');
showItem(0,"YEAR_RATE",'block');
if ( settleMethod === 'segmented_financing' ) {
showItem(0,"SUBSECTION_CONDIG",'block');
showItem(0,"COMPREHENSIVE_RATE",'block');
showItem(0,"INCOME_NUMBER",'none');
showItem(0,"YEAR_RATE",'none');
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' );

2
WebContent/WEB-INF/etc/app/component/component-config.xml
View File

File diff suppressed because one or more lines are too long

2
WebContent/WEB-INF/etc/jbo/jbo_calc.xml
View File

@ -4681,6 +4681,7 @@
<attribute name="MAX_INCOME_NUMBER" label="最大期次" type="STRING" length="32"/>
<attribute name="MIN_INCOME_NUMBER" label="最小期次" type="STRING" length="32"/>
<attribute name="MIN_LEASE_MONEY" label="融资金额最小值" type="STRING" length="32"/>
<attribute name="DISCOUNT_INTEREST" label="贴息金额" type="DOUBLE" length="18" scale="2"/>
</attributes>
<manager>
<managerProperties>
@ -4724,6 +4725,7 @@
<attribute name="MAX_INCOME_NUMBER" label="最大期次" type="STRING" length="32"/>
<attribute name="MIN_INCOME_NUMBER" label="最小期次" type="STRING" length="32"/>
<attribute name="MIN_LEASE_MONEY" label="融资金额最小值" type="STRING" length="32"/>
<attribute name="DISCOUNT_INTEREST" label="贴息金额" type="DOUBLE" length="18" scale="2"/>
</attributes>
<manager>
<managerProperties>

2
calc/com/tenwa/reckon/executor/SegmentedFinancingExecutor.java
View File

@ -100,7 +100,7 @@ public class SegmentedFinancingExecutor extends FundRentPlanExecutor {
for ( int i = 0; i < incomeNumber.intValue(); i ++ ) {
cashFlow.add( afterDiscountRent );
}
BigDecimal discountRate = getIRR( cashFlow, incomeNumberYear ).setScale( 6, 4 );
BigDecimal discountRate = getIRR( cashFlow, incomeNumberYear ).setScale( 2, 4 );//客户要求，只汽车只保留后小数点后两位
bo.setAttributeValue( "DISCOUNT_RATE", discountRate.toString() );
String fr = bo.getAttribute( "FINANCING_RATE" ).getString();
if ( StringUtils.isEmpty( fr ) || ( iulma!=null && "Y".equals(iulma) ) ) {

1
calc/com/tenwa/reckon/product/ProductCondition.java
View File

@ -354,6 +354,7 @@ public class ProductCondition {
sb.append("{");
//获取产品资金项
Map<String,Map<String,String>> map=ProductParamUtil.getProductComponentType(productId, "PRD0315");
map.remove("DISCOUNT");
//获取需要和产品关联的资金项
String sql="";
// if("MYSQL".equals(InitDBType.DBTYPE)){

4
src_jbo/jbo/app/tenwa/calc/LC_CALC_SUBSECTION_INFO.java
View File

@ -145,4 +145,8 @@ public interface LC_CALC_SUBSECTION_INFO{
* ÈÚ×ʽðî×îСֵ STRING(10)<br>
*/
public static final String MIN_LEASE_MONEY = "MIN_LEASE_MONEY";
/**
* ÌùÏ¢½ðî
*/
public static final String DISCOUNT_INTEREST = "DISCOUNT_INTEREST";
}

4
src_jbo/jbo/app/tenwa/calc/LC_CALC_SUBSECTION_INFO_HIS.java
View File

@ -146,4 +146,8 @@ public interface LC_CALC_SUBSECTION_INFO_HIS{
* ÈÚ×ʽðî×îСֵ STRING(32<br>
*/
public static final String MIN_LEASE_MONEY = "MIN_LEASE_MONEY";
/**
* ÌùÏ¢½ðî
*/
public static final String DISCOUNT_INTEREST = "DISCOUNT_INTEREST";
}