From f148079ddd64c6a6f6bf902b760bbde267d8f1cc Mon Sep 17 00:00:00 2001 From: tangfutang <3218982385@qq.com> Date: Mon, 2 Aug 2021 09:59:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E6=AE=B5=E8=9E=8D?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanSimulation/LCCalcSubsectionInfoTempList.jsp | 9 +++++++++ calc/com/tenwa/reckon/product/ProductCondition.java | 8 ++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/WebContent/Accounting/LoanSimulation/LCCalcSubsectionInfoTempList.jsp b/WebContent/Accounting/LoanSimulation/LCCalcSubsectionInfoTempList.jsp index 69796348c..fb85aa3a6 100644 --- a/WebContent/Accounting/LoanSimulation/LCCalcSubsectionInfoTempList.jsp +++ b/WebContent/Accounting/LoanSimulation/LCCalcSubsectionInfoTempList.jsp @@ -12,6 +12,15 @@ doTemp.setHtmlEvent( "DISCOUNT_RATE", "onblur", "changeDiscountRate" ); doTemp.setHtmlEvent( "CLEAN_LEASE_RATIO", "onblur", "changeCleanLeaseRatio" ); doTemp.setHtmlEvent( "CLEAN_LEASE_MONEY", "onblur", "changeCleanLeaseMoney" ); + String discountCalcMethod = Sqlca.getString("select DISCOUNT_CALC_METHOD from LC_CALC_SUBSECTION_INFO_TEMP where FLOWUNID='"+flowunid+"'"); + if(discountCalcMethod != null && discountCalcMethod.equals("1")){ + doTemp.setReadOnly("DISCOUNT",true); + doTemp.setReadOnly("DISCOUNT_RATE",false); + }else{ + doTemp.setReadOnly("DISCOUNT",false); + doTemp.setReadOnly("DISCOUNT_RATE",true); + } + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //--设置为Grid风格-- dwTemp.ReadOnly = "0"; //只读模式 diff --git a/calc/com/tenwa/reckon/product/ProductCondition.java b/calc/com/tenwa/reckon/product/ProductCondition.java index 2f6161b84..8beef300f 100644 --- a/calc/com/tenwa/reckon/product/ProductCondition.java +++ b/calc/com/tenwa/reckon/product/ProductCondition.java @@ -767,12 +767,16 @@ public class ProductCondition { "Rate", "Discount", "DiscountRate", "DiscountCalcMethod", "IsBalanceLending", "DiscountCollectionPeriod", "MaximumDiscount" ); List> sf = configs.get( "segmented_financing" ); int i = 1; + String discountCalcMethod = null ; for ( Map f : sf ) { - String discountCalcMethod = f.get( "DiscountCalcMethod" ); + if(discountCalcMethod == null || discountCalcMethod.isEmpty()){ + discountCalcMethod = f.get("DiscountCalcMethod"); + } + //String discountCalcMethod = f.get( "DiscountCalcMethod" ); BizObject bo = bom.newObject(); bo.setAttributeValue( "SUBSECTION_NUMBER", i ); bo.setAttributeValue( "RATE", f.get( "Rate" ) ); - bo.setAttributeValue( "DISCOUNT_CALC_METHOD", f.get( "DiscountCalcMethod" ) ); + bo.setAttributeValue( "DISCOUNT_CALC_METHOD", discountCalcMethod ); if ( "1".equals( discountCalcMethod ) ) { bo.setAttributeValue( "DISCOUNT_RATE", f.get( "DiscountRate" ) ); bo.setAttributeValue( "FINANCING_RATE", f.get( "DiscountRate" ) );