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 liuzhao

Browse Source
This commit is contained in:
liuzhao 2018-09-21 15:59:57 +08:00
commit 333b2d20d1
6 changed files with 91 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -738,20 +738,18 @@ function getRatioByMoney(e){
var firstPayment = getItemValue(0,0,"FIRST_PAYMENT");//首付款
//计算总价款
var allMoney = Number(equipAmt) + Number(getItemValue(0, 0, "INSURANCE_PREMIUM")) + Number(getItemValue(0, 0, "OTHER_MONEY"));
if(e.id == "FIRST_PAYMENT_RATIO_0") {
if(e.value) {
var calcMoney = 0;
if(fundRules["FIRST_PAYMENT"]["ratioFee"] == "EquipEndAmt"){//±ÈÀý²ÎÕÕÏî
calcMoney = cleanLeaseMoney;
}else if(fundRules["FIRST_PAYMENT"]["ratioFee"] == "TOTAL_ALL"){//±ÈÀý²ÎÕÕÏî
calcMoney = allMoney;
}else{
calcMoney = equipAmt;
}
firstPayment = Number(e.value) / 100 * Number(calcMoney);
} else {
firstPayment = 0;
if(getItemValue(0, 0, "FIRST_PAYMENT_RATIO_0")) {
var calcMoney = 0;
if(fundRules["FIRST_PAYMENT"]["ratioFee"] == "EquipEndAmt"){//±ÈÀý²ÎÕÕÏî
calcMoney = cleanLeaseMoney;
}else if(fundRules["FIRST_PAYMENT"]["ratioFee"] == "TOTAL_ALL"){//±ÈÀý²ÎÕÕÏî
calcMoney = allMoney;
}else{
calcMoney = equipAmt;
}
firstPayment = Number(getItemValue(0, 0, "FIRST_PAYMENT_RATIO_0")) / 100 * Number(calcMoney);
} else {
firstPayment = 0;
}
//计算融资额
setItemValue(0, 0, "TOTAL_ALL", allMoney + "");

2
WebContent/Accounting/LoanSimulation/RentPlanList.jsp
View File

@ -75,7 +75,7 @@
{width:"350px",height:"40px",title:"上传租金计划"},function(sreturn){
if(sreturn=="true"){
var param="FlowUnid=<%=flowunid%>&calType=<%=calType%>&plannumber=<%=plannumber%>";
window.parent.parent.AsControl.OpenView("/Accounting/LoanSimulation/LoanBasicInfo.jsp",param, "_self");
window.parent.parent.AsControl.OpenView("/Accounting/LoanSimulation/LoanBasicInfoBusiness.jsp",param, "_self");
}
});
}else{

12
WebContent/ProductManage/ProductConfig/ProductSpecificInfo.jsp
View File

@ -9,7 +9,17 @@
String productID = CurPage.getParameter("ProductID");
String PG_TITLE = "产品规格详情";
BusinessObject inputParameter=SystemHelper.getPageComponentParameters(CurPage);
ASObjectWindow dwTemp =ObjectWindowHelper.createObjectWindow_Info("PRD_ProductSpecificInfo"+productType1, inputParameter, CurPage, request);
ASObjectWindow dwTemp = ObjectWindowHelper.createObjectWindow_Info("PRD_ProductSpecificInfo"+productType1, inputParameter, CurPage, request);
if("business_product".equals(productType2)) {
dwTemp.getDataObject().setVisible("LeasForm", false);
dwTemp.getDataObject().setVisible("equip_type", false);
dwTemp.getDataObject().setVisible("IS_ALL_DEALER", false);
dwTemp.getDataObject().setVisible("IS_ALL_CAR", false);
dwTemp.getDataObject().setRequired("LeasForm", false);
dwTemp.getDataObject().setRequired("equip_type", false);
dwTemp.getDataObject().setRequired("IS_ALL_DEALER", false);
dwTemp.getDataObject().setRequired("IS_ALL_CAR", false);
}
ASDataObject doTemp=dwTemp.getDataObject();
//将ParaID作为参数传给显示模板

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

@ -1105,4 +1105,4 @@
<Component FORMAT="1" ID="even_corpus_day" NAME="等额本金按日计息" STATUS="2" TYPE="PRD0301"><Parameters><Parameter ARIGHTTYPE="All" DISPLAYNAME="默认还款日" PARAMETERID="DefaultDueDay" PARAMETERNAME="默认还款日" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="默认还款周期" PARAMETERID="PayFrequencyType" PARAMETERNAME="默认还款周期" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="指定周期" PARAMETERID="PayFrequency" PARAMETERNAME="指定周期" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="宽限期计算方式" PARAMETERID="PostponeFlag" PARAMETERNAME="宽限期计算方式" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否启用节假日顺延" PARAMETERID="HolidayFlag" PARAMETERNAME="是否启用节假日顺延" PRIGHTTYPE="Hide"/></Parameters></Component><Component FORMAT="1" ID="car_even_interest" NAME="车辆均息法" STATUS="2" TYPE="PRD0301"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="默认还款日" PARAMETERID="DefaultDueDay" PARAMETERNAME="默认还款日" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="默认还款周期" PARAMETERID="PayFrequencyType" PARAMETERNAME="默认还款周期" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="指定周期" PARAMETERID="PayFrequency" PARAMETERNAME="指定周期" PRIGHTTYPE="All"/></Parameters></Component><Component FORMAT="1" ID="even_corpus_period" NAME="等额本金按期计息" STATUS="2" TYPE="PRD0301"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="默认还款日" PARAMETERID="DefaultDueDay" PARAMETERNAME="默认还款日" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="默认还款周期" PARAMETERID="PayFrequencyType" PARAMETERNAME="默认还款周期" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="指定周期" PARAMETERID="PayFrequency" PARAMETERNAME="指定周期" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="宽限期计算方式" PARAMETERID="PostponeFlag" PARAMETERNAME="宽限期计算方式" PRIGHTTYPE="Hide"/><Parameter ARIGHTTYPE="Hide" DISPLAYNAME="是否启用节假日顺延" PARAMETERID="HolidayFlag" PARAMETERNAME="是否启用节假日顺延" PRIGHTTYPE="Hide"/></Parameters></Component>
<Component FORMAT="1" ID="INCIDENTAL" NAME="杂费" PRODUCT_TYPE="car_product" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否参与融资" PARAMETERID="FINAN" PARAMETERNAME="是否参与融资" PRIGHTTYPE="Required" VALUE="Y"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="首付款比例" PARAMETERID="FIRST_PAYMENT_RATIO" PARAMETERNAME="首付款比例" PRIGHTTYPE="None"/></Parameters></Component>
<Component FORMAT="1" ID="FINAL_PAYMENT" NAME="尾款" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收取方向" PARAMETERID="CostType01" PARAMETERNAME="收取方向" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付节点" PARAMETERID="CostType02" PARAMETERNAME="收付节点" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="收付对象" PARAMETERID="CostType03" PARAMETERNAME="收付对象" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="金额限定" PARAMETERID="CostType08" PARAMETERNAME="金额限定" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="All" DISPLAYNAME="比例限定" PARAMETERID="CostType09" PARAMETERNAME="比例限定" PRIGHTTYPE="All"/><Parameter ARIGHTTYPE="None" DISPLAYNAME="是否参与融资" PARAMETERID="FINAN" PARAMETERNAME="是否参与融资" PRIGHTTYPE="None"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="是否显示比例" PARAMETERID="CostType05" PARAMETERNAME="是否显示比例" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="输入方式" PARAMETERID="CostType06" PARAMETERNAME="输入方式" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="比例参照费用" PARAMETERID="CostType07" PARAMETERNAME="比例参照费用" PRIGHTTYPE="Required"/></Parameters></Component>
<Component FORMAT="1" ID="delay" NAME="뻘운儺퍅" STATUS="2" TYPE="PRD0315"/><Component FORMAT="1" ID="period_type" NAME="邱마/빈마" STATUS="1" TYPE="PRD0350"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="邱마/빈마" PARAMETERID="begin_end" PARAMETERNAME="邱마/빈마" PRIGHTTYPE="Required"/></Parameters></Component></Components>
<Component FORMAT="1" ID="delay" NAME="뻘운儺퍅" STATUS="2" TYPE="PRD0315"/><Component FORMAT="1" ID="period_type" NAME="邱마/빈마" STATUS="1" TYPE="PRD0350"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="邱마/빈마" PARAMETERID="begin_end" PARAMETERNAME="邱마/빈마" PRIGHTTYPE="Required"/></Parameters></Component><Component FORMAT="1" ID="OTHER_MONEY" NAME="페儉" PRODUCT_TYPE="business_product" STATUS="1" TYPE="PRD0315"><Parameters><Parameter ARIGHTTYPE="Required" DISPLAYNAME="澗혤렘蕨" PARAMETERID="CostType01" PARAMETERNAME="澗혤렘蕨" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="澗마쌘듐" PARAMETERID="CostType02" PARAMETERNAME="澗마쌘듐" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="澗마뚤蹶" PARAMETERID="CostType03" PARAMETERNAME="澗마뚤蹶" PRIGHTTYPE="Required"/><Parameter ARIGHTTYPE="Required" DISPLAYNAME="궐절꽝亮롤痰" PARAMETERID="CostType07" PARAMETERNAME="궐절꽝亮롤痰" PRIGHTTYPE="Required"/></Parameters></Component></Components>

91
WebContent/WEB-INF/etc/jbo/jbo_lease.xml
View File

@ -2737,6 +2737,22 @@
<attribute name="UPDATEUSERID" label="更新人" type="STRING" length="32"/>
<attribute name="UPDATEORGID" label="更新部门" type="STRING" length="32"/>
<attribute name="UPDATETIME" label="更新时间" type="STRING" length="32"/>
<attribute name="patrol_frequency" label="巡视次数" type="STRING" length="32"/>
<attribute name="patrol_place" label="巡视地点" type="STRING" length="32"/>
<attribute name="lessee" label="承租人" type="STRING" length="32"/>
<attribute name="credit_categoryz" label="授信品类" type="STRING" length="32"/>
<attribute name="credit_quota" label="授信额度" type="STRING" length="32"/>
<attribute name="launch_money" label="已投放金额" type="STRING" length="32"/>
<attribute name="balance" label="再租余额" type="STRING" length="32"/>
<attribute name="lease_matter" label="租赁物" type="STRING" length="32"/>
<attribute name="fivelevel_class" label="五级分类" type="STRING" length="32"/>
<attribute name="return_money" label="应还金额" type="STRING" length="32"/>
<attribute name="amount_returned" label="已还金额" type="STRING" length="32"/>
<attribute name="overdue_periods" label="逾期期数" type="STRING" length="32"/>
<attribute name="overdue_money" label="逾期金额" type="STRING" length="32"/>
<attribute name="first_overdue_time" label="首次逾期金额" type="STRING" length="32"/>
<attribute name="guarantee_mode" label="担保方式" type="STRING" length="32"/>
<attribute name="patrol_problem" label="前次巡视相关问题落实情况" type="STRING" length="1000"/>
</attributes>
<manager>
<managerProperties>
@ -2745,35 +2761,7 @@
</managerProperties>
</manager>
</class>
<class name="LB_AFTER_LEASING_VISIT_TEMP" label="租后巡视基本信息临时表" keyAttributes="ID">
<attributes>
<attribute name="ID" label="标识" type="STRING" length="32"/>
<attribute name="RELATIVE_ID" label="关联id" type="STRING" length="32"/>
<attribute name="CUSTOMER_ID" label="客户编号" type="STRING" length="32"/>
<attribute name="INVESTIGATION_METHOD" label="租后工作形式" type="STRING" length="32"/>
<attribute name="INTERVIEW_STAFF" label="主要受访人员及职务" type="STRING" length="500"/>
<attribute name="INVESTIGATION_PEOPLE" label="参与部门和检查人员" type="STRING" length="500"/>
<attribute name="INVESTIGATION_TIME" label="本期检查时间" type="STRING" length="32"/>
<attribute name="LAST_TIME" label="上期检查时间" type="STRING" length="32"/>
<attribute name="REPORT_STAFF" label="报告人" type="STRING" length="32"/>
<attribute name="REPORT_DATE" label="报告时间" type="STRING" length="32"/>
<attribute name="LAST_INVEST_PROBLEMS" label="上期检查主要问题" type="STRING" length="1000"/>
<attribute name="LAST_INVEST_REFORM" label="上期问题整改情况" type="STRING" length="1000"/>
<attribute name="FLOWUNID" 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"/>
<attribute name="UPDATEUSERID" label="更新人" type="STRING" length="32"/>
<attribute name="UPDATEORGID" label="更新部门" type="STRING" length="32"/>
<attribute name="UPDATETIME" label="更新时间" type="STRING" length="32"/>
</attributes>
<manager>
<managerProperties>
<property name="table" value="LB_AFTER_LEASING_VISIT_TEMP" />
<property name="createKey" value="true" />
</managerProperties>
</manager>
</class>
<class name="LB_AFTER_VISIT_PAYMENT" label="租后巡视检查情况正式表" keyAttributes="ID">
<attributes>
<attribute name="ID" label="标识" type="STRING" length="32"/>
@ -4549,6 +4537,51 @@
</managerProperties>
</manager>
</class>
<class name="LB_AFTER_LEASING_VISIT_TEMP" label="" keyAttributes="ID">
<attributes>
<attribute name="ID" label="标识" type="STRING" length="32"/>
<attribute name="RELATIVE_ID" label="关联字段" type="STRING" length="32"/>
<attribute name="CUSTOMER_ID" label="客户编号" type="STRING" length="32"/>
<attribute name="INVESTIGATION_METHOD" label="租后工作形式" type="STRING" length="32"/>
<attribute name="INTERVIEW_STAFF" label="主要受访人员及职务" type="STRING" length="500"/>
<attribute name="INVESTIGATION_PEOPLE" label="参与部门和检查人员" type="STRING" length="500"/>
<attribute name="INVESTIGATION_TIME" label="本期检查时间" type="STRING" length="32"/>
<attribute name="LAST_TIME" label="上期检查时间" type="STRING" length="32"/>
<attribute name="REPORT_STAFF" label="报告人" type="STRING" length="32"/>
<attribute name="REPORT_DATE" label="报告日期" type="STRING" length="32"/>
<attribute name="LAST_INVEST_PROBLEMS" label="上期检查主要问题" type="STRING" length="1000"/>
<attribute name="LAST_INVEST_REFORM" label="上期问题整改情况" type="STRING" length="1000"/>
<attribute name="FLOWUNID" 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"/>
<attribute name="UPDATEUSERID" label="更新人" type="STRING" length="32"/>
<attribute name="UPDATEORGID" label="更新部门" type="STRING" length="32"/>
<attribute name="UPDATETIME" label="更新时间" type="STRING" length="32"/>
<attribute name="patrol_frequency" label="巡视次数" type="STRING" length="32"/>
<attribute name="patrol_place" label="巡视地点" type="STRING" length="32"/>
<attribute name="lessee" label="承租人" type="STRING" length="32"/>
<attribute name="credit_categoryz" label="授信品类" type="STRING" length="32"/>
<attribute name="credit_quota" label="授信额度" type="STRING" length="32"/>
<attribute name="launch_money" label="已投放金额" type="STRING" length="32"/>
<attribute name="balance" label="再租余额" type="STRING" length="32"/>
<attribute name="lease_matter" label="租赁物" type="STRING" length="32"/>
<attribute name="fivelevel_class" label="五级分类" type="STRING" length="32"/>
<attribute name="return_money" label="应还金额" type="STRING" length="32"/>
<attribute name="amount_returned" label="已还金额" type="STRING" length="32"/>
<attribute name="overdue_periods" label="逾期期数" type="STRING" length="32"/>
<attribute name="overdue_money" label="逾期金额" type="STRING" length="32"/>
<attribute name="first_overdue_time" label="首次逾期金额" type="STRING" length="32"/>
<attribute name="guarantee_mode" label="担保方式" type="STRING" length="32"/>
<attribute name="patrol_problem" label="前次巡视相关问题落实情况" type="STRING" length="1000"/>
</attributes>
<manager>
<managerProperties>
<property name="table" value="lb_after_leasing_visit_temp" />
<property name="createKey" value="true" />
</managerProperties>
</manager>
</class>
</package>
<package name="jbo.com.tenwa.lease.carbrand" >
<class name="LB_CLAIMS_BOOK_DETAIL" label="索赔申请书详情表" keyAttributes="ID">

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

@ -156,7 +156,11 @@ public class FundFundPlanExecutor {
Map<String,String> cleanLeaseMoney = new HashMap<String,String>();
cleanLeaseMoney.put("CostType01", "pay_type_out");
cleanLeaseMoney.put("CostType02", "PaymentTime1");
map.put("CLEAN_LEASE_MONEY", cleanLeaseMoney);
if(!"business_product".equals(tcb.getProductType())) {
map.put("CLEAN_LEASE_MONEY", cleanLeaseMoney);
} else {
map.put("EQUIP_AMT", cleanLeaseMoney);
}
String custid="";
if("quoted_price".equals(tcb.getCalType())){
custid=tcb.getDocId();