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

This commit is contained in:
liujiaji 2018-07-03 14:47:26 +08:00
commit b59bb791bc

View File

@ -16,6 +16,7 @@
String rightType = CurComp.getParameter("RightType");
String flowunid = CurPage.getParameter("FlowUnid");
String ishistory = CurPage.getParameter("IsHistory");
String applyType = CurPage.getParameter("applyType");
ASObjectModel doTemp = new ASObjectModel("ActualPaymentTempList");
if(null!=ishistory&&ishistory.equals("true")){
doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataListHistory");
@ -56,13 +57,25 @@
String bank = bo.getAttribute("acc_bank").getString();
String accName = bo.getAttribute("acc_name").getString();
String accNumber = bo.getAttribute("acc_number").getString();
//添加对方银行默认值
BizObject bo2 = JBOFactory.createBizObjectQuery(DISTRIBUTOR_ACCOUNT.CLASS_NAME,
//Ìí¼Ó¶Ô·½ÒøÐÐĬÈÏÖµ ActualPaymentApply
BizObject bo2 =null;
if("FundPaymentApply".equals(applyType)){
bo2=JBOFactory.createBizObjectQuery(DISTRIBUTOR_ACCOUNT.CLASS_NAME,
"SELECT DISTINCT O.acc_number,O.open_bank,O.account FROM O RIGHT JOIN jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO lci ON lci.DISTRIBUTOR_ID = O.DISTRIBUTOR_ID AND O.is_main = 'Y' RIGHT JOIN jbo.app.tenwa.calc.LC_FUND_PLAN_TEMP lfit ON lfit.CONTRACT_ID = lci.ID WHERE lfit.FLOWUNID =:flowunid AND lfit.PAY_TYPE = 'pay_type_out'")
.setParameter("flowunid", flowunid).getSingleResult(false);
String bank2 = bo2.getAttribute("open_bank").getString();
String accName2 = bo2.getAttribute("account").getString();
String accNumber2 = bo2.getAttribute("acc_number").getString();
}else if("ActualPaymentApply".equals(applyType)){
bo2=JBOFactory.createBizObjectQuery(DISTRIBUTOR_ACCOUNT.CLASS_NAME,
"SELECT DISTINCT O.acc_number,O.open_bank,O.account FROM O RIGHT JOIN jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO lci ON lci.DISTRIBUTOR_ID = O.DISTRIBUTOR_ID AND O.is_main = 'Y' RIGHT JOIN jbo.app.tenwa.calc.LC_FUND_INCOME_TEMP lfit ON lfit.CONTRACT_ID = lci.ID WHERE lfit.FLOWUNID =:flowunid AND lfit.PAY_TYPE = 'pay_type_out'")
.setParameter("flowunid", flowunid).getSingleResult(false);
}
String bank2 = "";
String accName2 = "";
String accNumber2 = "";
if(bo2!=null){
bank2 = bo2.getAttribute("open_bank").getString();
accName2 = bo2.getAttribute("account").getString();
accNumber2 = bo2.getAttribute("acc_number").getString();
}
//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标CSS层叠样式 10、风格
String[][] sButtons = null;