anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.修改租金测算页面。

Browse Source 
2.整理产品配置。
This commit is contained in:
zhangbb 2018-06-30 19:28:49 +08:00
parent 24f52838a2
commit d6ea10a743
6 changed files with 73 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp
View File

@ -17,6 +17,7 @@
String flowunid = CurPage.getParameter("FlowUnid");
String plannumber=CurPage.getParameter("plannumber");
String productId=CurPage.getParameter("ProductId");
String productName = CurPage.getParameter("ProductName");
String ishistory=CurPage.getParameter("IsHistory");
String nodeNo=CurPage.getParameter("NodeNo");
String RightType= CurPage.getParameter("RightType");
@ -165,12 +166,16 @@ var adjustType;
var count = 0;
$(function(){
hideItem(0,'IRR');
var productName="<%=productName%>";
setItemValue(0,0,"PRODUCT_NAME",productName);
isFina();
//document.getElementById('div_my0').innerHTML = '<div style="width:1160px;overflow: scroll;">'+document.getElementById('div_my0').innerHTML+'</div>';
if("ReadOnly"!="<%=RightType%>"){
rentOrRateOption=$("#RENT_OR_RATE").children();
incomeNumberYear=$("#INCOME_NUMBER_YEAR").children();
adjustType=$("#ADJUST_TYPE").children();
console.info(calcRules);
var fundRules=calcRules["fund"];
for(var key in fundRules){
$("#"+key).bind("change",function(){
@ -194,7 +199,16 @@ $(function(){
changeSettleMethod3();
}
});
function isFina(){
var fundRules=calcRules["fund"];
for(var key in fundRules){
var flag = getItemValue(0,0,key+"_FINA");
if(flag=="finatype01"){
setItemValue(0,0,key+"_FIRST_PAYMENT_RATIO","");
setItemValue(0,0,key+"_FINANCE","");
}
}
}
function importCustomerQuot(){
AsDialog.OpenSelector("SelectCustomerQuot","flowunid,<%=flowunid%>,productid,<%=productId%>","dialogWidth=800px;dialogHeight=500px",
function(sReturn){
@ -720,7 +734,7 @@ function changeRateType(){
//根据金额算比例
function getRatioByMoney(e){
debugger;
var equipAmt=getItemValue(0,0,"EQUIP_AMT");//设备款
var cleanLeaseMoney=getItemValue(0,0,"CLEAN_LEASE_MONEY");//融资额
var fundRules=calcRules["fund"];

26
WebContent/WEB-INF/etc/app/component/component-config.xml
View File

File diff suppressed because one or more lines are too long

6
WebContent/WEB-INF/etc/app/component/component-parameter-config.xml
View File

@ -117,11 +117,11 @@
<Parameter CODESCRIPT="pay_type" CODESOURCE="Code" COMPONENTTYPE="PRD0315" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="CostType01" PARAMETERNAME="收取方向" SELECTTYPE="02" STATUS="1"/>
<Parameter CODESCRIPT="PaymentTime" CODESOURCE="Code" COMPONENTTYPE="PRD0315" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="CostType02" PARAMETERNAME="收付节点" SELECTTYPE="02" STATUS="1"/>
<Parameter CODESCRIPT="PayObject" CODESOURCE="Code" COMPONENTTYPE="PRD0315" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="CostType03" PARAMETERNAME="收付对象" SELECTTYPE="02" STATUS="1"/>
<Parameter COMPONENTTYPE="PRD0315" DATATYPE="1" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="CostType04" PARAMETERNAME="科目编码" STATUS="1"/><Parameter CODESCRIPT="YesNo" CODESOURCE="Code" COMPONENTTYPE="PRD0315" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" SELECTTYPE="05" STATUS="1"/><Parameter CODESCRIPT="InputMode" CODESOURCE="Code" COMPONENTTYPE="PRD0315" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="CostType06" PARAMETERNAME="输入方式" SELECTTYPE="04" STATUS="1"/>
<Parameter COMPONENTTYPE="PRD0315" DATATYPE="1" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="CostType04" PARAMETERNAME="科目编码" STATUS="2"/><Parameter CODESCRIPT="YesNo" CODESOURCE="Code" COMPONENTTYPE="PRD0315" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" SELECTTYPE="05" STATUS="1"/><Parameter CODESCRIPT="InputMode" CODESOURCE="Code" COMPONENTTYPE="PRD0315" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="CostType06" PARAMETERNAME="输入方式" SELECTTYPE="04" STATUS="1"/>
<Parameter CODESCRIPT="RefCost" CODESOURCE="Code" COMPONENTTYPE="PRD0315" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" SELECTTYPE="04" STATUS="1"/>
<Parameter COMPONENTTYPE="PRD0315" DATATYPE="2" METHODTYPE="Nothing" OPERATOR="MINIMUMVALUE,MAXIMUMVALUE,VALUE" PARAMETERID="CostType08" PARAMETERNAME="金额限定" STATUS="1"/>
<Parameter COMPONENTTYPE="PRD0315" DATATYPE="6" METHODTYPE="Nothing" OPERATOR="MINIMUMVALUE,MAXIMUMVALUE,VALUE" PARAMETERID="CostType09" PARAMETERNAME="比例限定" STATUS="1"/>
<Parameter CODESCRIPT="YesNo" CODESOURCE="Code" COMPONENTTYPE="PRD0315" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" SELECTTYPE="05" STATUS="1"/>
<Parameter CODESCRIPT="YesNo" CODESOURCE="Code" COMPONENTTYPE="PRD0315" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="CostType10" PARAMETERNAME="是否参与IRR/XIRR核算" SELECTTYPE="05" STATUS="2"/>
<Parameter CODESCRIPT="CarType" CODESOURCE="Code" COMPONENTTYPE="PRD0312" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="OPTIONALVALUE" PARAMETERID="equip_type" PARAMETERNAME="租赁物类型" SELECTTYPE="04" STATUS="1"/>
<Parameter CODESCRIPT="SYHS" CODESOURCE="Code" COMPONENTTYPE="PRD0309" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="SYHS" PARAMETERNAME="收益核算" SELECTTYPE="05" STATUS="1"/>
<Parameter CODESCRIPT="DocList" CODESOURCE="Code" COMPONENTTYPE="PRD0401,PRD0412,PRD0413,PRD0414" DATATYPE="4" HTMLSTYLE="style={width:150px;}" METHODTYPE="Nothing" OPERATOR="OPTIONALVALUE" PARAMETERID="DocList" PARAMETERNAME="资料清单" SELECTSCRIPT="" SELECTTYPE="02" STATUS="2"/>
@ -150,7 +150,7 @@
<Parameter COMPONENTTYPE="PRD0330" DATATYPE="1" HTMLSTYLE="style={width:700px}" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="FormulaCN" PARAMETERNAME="计算公式中文" STATUS="1"/>
<Parameter CODESCRIPT="YesNo" CODESOURCE="Code" COMPONENTTYPE="PRD0330" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="FinanceInterest" PARAMETERNAME="加上财务利息" SELECTTYPE="05" STATUS="1"/>
<Parameter CODESCRIPT="YesNo" CODESOURCE="Code" COMPONENTTYPE="PRD0330" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="FirstRent" PARAMETERNAME="加上期初第一期租金" SELECTTYPE="05" STATUS="1"/>
<Parameter CODESCRIPT="YesNo" CODESOURCE="Code" COMPONENTTYPE="PRD0315" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="FINAN" PARAMETERNAME="是否允许参与融资" SELECTTYPE="05" STATUS="1"/>
<Parameter CODESCRIPT="YesNo" CODESOURCE="Code" COMPONENTTYPE="PRD0315" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="FINAN" PARAMETERNAME="是否参与融资" SELECTTYPE="05" STATUS="1"/>
<Parameter CODESCRIPT="leas_form" CODESOURCE="Code" COMPONENTTYPE="PRD0350" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="LeasForm" PARAMETERNAME="租赁类型" SELECTTYPE="04" STATUS="1"/>
<Parameter COMPONENTTYPE="PRD0350" DATATYPE="1" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="UnionRatio" PARAMETERNAME="联合方比例(%)" STATUS="1"/>
<Parameter COMPONENTTYPE="PRD0350" DATATYPE="1" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="RentRate" PARAMETERNAME="租金税率(%)" STATUS="1"/>

29
WebContent/WEB-INF/etc/jbo/jbo_calc.xml
View File

@ -2831,7 +2831,8 @@
</managerProperties>
</manager>
</class>
<class name="LC_CALC_CONDITION_TEMP" label="" keyAttributes="ID">
<attributes>
<attribute name="ID" label="标识" type="STRING" length="32"/>
@ -2843,8 +2844,8 @@
<attribute name="CONTRACT_PLAN_NUMBER" label="合同方案编号" type="STRING" length="32"/>
<attribute name="PAYMENT_NUMBER" label="投放编号" type="STRING" length="32"/>
<attribute name="EQUIP_AMT" label="设备款" type="DOUBLE" length="22" scale="2"/>
<attribute name="FIRST_PAYMENT" label="首付款" type="DOUBLE" length="22" scale="2"/>
<attribute name="FIRST_PAYMENT_RATIO" label="首付款比例" type="DOUBLE" length="22" scale="6"/>
<attribute name="FIRST_PAYMENT" label="综合首付款" type="DOUBLE" length="22" scale="2"/>
<attribute name="FIRST_PAYMENT_RATIO" label="综合首付款比例" type="DOUBLE" length="22" scale="6"/>
<attribute name="EQUIP_END_VALUE" label="期末余值" type="DOUBLE" length="22" scale="2"/>
<attribute name="CLEAN_LEASE_MONEY" label="融资额" type="DOUBLE" length="22" scale="2"/>
<attribute name="FIRST_PAYMENT_TOTAL" label="期初付款总计" type="DOUBLE" length="22" scale="2"/>
@ -2943,23 +2944,23 @@
<attribute name="CORPUS" label="期限内本金" type="DOUBLE" length="22" scale="2"/>
<attribute name="CORPUS_RATIO" label="期限内本金比例" type="DOUBLE" length="22" scale="6"/>
<attribute name="DISCOUNT" label="贴息" type="DOUBLE" length="22" scale="6"/>
<attribute name="FINAL_PAYMENT" label="尾付款" type="DOUBLE" length="22" scale="6"/>
<attribute name="FINAL_PAYMENT" label="综合尾付款" type="DOUBLE" length="22" scale="6"/>
<attribute name="FINAL_PAYMENT_RATIO" label="尾付款比例" type="DOUBLE" length="22" scale="6"/>
<attribute name="CAR_FIRST_PAYMENT_RATIO" label="车款首付款比例" type="DOUBLE" length="22" scale="6"/>
<attribute name="CAR_FINAL_PAYMENT_RATIO" label="车款尾付款比例" type="DOUBLE" length="22" scale="6"/>
<attribute name="CAR_FINANCE" label="车款融资额" type="DOUBLE" length="22" scale="2"/>
<attribute name="PURCHASE_TAX_FIRST_PAYMENT_RATIO" label="购置税首付款比例" type="DOUBLE" length="22" scale="6"/>
<attribute name="PURCHASE_TAX_FINAL_PAYMENT_RATIO" label="购置税尾款付款比例" type="DOUBLE" length="22" scale="6"/>
<attribute name="INSURANCE_FIRST_PAYMENT_RATIO" label="保险费首付款比例" type="DOUBLE" length="22" scale="6"/>
<attribute name="INSURANCE_FINAL_PAYMENT_RATIO" label="保险费尾款付款比例" type="DOUBLE" length="22" scale="6"/>
<attribute name="PURCHASE_TAX_FINANCE" label="购置税融资额" type="DOUBLE" length="22" scale="2"/>
<attribute name="INSURANCE_PREMIUM_FIRST_PAYMENT_RATIO" label="保险费首付款比例" type="DOUBLE" length="22" scale="6"/>
<attribute name="INSURANCE_PREMIUM_FINANCE" label="保险费融资额" type="DOUBLE" length="22" scale="2"/>
<attribute name="GPS_FEE" label="GPS安装服务费" type="DOUBLE" length="22" scale="2"/>
<attribute name="GPS_FEE_FINA" label="GPS是否参与融资" type="STRING" length="32"/>
<attribute name="GPS_FIRST_PAYMENT_RATIO" label="GPS首付款比例" type="DOUBLE" length="22" scale="6"/>
<attribute name="GPS_FINAL_PAYMENT_RATIO" label="GPS尾款付款比例" type="DOUBLE" length="22" scale="6"/>
<attribute name="GPS_FEE_FIRST_PAYMENT_RATIO" label="GPS首付款比例" type="DOUBLE" length="22" scale="6"/>
<attribute name="GPS_FEE_FINANCE" label="GPS融资额" type="DOUBLE" length="22" scale="2"/>
<attribute name="TABLEWARE_FEE_FIRST_PAYMENT_RATIO" label="精品首付款比例" type="DOUBLE" length="22" scale="6"/>
<attribute name="TABLEWARE_FEE_FINAL_PAYMENT_RATIO" label="精品尾款付款比例" type="DOUBLE" length="22" scale="6"/>
<attribute name="RATE_INTEREST" label="利率/费率" type="DOUBLE" length="22" scale="6"/>
<attribute name="INCIDENTAL_FIRST_PAYMENT_RATIO" label="杂费首付款比例" type="DOUBLE" length="22" scale="6"/>
<attribute name="INCIDENTAL_FINAL_PAYMENT_RATIO" label="杂费尾款付款比例" type="DOUBLE" length="22" scale="6"/>
<attribute name="TABLEWARE_FEE_FINANCE" label="精品融资额" type="DOUBLE" length="22" scale="2"/>
<attribute name="RATE_INTEREST" label="利率/费率" type="DOUBLE" length="22" scale="6"/>
<attribute name="INCIDENTAL_FIRST_PAYMENT_RATIO" label="杂费首付款比例" type="DOUBLE" length="22" scale="6"/>
<attribute name="INCIDENTAL_FINANCE" label="杂费融资额" type="DOUBLE" length="22" scale="2"/>
</attributes>
<manager>
<managerProperties>

26
calc/com/tenwa/reckon/product/ProductCondition.java
View File

@ -204,11 +204,18 @@ public class ProductCondition {
String col=fee.getAttribute("relativecode").getString();//费用项在表中的字段
String colName=fee.getAttribute("itemname").getString();//费用名称
String isFina=fee.getAttribute("attribute2").getString();//是否参与融资
String fina = ProductParamUtil.getProductParameterValue(productId, "PRD0315",col,"FINAN");
if("Y".equals(fina)){
fina = "finatype02";
}else if("N".equals(fina)){
fina = "finatype01";
}
if(fee.getAttribute("itemno").getString().equals("feetype10")){
rule=prodSer.getEquipRule(doTemp, map,col,vali);
}else{
if(map.containsKey(col)){//产品配置了该费用项
rule=prodSer.getFeeRule(doTemp, map, col,colName,vali);
doTemp.setDefaultValue(col+"_FINA",fina);
/*if("FINA".equals(isFina)){
doTemp.setRequired(col, true);
doTemp.setRequired(col+"_"+isFina, true);
@ -329,6 +336,8 @@ public class ProductCondition {
doTemp.setColumnAttribute("ADJUST_STYLE","colvisible", "0");
doTemp.setColumnAttribute("ADJUST_TYPE","colvisible", "0");
}else if("Y".equals(rule.get("ISADJUST_INTEREST"))){
doTemp.setColumnAttribute("ADJUST_STYLE","colvisible", "1");
doTemp.setColumnAttribute("ADJUST_TYPE","colvisible", "1");
//调息生效节点
doTemp.setColumnAttribute("ADJUST_STYLE","coleditsource","jbo.sys.CODE_LIBRARY,itemno,itemname,codeno='adjust_style' and itemno in ("+this.getSqlWhere(rule.get("adjust_style"))+") order by sortno");
//调息方式
@ -420,11 +429,26 @@ public class ProductCondition {
}
return s;
}
//获取保证金比例
public void getCautionRatio(ASObjectModel doTemp,String productId) throws Exception{
String caution_money = ProductParamUtil.getProductParameterValue(productId, "PRD0315","CAUTION_MONEY","CostType09");
String handle_charge_money = ProductParamUtil.getProductParameterValue(productId, "PRD0315","HANDLING_CHARGE_MONEY","CostType09");
String INCOME_NUMBER = ProductParamUtil.getProductParameterValue(productId, "PRD0350","product_rate","INCOME_NUMBER");
String CAR_FIRST_PAYMENT_RATIO = ProductParamUtil.getProductParameterValue(productId, "PRD0315","FIRST_PAYMENT","CostType09");
doTemp.setDefaultValue("CAUTION_MONEY_RATIO",caution_money);
doTemp.setDefaultValue("HANDLING_CHARGE_MONEY_RATIO",handle_charge_money);
doTemp.setDefaultValue("INCOME_NUMBER",INCOME_NUMBER);
doTemp.setDefaultValue("CAR_FIRST_PAYMENT_RATIO",CAR_FIRST_PAYMENT_RATIO);
String ProductType = ProductParamUtil.getProductParameterValue(productId, "PRD0350","product_rate","ProductType");
String isReadOnly = ProductParamUtil.getProductParameterValue(productId, "PRD0350","product_rate","ProductRateReadOnly");
String YEAR_RATE = ProductParamUtil.getProductParameterValue(productId, "PRD0350","product_rate","ProductRate");
//利率为0，费率为1
if("1".equals(ProductType)){
doTemp.setColumnAttribute("YEAR_RATE","colheader","测算费率");
}
if("Y".equals(isReadOnly)){
doTemp.setColumnAttribute("YEAR_RATE","colreadyonly","1");
}
doTemp.setDefaultValue("YEAR_RATE",YEAR_RATE);
}
}

1
calc/com/tenwa/reckon/product/ProductConditionService.java
View File

@ -115,6 +115,7 @@ public class ProductConditionService {
if(defaultValue.length()>0){
doTemp.setDefaultValue(col, defaultValue);
doTemp.setColumnAttribute(col,"colreadonly", "1");
doTemp.setColumnAttribute(col+"_FINA","colreadonly", "1");
}
if("N".equals(isShowRatio)){
doTemp.setColumnAttribute(col,"colfilterrefid", "");//不显示比例