From 1adb175c3807d39a1cab5b9a5dc8b2bf7ca4529d Mon Sep 17 00:00:00 2001
From: yjf <2211675158@qq.com>
Date: Thu, 9 Sep 2021 17:54:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B4=E6=81=AF=E5=AD=97=E6=AE=B5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LCCalcSubsectionInfoTempList.jsp          | 16 +++++------
 .../LoanSimulation/LoanBasicInfo.jsp          | 27 ++++++++++---------
 WebContent/WEB-INF/etc/jbo/jbo_calc.xml       |  1 +
 .../reckon/executor/CashFlowExecutor.java     |  4 +--
 .../executor/SegmentedFinancingExecutor.java  |  6 ++---
 .../reckon/product/ProductCondition.java      |  6 +++--
 .../calc/LC_CALC_SUBSECTION_INFO_TEMP.java    |  4 +++
 7 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/WebContent/Accounting/LoanSimulation/LCCalcSubsectionInfoTempList.jsp b/WebContent/Accounting/LoanSimulation/LCCalcSubsectionInfoTempList.jsp
index cefb3c1a8..f9244329d 100644
--- a/WebContent/Accounting/LoanSimulation/LCCalcSubsectionInfoTempList.jsp
+++ b/WebContent/Accounting/LoanSimulation/LCCalcSubsectionInfoTempList.jsp
@@ -8,7 +8,7 @@
     String flowunid = CurPage.getParameter("flowunid");
 	String projectId = CurPage.getParameter("projectId");
 	ASObjectModel doTemp = new ASObjectModel("LCCalcSubsectionInfoTemp");
-	doTemp.setHtmlEvent( "DISCOUNT", "onblur", "changeDiscount" );
+	doTemp.setHtmlEvent( "DISCOUNT_INTEREST", "onblur", "changeDiscount" );
 	doTemp.setHtmlEvent( "DISCOUNT_RATE", "onblur", "changeDiscountRate" );
 	doTemp.setHtmlEvent( "CLEAN_LEASE_RATIO", "onblur", "changeCleanLeaseRatio" );
 	doTemp.setHtmlEvent( "CLEAN_LEASE_MONEY", "onblur", "changeCleanLeaseMoney" );
@@ -16,16 +16,16 @@
 	String discountCalcMethod = Sqlca.getString("select DISCOUNT_CALC_METHOD from LC_CALC_SUBSECTION_INFO_TEMP where  FLOWUNID='"+flowunid+"'");
 	if(discountCalcMethod != null){
 		if(discountCalcMethod.equals("1")){
-			doTemp.setReadOnly("DISCOUNT",true);
+			doTemp.setReadOnly("DISCOUNT_INTEREST",true);
 			doTemp.setReadOnly("DISCOUNT_RATE",false);
 		}else if (discountCalcMethod.equals("2")){
-			doTemp.setReadOnly("DISCOUNT",false);
+			doTemp.setReadOnly("DISCOUNT_INTEREST",false);
 			doTemp.setReadOnly("DISCOUNT_RATE",true);
 		}else if (discountCalcMethod.equals("3")){//固定值，对应的值改为只读
 			doTemp.setReadOnly("DISCOUNT_RATE",true);
 			doTemp.setReadOnly("FINANCING_RATE",true);
 			doTemp.setReadOnly("INCOME_NUMBER",true);
-			doTemp.setReadOnly("DISCOUNT",true);
+			doTemp.setReadOnly("DISCOUNT_INTEREST",true);
 		}
 	}
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
@@ -43,19 +43,19 @@
 <script type="text/javascript">
 	function changeDiscount() {
 		var discountCalcMethod = getItemValue( 0, getRow(), 'DISCOUNT_CALC_METHOD' );
-		var discount = getItemValue( 0, getRow(), 'DISCOUNT' );
+		var discount = getItemValue( 0, getRow(), 'DISCOUNT_INTEREST' );
 		if ( '2' === discountCalcMethod ) {
 			var maximumDiscount = getItemValue( 0, getRow(), 'MAXIMUM_DISCOUNT' );
 			if ( discount ) {
 				if ( Decimal( discount ).gt( maximumDiscount ) ) {
 					alert( '贴息金额超出最大贴息金额，请重新输入' );
-					setItemValue( 0, getRow(), 'DISCOUNT', '' );
+					setItemValue( 0, getRow(), 'DISCOUNT_INTEREST', '' );
 				}
 			}
 		} else {
 			if ( discount ) {
 				alert( '贴息计算方式为根据利率计算金额，不需要输入贴息金额' );
-				setItemValue( 0, getRow(), 'DISCOUNT', '' );
+				setItemValue( 0, getRow(), 'DISCOUNT_INTEREST', '' );
 			}
 		}
 	}
@@ -138,7 +138,7 @@
 			}
 			var discountCalcMethod = getItemValue( 0, i, 'DISCOUNT_CALC_METHOD' );
 			if ( '2' === discountCalcMethod ) {
-				var discount = getItemValue( 0, i, 'DISCOUNT' );
+				var discount = getItemValue( 0, i, 'DISCOUNT_INTEREST' );
 				if ( '' === discount ) {
 					alert( '请填写第' + ( i + 1 ) + '行贴息金额' );
 					return;
diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
index 265eb43b7..3a76b569d 100644
--- a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
+++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
@@ -282,20 +282,21 @@ $(function(){
 		//CalcControl.RentOrRateView();
 		var inerNumber = $("#INCOME_NUMBER").val();
 		$("#INCOME_NUMBER").empty();
-		var inNumber=calcRules['incomeNumber']['INCOME_NUMBER'];
-		inNumber=inNumber.split(",");
-		var inco={};
-		for(var i=0;i<inNumber.length;i++){
-			inco[inNumber[i]]="1";
+        var inNumber=calcRules['incomeNumber']['INCOME_NUMBER'];
+        if(typeof inNumber != 'undefined'){
+            inNumber=inNumber.split(",");
+            var inco={};
+            for(var i=0;i<inNumber.length;i++){
+                inco[inNumber[i]]="1";
+            }
+            $(incomeNumber).each(function(){
+                var value=$(this).attr("value");
+                if(inco[value]==1){
+                    $("#INCOME_NUMBER").append(this);
+                }
+            });
+            $("#INCOME_NUMBER").val(inerNumber);
 		}
-		$(incomeNumber).each(function(){
-			var value=$(this).attr("value");
-			if(inco[value]==1){
-				$("#INCOME_NUMBER").append(this);
-			}
-		});
-		$("#INCOME_NUMBER").val(inerNumber);
-
 		count++;
 	}else{
 		changeSettleMethod3();
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
index d93d5b429..6fcd20ff1 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
@@ -4768,6 +4768,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>
diff --git a/calc/com/tenwa/reckon/executor/CashFlowExecutor.java b/calc/com/tenwa/reckon/executor/CashFlowExecutor.java
index 628782c26..c0fe537ac 100644
--- a/calc/com/tenwa/reckon/executor/CashFlowExecutor.java
+++ b/calc/com/tenwa/reckon/executor/CashFlowExecutor.java
@@ -57,7 +57,7 @@ public class CashFlowExecutor {
 	    		dateList.add(cash.get("PLAN_DATE"));
 	    	}
 			if ("subsectionRate".equals(calcType) ){
-				String subsectionSql = "select IS_BALANCE_LENDING,DISCOUNT,DISCOUNT_COLLECTION_PERIOD from lc_calc_subsection_info_temp where FLOWUNID='"+tcb.getDocId()+"'";
+				String subsectionSql = "select IS_BALANCE_LENDING,DISCOUNT_INTEREST,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;
@@ -67,7 +67,7 @@ public class CashFlowExecutor {
 						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() );
+					netList.set(coss, ( tempMoney.subtract( new BigDecimal( subsection.get("DISCOUNT_INTEREST") ) ) ).toString() );
 				}
 		  	}
     	    String irr="";
diff --git a/calc/com/tenwa/reckon/executor/SegmentedFinancingExecutor.java b/calc/com/tenwa/reckon/executor/SegmentedFinancingExecutor.java
index 02a0cb96b..6b3dcf76c 100644
--- a/calc/com/tenwa/reckon/executor/SegmentedFinancingExecutor.java
+++ b/calc/com/tenwa/reckon/executor/SegmentedFinancingExecutor.java
@@ -76,7 +76,7 @@ public class SegmentedFinancingExecutor extends FundRentPlanExecutor {
                 String afterDiscountRent = RentTools.getPMT( preDiscountRate.toString(), incomeNumber.toString(), cleanLeaseMoney.negate().toString(), "0", "0" );
                 // 计算贴息
                 BigDecimal discount = new BigDecimal( rent ).setScale( 2, 4 ).multiply( incomeNumber ).subtract( new BigDecimal( afterDiscountRent ).setScale( 2, 4 ).multiply( incomeNumber ) );
-                bo.setAttributeValue( "DISCOUNT", discount );
+                bo.setAttributeValue( "DISCOUNT_INTEREST", discount );
 
                 String fr = bo.getAttribute( "FINANCING_RATE" ).getString();
 
@@ -90,7 +90,7 @@ public class SegmentedFinancingExecutor extends FundRentPlanExecutor {
                 bom.saveObject( bo );
             } else if("2".equals( discountCalcMethod )) { //根据金额算利率
                 // 贴息金额
-                BigDecimal discount = new BigDecimal( bo.getAttribute( "DISCOUNT" ).getString() );
+                BigDecimal discount = new BigDecimal( bo.getAttribute( "DISCOUNT_INTEREST" ).getString() );
                 // 标准利率计算租金
                 String rent = RentTools.getPMT( preRate.toString(), incomeNumber.toString(), cleanLeaseMoney.negate().toString(), "0", "0" );
                 // 贴息后租金
@@ -117,7 +117,7 @@ public class SegmentedFinancingExecutor extends FundRentPlanExecutor {
                 throw new BusinessException( "分段信息没有配置计算规则，无法测算！" );
             }
             //校验贴息是否在配置的区间内
-            BigDecimal discountCheck = new  BigDecimal( bo.getAttribute( "DISCOUNT" ).getString() );
+            BigDecimal discountCheck = new  BigDecimal( bo.getAttribute( "DISCOUNT_INTEREST" ).getString() );
             if ( !( discountCheck.compareTo( new BigDecimal( bo.getAttribute( "MAXIMUM_DISCOUNT" ).getString() ) ) <= 0 && discountCheck.compareTo( new BigDecimal(  bo.getAttribute( "MINIMUM_DISCOUNT" ).getString()  ) ) >= 0 ) ) {
                 throw new BusinessException( "分段融的第"+subsectionNumber+"段的贴息金额不在产品配置的区间内！" );
             }
diff --git a/calc/com/tenwa/reckon/product/ProductCondition.java b/calc/com/tenwa/reckon/product/ProductCondition.java
index 9a2174ab0..9646dbf79 100644
--- a/calc/com/tenwa/reckon/product/ProductCondition.java
+++ b/calc/com/tenwa/reckon/product/ProductCondition.java
@@ -783,11 +783,13 @@ public class ProductCondition {
 						bo.setAttributeValue( "DISCOUNT_RATE", f.get( "DiscountRate" ) );
 						bo.setAttributeValue( "FINANCING_RATE", f.get( "DiscountRate" ) );
 					} else if( "2".equals( discountCalcMethod ) ){
-						bo.setAttributeValue( "DISCOUNT", f.get( "Discount" ) );
+//						bo.setAttributeValue( "DISCOUNT", f.get( "Discount" ) );
+						bo.setAttributeValue( "DISCOUNT_INTEREST", f.get( "Discount" ) );
 					}else if ( "3".equals( discountCalcMethod ) ){
 						bo.setAttributeValue( "DISCOUNT_RATE", f.get( "DiscountRate" ) );
 						bo.setAttributeValue( "FINANCING_RATE", f.get( "DiscountRate" ) );
-						bo.setAttributeValue( "DISCOUNT", f.get( "Discount" ) );
+//						bo.setAttributeValue( "DISCOUNT", f.get( "Discount" ) );
+						bo.setAttributeValue( "DISCOUNT_INTEREST", f.get( "Discount" ) );
 					}
 					String isBalanceLending = f.get( "IsBalanceLending" );
 					bo.setAttributeValue( "IS_BALANCE_LENDING", isBalanceLending );
diff --git a/src_jbo/jbo/app/tenwa/calc/LC_CALC_SUBSECTION_INFO_TEMP.java b/src_jbo/jbo/app/tenwa/calc/LC_CALC_SUBSECTION_INFO_TEMP.java
index 794c431a5..dd39e5808 100644
--- a/src_jbo/jbo/app/tenwa/calc/LC_CALC_SUBSECTION_INFO_TEMP.java
+++ b/src_jbo/jbo/app/tenwa/calc/LC_CALC_SUBSECTION_INFO_TEMP.java
@@ -149,4 +149,8 @@ public interface LC_CALC_SUBSECTION_INFO_TEMP{
 	 * 融资金额最小值 STRING(32<br>
 	 */
 	public static final String MIN_LEASE_MONEY = "MIN_LEASE_MONEY";
+	/**
+	 * 贴息金额
+	 */
+	public static final String DISCOUNT_INTEREST = "DISCOUNT_INTEREST";
 }
\ No newline at end of file