From 3348fbf3092c6c86a85661a390c5aef0c8ccc3ba Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Wed, 22 Aug 2018 09:31:04 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=85=8D=E7=BD=9A=E6=81=AF=E5=A4=A9=E6=95=B0?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=BB=8E=E4=BA=A7=E5=93=81=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=EF=BC=8C=E6=94=B9=E4=B8=BA=E4=BB=8E=E8=8F=9C=E5=8D=95=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../VehicleEvaluation/LBEquipmentCarTempInfo.jsp       |  2 +-
 calc/com/tenwa/reckon/product/ProductCondition.java    | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/WebContent/Tenwa/Lease/App/Interface/VehicleEvaluation/LBEquipmentCarTempInfo.jsp b/WebContent/Tenwa/Lease/App/Interface/VehicleEvaluation/LBEquipmentCarTempInfo.jsp
index af92a208e..fd4b87282 100644
--- a/WebContent/Tenwa/Lease/App/Interface/VehicleEvaluation/LBEquipmentCarTempInfo.jsp
+++ b/WebContent/Tenwa/Lease/App/Interface/VehicleEvaluation/LBEquipmentCarTempInfo.jsp
@@ -10,7 +10,7 @@
 	if(sPrevUrl == null) sPrevUrl = "/Tenwa/Lease/App/Interface/VehicleEvaluation/LBEquipmentCarTempList.jsp";
 	String sTempletNo = "LBEquipmentCarTempInfo";//--模板号--
 	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
-	doTemp.setColTips("", "万元");
+	//doTemp.setColTips("", "万元");
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
 	dwTemp.Style = "2";//freeform
 	//dwTemp.ReadOnly = "-2";//只读模式
diff --git a/calc/com/tenwa/reckon/product/ProductCondition.java b/calc/com/tenwa/reckon/product/ProductCondition.java
index a7ebd9a6b..c3fc9f21d 100644
--- a/calc/com/tenwa/reckon/product/ProductCondition.java
+++ b/calc/com/tenwa/reckon/product/ProductCondition.java
@@ -7,6 +7,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Vector;
 
+import jbo.com.tenwa.lease.comm.CONFIGURATE;
 import jbo.sys.CODE_LIBRARY;
 import apx.com.amarsoft.als.apzl.apply.business.loan.product.ProductBaseLoanTools;
 
@@ -559,7 +560,7 @@ public class ProductCondition {
 	 */
 	public void getProductPenaRules(ASObjectModel doTemp,String productId) throws Exception{
 		Map<String,Map<String,String>> map=ProductParamUtil.getProductComponentType(productId, "PRD0308");
-		if(map.containsKey("PFD01")){//免罚息天数
+		/*if(map.containsKey("PFD01")){//免罚息天数
 			String day=map.get("PFD01").get("PenaltyFreeDays");
 			if(day.length()>0){
 				doTemp.setDefaultValue("FREE_DEFA_INTER_DAY", day);
@@ -567,7 +568,12 @@ public class ProductCondition {
 			if("N".equals(map.get("PFD01").get("AllowModify"))){
 				doTemp.setColumnAttribute("FREE_DEFA_INTER_DAY","colreadonly", "1");
 			}
-		}
+		}*/
+		BizObject bo = JBOFactory.createBizObjectQuery(CONFIGURATE.CLASS_NAME,"ATTR_ID=:attrId")
+				.setParameter("attrId","免罚息天数配置").getSingleResult(false);
+		String day = (bo==null)?"":bo.getAttribute("ATTR_VALUE").getString();
+		doTemp.setDefaultValue("FREE_DEFA_INTER_DAY", day);
+		
 		if(map.containsKey("PENALTY_RATE_DAY")){//罚息日利率
 			String rate=map.get("PENALTY_RATE_DAY").get("PENALTY_RATE_DAY");
 			if(rate.length()>0){