From c2383bb6ca0eab8fd82135c5de05343de333dab9 Mon Sep 17 00:00:00 2001
From: tangfutang <3218982385@qq.com>
Date: Sun, 12 Sep 2021 20:33:05 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=8A=A1?=
=?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=B5=8B=E7=AE=97=E8=B4=B4=E6=81=AF=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
WebContent/WEB-INF/etc/app/component/component-config.xml | 2 +-
calc/com/tenwa/reckon/executor/SegmentedFinancingExecutor.java | 2 +-
calc/com/tenwa/reckon/product/ProductCondition.java | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/WebContent/WEB-INF/etc/app/component/component-config.xml b/WebContent/WEB-INF/etc/app/component/component-config.xml
index 147a9f006..12ef6a5fa 100644
--- a/WebContent/WEB-INF/etc/app/component/component-config.xml
+++ b/WebContent/WEB-INF/etc/app/component/component-config.xml
@@ -1107,4 +1107,4 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/calc/com/tenwa/reckon/executor/SegmentedFinancingExecutor.java b/calc/com/tenwa/reckon/executor/SegmentedFinancingExecutor.java
index 6b3dcf76c..bb9d3d89f 100644
--- a/calc/com/tenwa/reckon/executor/SegmentedFinancingExecutor.java
+++ b/calc/com/tenwa/reckon/executor/SegmentedFinancingExecutor.java
@@ -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) ) ) {
diff --git a/calc/com/tenwa/reckon/product/ProductCondition.java b/calc/com/tenwa/reckon/product/ProductCondition.java
index 9646dbf79..b1d7cec2f 100644
--- a/calc/com/tenwa/reckon/product/ProductCondition.java
+++ b/calc/com/tenwa/reckon/product/ProductCondition.java
@@ -354,6 +354,7 @@ public class ProductCondition {
sb.append("{");
//获取产品资金项
Map> map=ProductParamUtil.getProductComponentType(productId, "PRD0315");
+ map.remove("DISCOUNT");
//获取需要和产品关联的资金项
String sql="";
// if("MYSQL".equals(InitDBType.DBTYPE)){
From 56b3dbceb27857831eb5462d25d9d9660a767271 Mon Sep 17 00:00:00 2001
From: tangfutang <3218982385@qq.com>
Date: Tue, 14 Sep 2021 14:04:45 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E6=AE=B5?=
=?UTF-8?q?=E8=9E=8D=E5=AD=97=E6=AE=B5=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
index 3a76b569d..0d4593a98 100644
--- a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
+++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
@@ -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' );
From 189af22e7800c9f80bf1fe0fc2cf76bafc4941df Mon Sep 17 00:00:00 2001
From: yjf <2211675158@qq.com>
Date: Tue, 14 Sep 2021 21:51:45 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B4=B4=E6=81=AF?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
WebContent/WEB-INF/etc/jbo/jbo_calc.xml | 2 ++
src_jbo/jbo/app/tenwa/calc/LC_CALC_SUBSECTION_INFO.java | 4 ++++
src_jbo/jbo/app/tenwa/calc/LC_CALC_SUBSECTION_INFO_HIS.java | 4 ++++
3 files changed, 10 insertions(+)
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
index 6fcd20ff1..35850752c 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
@@ -4681,6 +4681,7 @@
+
@@ -4724,6 +4725,7 @@
+
diff --git a/src_jbo/jbo/app/tenwa/calc/LC_CALC_SUBSECTION_INFO.java b/src_jbo/jbo/app/tenwa/calc/LC_CALC_SUBSECTION_INFO.java
index 4957803a7..f2141980c 100644
--- a/src_jbo/jbo/app/tenwa/calc/LC_CALC_SUBSECTION_INFO.java
+++ b/src_jbo/jbo/app/tenwa/calc/LC_CALC_SUBSECTION_INFO.java
@@ -145,4 +145,8 @@ public interface LC_CALC_SUBSECTION_INFO{
* 融资金额最小值 STRING(10)
*/
public static final String MIN_LEASE_MONEY = "MIN_LEASE_MONEY";
+ /**
+ * 贴息金额
+ */
+ public static final String DISCOUNT_INTEREST = "DISCOUNT_INTEREST";
}
\ No newline at end of file
diff --git a/src_jbo/jbo/app/tenwa/calc/LC_CALC_SUBSECTION_INFO_HIS.java b/src_jbo/jbo/app/tenwa/calc/LC_CALC_SUBSECTION_INFO_HIS.java
index d834134ed..fdce07460 100644
--- a/src_jbo/jbo/app/tenwa/calc/LC_CALC_SUBSECTION_INFO_HIS.java
+++ b/src_jbo/jbo/app/tenwa/calc/LC_CALC_SUBSECTION_INFO_HIS.java
@@ -146,4 +146,8 @@ public interface LC_CALC_SUBSECTION_INFO_HIS{
* 融资金额最小值 STRING(32
*/
public static final String MIN_LEASE_MONEY = "MIN_LEASE_MONEY";
+ /**
+ * 贴息金额
+ */
+ public static final String DISCOUNT_INTEREST = "DISCOUNT_INTEREST";
}
\ No newline at end of file