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-08-10 17:20:02 +08:00
parent b63a97df5e
commit aa28f97191
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,10 +64,10 @@
JBOTransaction tx=JBOFactory.createJBOTransaction();
if("proj_process".equals(calType)){
BizObject proj=JBOFactory.createBizObjectQuery("jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP","flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false);
sSerialType=proj.getAttribute("PROJECT_NO").getString();
sSerialType=(proj==null)?"":proj.getAttribute("PROJECT_NO").getString();
}else{
BizObject contract=JBOFactory.createBizObjectQuery("jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO_TEMP","flowunid=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false);
sSerialType=contract.getAttribute("CONTRACT_NO").getString();
sSerialType=(contract==null)?"":contract.getAttribute("CONTRACT_NO").getString();
}
plannumber=SerialNumberUtil.getPlannumber(sSerialType,calType,tx);
tx.commit();

6
WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp
View File

@ -43,7 +43,8 @@
if(rightType.equals("ReadOnly")){
dwTemp.ReadOnly = "1";//只读模式
}
dwTemp.genHTMLObjectWindow(CurPage.getParameter("id"));
String id=CurPage.getParameter("id");
dwTemp.genHTMLObjectWindow(id);
CurPage.getCurComp().setAttribute("RightType", rightType);
%>
<%/*~END~*/%>
@ -74,9 +75,10 @@
var accType = getItemValue(0, 0, "acc_type");
var state = getItemValue(0, 0, "state_");
var FbSdk = getItemValue(0,0,"FbSdk");
var id="<%=id%>";
var sParams = "accountType="+accountType+",accType="+accType+",state="+state+",FbSdk="+FbSdk;
var sReturn = RunJavaMethodTrans("com.tenwa.reckon.copydata.CalcRentCompare", "compare",sParams );
if(sReturn=="null"||(sReturn=="notNull"&&state!="0010")||(sReturn=="notNull"&&state=="0010"&&FbSdk!="Y")){
if(sReturn=="null"||(sReturn=="notNull"&&state!="0010")||(sReturn=="notNull"&&state=="0010"&&FbSdk!="Y")||sReturn==id){
as_save("myiframe0","parent.AsDialog.ClosePage()");
}else{
alert("启用状态下的账户账号类型已存在，请检查！");

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

File diff suppressed because one or more lines are too long

2
calc/com/tenwa/reckon/copydata/CalcRentCompare.java
View File

@ -55,7 +55,7 @@ public class CalcRentCompare implements BizObjectCompare{
if(bo==null||"".equals(bo)){
return "null";
}
return "notNull";
return bo.getAttribute("id").toString();
}
}