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

Merge branch 'develop' of http://git2.tenwa.com.cn/ApzlDev/apzl_leasing.git into zhouzebei

Browse Source
This commit is contained in:
58261 2018-09-26 16:23:31 +08:00
commit 4487fbfbbd
8 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
WebContent/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp
View File

@ -548,6 +548,7 @@ CalcControl.RentOrRateView=function(){
setEnable(ids2);
CalcControl.RateFloatTypeView();
setItemRequired(0,"YEAR_RATE",true);
setItemValue(0, 0, "RENT_VALUE", "");
}
}else if(rentOrRate == 'rent'){//按租金算年利率
@ -715,7 +716,6 @@ function changeRateType(){
var RATE_FLOAT_TYPE=getItemValue(0,0,"RATE_FLOAT_TYPE");
var adjustTypeValue=getItemValue(0,0,"ADJUST_TYPE");
$("#ADJUST_TYPE").empty();
$(adjustType).each(function(){
var value=$(this).attr("value");
@ -724,9 +724,9 @@ function changeRateType(){
}
});
$("#ADJUST_TYPE").val(adjustTypeValue);
if(count>0||adjustTypeValue==""){
/* if(count>0||adjustTypeValue==""){
$("#ADJUST_TYPE").val("fixed");
}
} */
}
//根据金额算比例
@ -755,7 +755,7 @@ function getRatioByMoney(e){
}
//计算融资额
setItemValue(0, 0, "TOTAL_ALL", allMoney + "");
cleanLeaseMoney = allMoney - firstPayment - Number(getItemValue(0, 0, "EQUIP_END_VALUE"));
cleanLeaseMoney = allMoney - firstPayment;
setItemValue(0, 0, "CLEAN_LEASE_MONEY", cleanLeaseMoney + "")
for(var key in fundRules){
@ -1080,7 +1080,6 @@ function rentOrRateChange(){
CalcControl.RentOrRateView();
//document.all("frame_list_knowing").src = document.all("frame_list_knowing").src;
debugger;
if(count > 0){
AsControl.RunJavaMethod("com.tenwa.reckon.executor.CreateTransactionExecutor","runDelteKnowing","flowunid=<%=flowunid%>,plannumber=<%=plannumber%>,planCName=<%=planCName%>,calType=<%=calType%>");

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

File diff suppressed because one or more lines are too long

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

@ -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"/>
@ -169,7 +169,7 @@
<Parameter CODESCRIPT="residual_method" CODESOURCE="Code" COMPONENTTYPE="PRD0380" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="ResidualMethod" PARAMETERNAME="残值处理方式" SELECTTYPE="05" STATUS="1"/>
<Parameter CODESCRIPT="INCOME_NUMBER" CODESOURCE="Code" COMPONENTTYPE="PRD0350" DATATYPE="5" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="INCOME_NUMBER" PARAMETERNAME="租赁期限" SELECTTYPE="04" STATUS="1"/>
<Parameter COMPONENTTYPE="PRD0380" DATATYPE="6" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="EndValueRatio" PARAMETERNAME="残值比例限定" STATUS="1" UNIT="&lt;font&gt;%&lt;/font&gt;"/>
<Parameter CODESCRIPT="yes_no" CODESOURCE="Code" COMPONENTTYPE="PRD0315" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="isBalance" PARAMETERNAME="是否差额放款" SELECTTYPE="05" STATUS="1"/>
<Parameter CODESCRIPT="yes_no" CODESOURCE="Code" COMPONENTTYPE="PRD0315" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="isBalance" PARAMETERNAME="是否差额放款（汽车专用）" SELECTTYPE="05" STATUS="1"/>
<Parameter COMPONENTTYPE="PRD0386" DATATYPE="1" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="GuaranteeName" PARAMETERNAME="担保人名称" STATUS="1"/>
<Parameter COMPONENTTYPE="PRD0386" DATATYPE="1" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="GuaranteePhone" PARAMETERNAME="担保人电话" STATUS="1"/>
<Parameter COMPONENTTYPE="PRD0386" DATATYPE="1" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="GuaranteeAddress" PARAMETERNAME="担保人地址" STATUS="1"/>
@ -193,7 +193,7 @@
<Parameter CODESCRIPT="YesNo" CODESOURCE="Code" COMPONENTTYPE="PRD0350" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="ProductRateReadOnly" PARAMETERNAME="是否只读" SELECTTYPE="05" STATUS="1"/>
<Parameter CODESCRIPT="RateOrInterest" CODESOURCE="Code" COMPONENTTYPE="PRD0350" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="ProductType" PARAMETERNAME="利率/费率" SELECTTYPE="05" STATUS="1"/>
<Parameter CODESCRIPT="isDeduct" CODESOURCE="Code" COMPONENTTYPE="PRD0315" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="PoundageStyle" PARAMETERNAME="手续费计算方式" SELECTTYPE="05" STATUS="1"/>
<Parameter CODESCRIPT="caution_money_method" CODESOURCE="Code" COMPONENTTYPE="PRD0315" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="DepositStyle" PARAMETERNAME="保证金计算方式" SELECTTYPE="05" STATUS="1"/>
<Parameter CODESCRIPT="caution_money_method" CODESOURCE="Code" COMPONENTTYPE="PRD0315" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="DepositStyle" PARAMETERNAME="保证金计算方式（汽车专用）" SELECTTYPE="05" STATUS="1"/>
<Parameter COMPONENTTYPE="PRD0315" DATATYPE="6" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="FINAL_PAYMENT_RATIO" PARAMETERNAME="尾款比例" STATUS="1"/>
<Parameter COMPONENTTYPE="PRD0315" DATATYPE="6" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="FIRST_PAYMENT_RATIO" PARAMETERNAME="首付款比例" STATUS="1"/>
<Parameter COMPONENTTYPE="PRD0315" DATATYPE="2" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="DISCOUNT_ALL" PARAMETERNAME="总贴息金额" STATUS="1" UNIT="&lt;font&gt;元&lt;/font&gt;"/><Parameter CODESCRIPT="period_type" CODESOURCE="Code" COMPONENTTYPE="PRD0350" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="begin_end" PARAMETERNAME="先付/后付" SELECTTYPE="05" STATUS="1"/><Parameter CODESCRIPT="oneOrMore" CODESOURCE="Code" COMPONENTTYPE="PRD0315" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="oneOrMore" PARAMETERNAME="分摊方式" SELECTTYPE="04" STATUS="1"/></Parameters>
<Parameter COMPONENTTYPE="PRD0315" DATATYPE="2" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="DISCOUNT_ALL" PARAMETERNAME="总贴息金额" STATUS="1" UNIT="&lt;font&gt;元&lt;/font&gt;"/><Parameter CODESCRIPT="period_type" CODESOURCE="Code" COMPONENTTYPE="PRD0350" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="begin_end" PARAMETERNAME="先付/后付" SELECTTYPE="05" STATUS="1"/><Parameter CODESCRIPT="oneOrMore" CODESOURCE="Code" COMPONENTTYPE="PRD0315" DATATYPE="4" METHODTYPE="Nothing" OPERATOR="VALUE" PARAMETERID="oneOrMore" PARAMETERNAME="分摊方式（汽车专用）" SELECTTYPE="04" STATUS="1"/></Parameters>

2
WebContent/WEB-INF/etc/jbo/jbo_comm.xml
View File

@ -782,6 +782,8 @@
<attribute name="CAUTION_INVOICE_TYPE" label="保证金发开票类型" type="STRING" length="32"/>
<attribute name="gps_install_fee" label="GPS安装服务费税率" type="STRING" length="32"/>
<attribute name="gps_type" label="GPS安装服务费开票类型" type="STRING" length="32"/>
<attribute name="penalty" label="违约金" type="STRING" length="32"/>
<attribute name="break_money" label="逾期利息" type="STRING" length="32"/>
<attribute name="INPUTUSERID" label="登记人" type="STRING" length="32"/>
<attribute name="INPUTORGID" label="登记部门" type="STRING" length="32"/>
<attribute name="INPUTTIME" label="登记时间" type="STRING" length="32"/>

8
calc/com/tenwa/reckon/bean/ConditionBean.java
View File

@ -164,6 +164,7 @@ public class ConditionBean implements Cloneable{
private String corpus; // 期限内本金
private String finalPayment; //尾款
private String finalPaymentMethod; //尾款处置方式
private String productType; //增加一个产品类型字段方便判断
//**********************************************************************【众联车贷测算参与融资资金项结束！】
/***********************************************************************************
@ -1730,5 +1731,10 @@ public class ConditionBean implements Cloneable{
public void setDeferStr(Boolean deferStr) {
this.deferStr = deferStr;
}
public String getProductType() {
return productType;
}
public void setProductType(String productType) {
this.productType = productType;
}
}

6
calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java
View File

@ -117,11 +117,7 @@ public class CreateTransactionExecutor implements Transaction {
com.amarsoft.awe.util.Transaction Sqlca = com.amarsoft.awe.util.Transaction.createTransaction(tx);
String productType = Sqlca.getString(new SqlObject("select attribute2 from business_type where typeno='"+productId+"'"));
bean.setProductType(productType);
if("business_product".equals(productType)) {
bean.getCb().setCleanLeaseMoney(new BigDecimal(bean.getCb().getCleanLeaseMoney()).add(new BigDecimal(bean.getCb().getEquipEndValue())).toString());
}
bean.getCb().setProductType(productType);
jsonObject.appendElement("year_rate", bean.getCb().getYearRate());
FundRentPlanBean rentPlan = this.createRentPlan(bean,tx);
this.createFundPlan(rentPlan, bean,tx);

6
calc/com/tenwa/reckon/help/RentalServiceImpl.java
View File

@ -79,7 +79,7 @@ public class RentalServiceImpl {
rent = new BigDecimal(RentTools.getPMT(preRate, cb.getIncomeNumber() + "", cleanLeaseMoney, finalPayment.toString(), cb.getPeriodType())).toString();
}
} else {
rent = new BigDecimal(RentTools.getPMT(preRate, cb.getIncomeNumber() + "", cleanLeaseMoney, cb.getEquipEndValue(), cb.getPeriodType())).toString();
rent = new BigDecimal(RentTools.getPMT(preRate, cb.getIncomeNumber() + "", cleanLeaseMoney, "0", cb.getPeriodType())).toString();
}
if(cb.getRentRound().length()>0){
rent=NumberUtils.rentRound(rent, cb.getRentRound(),cb.getRentRoundType());
@ -202,8 +202,10 @@ public class RentalServiceImpl {
*/
public List<String> getNormalRentList(ConditionBean cb, List<String> rent_list, String rent) {
BigDecimal finalPayment = new BigDecimal(cb.getFinalPayment()==null?"0":cb.getFinalPayment());
String productType = cb.getProductType();
for (int i = 0; i < cb.getIncomeNumber(); i++) {
if(i == cb.getIncomeNumber() - 1 && finalPayment.compareTo(BigDecimal.ONE) != 0 && "final_payment_method02".equals(cb.getFinalPaymentMethod())) {
if(i == cb.getIncomeNumber() - 1 && finalPayment.compareTo(BigDecimal.ONE) != 0
&& ("business_product".equals(productType) || "final_payment_method02".equals(cb.getFinalPaymentMethod()))) {
rent_list.add(finalPayment.add(new BigDecimal(rent)).toString());
} else {
rent_list.add(rent);

2
calc/com/tenwa/reckon/util/IrrTools.java
View File

@ -970,7 +970,7 @@ public class IrrTools {
BigDecimal daoRate=BigDecimal.ZERO; // 1/(1+irr)
BigDecimal netflowNow; //净流量现值
BigDecimal error = new BigDecimal("0.0000000001"); //误差
int size = cashList.size(); //现金流大小
int size = cashList.size(); //现金流大小
int j = 0; //迭代次数
double k = 0;
String startDate = "";