From 4b7d84314bfd866fd4cb140795390c329cef083c Mon Sep 17 00:00:00 2001 From: liujiaji Date: Thu, 23 Aug 2018 19:39:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=20=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reckon/product/ProductCondition.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/calc/com/tenwa/reckon/product/ProductCondition.java b/calc/com/tenwa/reckon/product/ProductCondition.java index 483d9a3d5..df75196ee 100644 --- a/calc/com/tenwa/reckon/product/ProductCondition.java +++ b/calc/com/tenwa/reckon/product/ProductCondition.java @@ -587,15 +587,19 @@ public class ProductCondition { public void getProductPenaRulesApp(List> appList,String productId) throws Exception{ Map> map=ProductParamUtil.getProductComponentType(productId, "PRD0308"); - if(map.containsKey("PFD01")){//免罚息天数 + /*if(map.containsKey("PFD01")){//免罚息天数 String day=map.get("PFD01").get("PenaltyFreeDays"); if(day.length()>0){ - ProductBaseLoanTools.addAppList(appList, "FREE_DEFA_INTER_DAY", "coldefaultvalue", day); + doTemp.setDefaultValue("FREE_DEFA_INTER_DAY", day); } if("N".equals(map.get("PFD01").get("AllowModify"))){ - ProductBaseLoanTools.addAppList(appList, "FREE_DEFA_INTER_DAY", "colreadonly", "1"); + 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(); + ProductBaseLoanTools.addAppList(appList, "FREE_DEFA_INTER_DAY", "coldefaultvalue", day); if(map.containsKey("PENALTY_RATE_DAY")){//罚息日利率 String rate=map.get("PENALTY_RATE_DAY").get("PENALTY_RATE_DAY"); if(rate.length()>0){ @@ -870,11 +874,14 @@ public class ProductCondition { //测算年利率字段 Map> productRates = ProductParamUtil.getProductComponentType(productId, "PRD0350"); Map productRate = productRates.get("product_rate"); + String periodType = ProductParamUtil.getProductParameterValue(productId, "PRD0350", "period_type", "begin_end"); + periodType = periodType == null ? "period_type_0" : periodType; + ProductBaseLoanTools.addAppList(appList, "PERIOD_TYPE", "coldefaultvalue", periodType); if(productRate != null) { String incomeNumber = productRate.get("INCOME_NUMBER") == null ? "0" : productRate.get("INCOME_NUMBER"); ProductBaseLoanTools.addAppList(appList, "INCOME_NUMBER", "coldefaultvalue", incomeNumber); - String periodType = productRate.get("begin_end") == null ? "period_type_0" : productRate.get("begin_end"); - ProductBaseLoanTools.addAppList(appList, "PERIOD_TYPE", "coldefaultvalue", periodType); +// String periodType = productRate.get("begin_end") == null ? "period_type_0" : productRate.get("begin_end"); +// ProductBaseLoanTools.addAppList(appList, "PERIOD_TYPE", "coldefaultvalue", periodType); String ProductType = productRate.get("ProductType") == null ? "0" : productRate.get("ProductType"); String isReadOnly = productRate.get("ProductRateReadOnly") == null ? "Y" : productRate.get("ProductRateReadOnly"); String YEAR_RATE = productRate.get("ProductRate") == null ? "0" : productRate.get("ProductRate");