修改商务条件测算贴息字段

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) ) ) {

calc/com/tenwa/reckon/product/ProductCondition.java

@@ -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)){