From e44e4b6c5ff1d055f261afeb06e0ba8cb66036c1 Mon Sep 17 00:00:00 2001 From: liujiaji Date: Tue, 16 Oct 2018 10:50:56 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=A7=9F=E9=87=91=E6=B5=8B=E7=AE=97?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=20=E6=94=B9=E4=B8=BA=E5=8F=AA=E8=AF=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reckon/product/ProductCondition.java | 92 +------------------ 1 file changed, 2 insertions(+), 90 deletions(-) diff --git a/calc/com/tenwa/reckon/product/ProductCondition.java b/calc/com/tenwa/reckon/product/ProductCondition.java index 779efad36..f99440a16 100644 --- a/calc/com/tenwa/reckon/product/ProductCondition.java +++ b/calc/com/tenwa/reckon/product/ProductCondition.java @@ -8,7 +8,6 @@ import java.util.Map.Entry; import java.util.Vector; import jbo.com.tenwa.lease.comm.CONFIGURATE; -import jbo.prd.BUSINESS_TYPE; import jbo.sys.CODE_LIBRARY; import apx.com.amarsoft.als.apzl.apply.business.loan.product.ProductBaseLoanTools; @@ -50,24 +49,6 @@ public class ProductCondition { return sb.toString(); } - public String getProductRulesBusiness(ASObjectModel doTemp,String productId,Vector vali) throws Exception{ - doTemp.setDefaultValue("LEASE_AMT_DATE", DateUtil.getToday()); - StringBuilder sb=new StringBuilder(); - sb.append("{"); - sb.append("'fund':"+getProductFundRules(doTemp, productId,vali));//资金配置项 - sb.append(",'grace':"+this.getProductGraceRules(doTemp, productId, vali));//宽限期 - sb.append(",'method':"+this.getProductSettleRulesBusiness(doTemp, productId));//计算方式 - sb.append("}"); - setRentOrRate(doTemp, productId);//租金推算方法 - this.getOtherRule(doTemp, productId);//其它配置 - this.getProductPenaRules(doTemp, productId);//罚息 - this.getProductAdjustRules(doTemp, productId);//调息 - this.getGrossRules(doTemp, productId);// - //this.setDateRule(doTemp, productId);//日期 - this.getCautionRatio(doTemp, productId);//保证金比例 - return sb.toString(); - } - public String getProductRulesApp(List> appList,String productId,Vector vali) throws Exception{ ProductBaseLoanTools.addAppList(appList, "LEASE_AMT_DATE", "coldefaultvalue", DateUtil.getToday()); StringBuilder sb=new StringBuilder(); @@ -588,16 +569,9 @@ public class ProductCondition { doTemp.setColumnAttribute("FREE_DEFA_INTER_DAY","colreadonly", "1"); } }*/ - BizObject bo1 = JBOFactory.createBizObjectQuery(BUSINESS_TYPE.CLASS_NAME,"typeno=:productId") - .setParameter("productId",productId).getSingleResult(false); - String attribute2=(bo1==null)?"":bo1.getAttribute("ATTRIBUTE2").getString(); BizObject bo = JBOFactory.createBizObjectQuery(CONFIGURATE.CLASS_NAME,"ATTR_ID=:attrId") .setParameter("attrId","免罚息天数配置").getSingleResult(false); - String day="0"; - if(attribute2!=""&&"car_product".equals(attribute2)){ - day = (bo==null)?"":bo.getAttribute("ATTR_VALUE").getString(); - } - + String day = (bo==null)?"":bo.getAttribute("ATTR_VALUE").getString(); doTemp.setDefaultValue("FREE_DEFA_INTER_DAY", day); if(map.containsKey("PENALTY_RATE_DAY")){//罚息日利率 @@ -753,68 +727,6 @@ public class ProductCondition { return "{"+sJson+"}"; } - /** - * 设置计算方式 - * @param doTemp - * @param productId - * @return - * @throws Exception - */ - public String getProductSettleRulesBusiness(ASObjectModel doTemp,String productId) throws Exception{ - - //租金计算方式 - Map> map=ProductParamUtil.getProductComponentType(productId, "PRD0301"); - //分段 - Map> submap=ProductParamUtil.getProductComponentType(productId, "PRD0321"); - String s=""; - - String sJson=""; - for(Map.Entry> entry:map.entrySet()){ - if(s.length()>0)s+=","; - s+="'"+entry.getKey()+"'"; - if(sJson.length()>0)sJson+=","; - sJson+="'"+entry.getKey()+"':"+FileOperatorUtil.getMapToJsonStr(entry.getValue()); - - if(entry.getKey().equals( doTemp.getColumnAttribute("SETTLE_METHOD", "coldefaultvalue"))){ - Map values=entry.getValue(); - if(values.containsKey("HolidayAdjust")){ - doTemp.setDefaultValue("PLAN_DATE_HOILDAY", values.get("HolidayAdjust")); - } - if(values.containsKey("InterestHolidayAdjust")){ - doTemp.setDefaultValue("INTEREST_DATE_HOLIDAY", values.get("InterestHolidayAdjust")); - } - if(values.containsKey("RATE")){ - doTemp.setDefaultValue("RATE", values.get("RATE")); - } - if(values.containsKey("AdditionalRate")){ - doTemp.setDefaultValue("ADDITIONAL_RATE", values.get("AdditionalRate")); - } - if(values.containsKey("InterestDayType")){ - doTemp.setDefaultValue("INTEREST_DAY_TYPE", values.get("InterestDayType")); - } - } - } - if(submap.containsKey("ISSUBSECTION")){ - if(s.length()>0)s+=","; - s+="'even_subsection'"; - } - - /*if(s.indexOf("even_rent") != -1) { - s = "'even_rent'"; - } else if(s.indexOf("even_corpus") != -1) { - s = "'even_corpus'"; - } else { - s = "'even_interest'"; - }*/ - // doTemp.setReadOnly("SETTLE_METHOD", true); - doTemp.setColumnAttribute("SETTLE_METHOD","coleditsource","jbo.sys.CODE_LIBRARY,itemno,itemname,codeno='settle_method' and itemno in ("+s+") order by sortno"); - doTemp.setDefaultValue("SETTLE_METHOD", s.replaceAll("'", "")); - - - return "{"+sJson+"}"; - } - - public String getProductSettleRulesApp(List> appList,String productId) throws Exception{ //租金计算方式 @@ -872,7 +784,7 @@ public class ProductCondition { if(s.length()>0)s+=","; s+="'even_subsection'"; } -// ProductBaseLoanTools.addAppList(appList, "SETTLE_METHOD", "colreadonly", "1"); + ProductBaseLoanTools.addAppList(appList, "SETTLE_METHOD", "colreadonly", "1"); ProductBaseLoanTools.addAppList(appList, "SETTLE_METHOD", "coleditsource", "jbo.sys.CODE_LIBRARY,itemno,itemname,codeno='settle_method' and itemno in ("+s+") order by sortno"); ProductBaseLoanTools.addAppList(appList, "SETTLE_METHOD", "coldefaultvalue", s.replaceAll("'", "")); From 264b0c95d2ab4192d5f99ee091834caee9f4ea3f Mon Sep 17 00:00:00 2001 From: liujiaji Date: Tue, 16 Oct 2018 10:55:54 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=9B=9E=E6=BB=9A=20+=20=E7=A7=9F=E9=87=91?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=20=E5=8F=AA=E8=AF=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reckon/product/ProductCondition.java | 90 ++++++++++++++++++- 1 file changed, 89 insertions(+), 1 deletion(-) diff --git a/calc/com/tenwa/reckon/product/ProductCondition.java b/calc/com/tenwa/reckon/product/ProductCondition.java index f99440a16..df84939e2 100644 --- a/calc/com/tenwa/reckon/product/ProductCondition.java +++ b/calc/com/tenwa/reckon/product/ProductCondition.java @@ -8,6 +8,7 @@ import java.util.Map.Entry; import java.util.Vector; import jbo.com.tenwa.lease.comm.CONFIGURATE; +import jbo.prd.BUSINESS_TYPE; import jbo.sys.CODE_LIBRARY; import apx.com.amarsoft.als.apzl.apply.business.loan.product.ProductBaseLoanTools; @@ -49,6 +50,24 @@ public class ProductCondition { return sb.toString(); } + public String getProductRulesBusiness(ASObjectModel doTemp,String productId,Vector vali) throws Exception{ + doTemp.setDefaultValue("LEASE_AMT_DATE", DateUtil.getToday()); + StringBuilder sb=new StringBuilder(); + sb.append("{"); + sb.append("'fund':"+getProductFundRules(doTemp, productId,vali));//资金配置项 + sb.append(",'grace':"+this.getProductGraceRules(doTemp, productId, vali));//宽限期 + sb.append(",'method':"+this.getProductSettleRulesBusiness(doTemp, productId));//计算方式 + sb.append("}"); + setRentOrRate(doTemp, productId);//租金推算方法 + this.getOtherRule(doTemp, productId);//其它配置 + this.getProductPenaRules(doTemp, productId);//罚息 + this.getProductAdjustRules(doTemp, productId);//调息 + this.getGrossRules(doTemp, productId);// + //this.setDateRule(doTemp, productId);//日期 + this.getCautionRatio(doTemp, productId);//保证金比例 + return sb.toString(); + } + public String getProductRulesApp(List> appList,String productId,Vector vali) throws Exception{ ProductBaseLoanTools.addAppList(appList, "LEASE_AMT_DATE", "coldefaultvalue", DateUtil.getToday()); StringBuilder sb=new StringBuilder(); @@ -569,9 +588,16 @@ public class ProductCondition { doTemp.setColumnAttribute("FREE_DEFA_INTER_DAY","colreadonly", "1"); } }*/ + BizObject bo1 = JBOFactory.createBizObjectQuery(BUSINESS_TYPE.CLASS_NAME,"typeno=:productId") + .setParameter("productId",productId).getSingleResult(false); + String attribute2=(bo1==null)?"":bo1.getAttribute("ATTRIBUTE2").getString(); BizObject bo = JBOFactory.createBizObjectQuery(CONFIGURATE.CLASS_NAME,"ATTR_ID=:attrId") .setParameter("attrId","免罚息天数配置").getSingleResult(false); - String day = (bo==null)?"":bo.getAttribute("ATTR_VALUE").getString(); + String day="0"; + if(attribute2!=""&&"car_product".equals(attribute2)){ + day = (bo==null)?"":bo.getAttribute("ATTR_VALUE").getString(); + } + doTemp.setDefaultValue("FREE_DEFA_INTER_DAY", day); if(map.containsKey("PENALTY_RATE_DAY")){//罚息日利率 @@ -727,6 +753,68 @@ public class ProductCondition { return "{"+sJson+"}"; } + /** + * 设置计算方式 + * @param doTemp + * @param productId + * @return + * @throws Exception + */ + public String getProductSettleRulesBusiness(ASObjectModel doTemp,String productId) throws Exception{ + + //租金计算方式 + Map> map=ProductParamUtil.getProductComponentType(productId, "PRD0301"); + //分段 + Map> submap=ProductParamUtil.getProductComponentType(productId, "PRD0321"); + String s=""; + + String sJson=""; + for(Map.Entry> entry:map.entrySet()){ + if(s.length()>0)s+=","; + s+="'"+entry.getKey()+"'"; + if(sJson.length()>0)sJson+=","; + sJson+="'"+entry.getKey()+"':"+FileOperatorUtil.getMapToJsonStr(entry.getValue()); + + if(entry.getKey().equals( doTemp.getColumnAttribute("SETTLE_METHOD", "coldefaultvalue"))){ + Map values=entry.getValue(); + if(values.containsKey("HolidayAdjust")){ + doTemp.setDefaultValue("PLAN_DATE_HOILDAY", values.get("HolidayAdjust")); + } + if(values.containsKey("InterestHolidayAdjust")){ + doTemp.setDefaultValue("INTEREST_DATE_HOLIDAY", values.get("InterestHolidayAdjust")); + } + if(values.containsKey("RATE")){ + doTemp.setDefaultValue("RATE", values.get("RATE")); + } + if(values.containsKey("AdditionalRate")){ + doTemp.setDefaultValue("ADDITIONAL_RATE", values.get("AdditionalRate")); + } + if(values.containsKey("InterestDayType")){ + doTemp.setDefaultValue("INTEREST_DAY_TYPE", values.get("InterestDayType")); + } + } + } + if(submap.containsKey("ISSUBSECTION")){ + if(s.length()>0)s+=","; + s+="'even_subsection'"; + } + + /*if(s.indexOf("even_rent") != -1) { + s = "'even_rent'"; + } else if(s.indexOf("even_corpus") != -1) { + s = "'even_corpus'"; + } else { + s = "'even_interest'"; + }*/ + // doTemp.setReadOnly("SETTLE_METHOD", true); + doTemp.setColumnAttribute("SETTLE_METHOD","coleditsource","jbo.sys.CODE_LIBRARY,itemno,itemname,codeno='settle_method' and itemno in ("+s+") order by sortno"); + doTemp.setDefaultValue("SETTLE_METHOD", s.replaceAll("'", "")); + + + return "{"+sJson+"}"; + } + + public String getProductSettleRulesApp(List> appList,String productId) throws Exception{ //租金计算方式 From 22a2e62855321fbd19aaa1ff6f840a4c7caf4369 Mon Sep 17 00:00:00 2001 From: liuzhao Date: Tue, 16 Oct 2018 11:25:15 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=88=86=E6=B4=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../overduedunning/DayDistribute.jsp | 4 +- src_tenwa/quartz/AutoDistribute.java | 37 +++++++++++++++++-- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/DayDistribute.jsp b/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/DayDistribute.jsp index 1287b6ae5..2e7139a32 100644 --- a/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/DayDistribute.jsp +++ b/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/DayDistribute.jsp @@ -21,9 +21,9 @@ }; %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>