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 zhouyh2

Browse Source
This commit is contained in:
zhouyahui 2018-10-15 20:10:40 +08:00
commit c33d1420c7
5 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
WebContent/Tenwa/Lease/Flow/Fund/FundCollection/VIFundPlanList.jsp
View File

@ -5,6 +5,21 @@
String flowunid = CurPage.getParameter("FlowUnid");
String rightType = CurPage.getParameter("RightType");
String applytype = CurPage.getParameter("ApplyType");
//判断业务类型
String businessType="";
String orgId=CurUser.getOrgID().substring(0,7);
if("FundCollectionApply".equals(applytype)){
businessType="1";
}else{
if("8009010".equals(orgId)){
businessType="2";
}else if("8009011".equals(orgId)){
businessType="3";
}else{
businessType="";
}
}
ASObjectModel doTemp = new ASObjectModel("VILCFundPlanListtradition");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
dwTemp.Style="1"; //--设置为Grid风格--
@ -14,7 +29,7 @@
dwTemp.MultiSelect = true;
}
dwTemp.setPageSize(10);
dwTemp.genHTMLObjectWindow("");
dwTemp.genHTMLObjectWindow(businessType);
//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格
String sButtons[][] = {

4
WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp
View File

@ -47,6 +47,8 @@
}
%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
<script type="text/javascript">
var oldFactMoney = 0;
var newFactMoney = 0;
function updateEbankAndEbankProcessOfDel(){
var rows = getItemValueArray(0,"ID")+"";
if(rows == ""){
@ -72,8 +74,6 @@
oldFactMoney = newFactMoney;
reloadSelf();
}
get();
total();
}
function checkMayopeMoney(){

1
WebContent/Tenwa/Lease/Flow/Rent/RentIncome/VILCRentPlanList.jsp
View File

@ -172,6 +172,7 @@
}
function createRundIncome(){
debugger;
var id = getItemValueArray(0,"id")+","+TablePage.getCheckedItemValueArrayWithOtherPage("id",s_c_p[0]);
if("," == id){
alert("请先选择需要收款的租金计划");

14
src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java
View File

@ -43,6 +43,7 @@ public class BusinessBO implements Serializable {
private String customerType; // 客户类别
private String certtype; // 证件类型
private String certid; // 证件号码
private String haveCommission;//是否有佣金
private String businessType; // 业务类型，1是汽车业务，2是传统业务，3是汽车传统业务
private String versionId; // 版本ID
@ -153,6 +154,9 @@ public class BusinessBO implements Serializable {
this.businessType = RestfullConstant.baseProperty.get("BUSINESS_TYPE") == null ? ""
: RestfullConstant.baseProperty.get("BUSINESS_TYPE").toString(); // 业务类型
this.haveCommission = fieldMap.get("HaveCommission".toLowerCase()) == null ? ""
: fieldMap.get("HaveCommission".toLowerCase()).toString(); // 是否有佣金
this.modelId = fieldMap.get("modelId".toLowerCase()) == null ? ""
: fieldMap.get("modelId".toLowerCase()).toString(); // 汽车类型
@ -214,6 +218,8 @@ public class BusinessBO implements Serializable {
action.setModelid(modelId);
map.put("businessType", businessType);
action.setBusinessType(businessType);
map.put("HaveCommission", haveCommission);
action.setHaveCommission(haveCommission);
map.put("price", price);
action.setPrice(price);
map.put("liter", liter);
@ -521,4 +527,12 @@ public class BusinessBO implements Serializable {
public void setParams(Map<String, String> params) {
this.params = params;
}
public String gethaveCommission() {
return haveCommission;
}
public void sethaveCommission(String haveCommission) {
haveCommission = haveCommission;
}
}

2
src_tenwa/com/tenwa/flow/rent/rentincome/RentIncomeMethod.java
View File

@ -334,7 +334,7 @@ public class RentIncomeMethod {
if("penalty_income".equals(penaltyRule)){
penaltyOver = "0.00";
}else{
penaltyOver = JBOFactory.getBizObjectManager(VI_LC_RENT_PLAN.CLASS_NAME).createQuery("select v.getRentPenalty('"+boVLRP.getAttribute("PAYMENT_NUMBER").getString()+"','"+boVLRP.getAttribute("PLAN_LIST").getString()+"','"+factDate+"') v.penalty from O").getSingleResult(false).getAttribute("penalty").getString();
// penaltyOver = JBOFactory.getBizObjectManager(VI_LC_RENT_PLAN.CLASS_NAME).createQuery("select v.getRentPenalty('"+boVLRP.getAttribute("PAYMENT_NUMBER").getString()+"','"+boVLRP.getAttribute("PLAN_LIST").getString()+"','"+factDate+"') v.penalty from O").getSingleResult(false).getAttribute("penalty").getString();
}
money = new BigDecimal(corpusOver).add(new BigDecimal(interestOver)).add(new BigDecimal(penaltyOver));
if(money.compareTo(bel) <= 0){