diff --git a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp index c70f49fd3..f048cedd3 100644 --- a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp +++ b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp @@ -100,11 +100,11 @@ alert("收款暂不支持银企直连!"); return; } - if(state_="0010"){ + if(state=="0010"){ var sParams = "accountType="+accountType+",accType="+accType+",state="+state+",FbSdk="+FbSdk+",ownId="+ownId; var sReturn = RunJavaMethodTrans("com.tenwa.reckon.copydata.CalcRentCompare", "compare",sParams ); - if(id==null||id==""||accountPurpose!="default"||sReturn=="null"||sReturn==id){ + if(accountPurpose!="default" || sReturn=="null" || (id != "" && sReturn == id)){ as_save("myiframe0","parent.AsDialog.ClosePage()"); }else{ alert("相同类型的账户只能存在一个,请检查(银行账号类型 ,是否为企银直连,银行账户用途,状态等字段)!"); diff --git a/calc/com/tenwa/reckon/copydata/CalcRentCompare.java b/calc/com/tenwa/reckon/copydata/CalcRentCompare.java index 221321125..0eabd527f 100644 --- a/calc/com/tenwa/reckon/copydata/CalcRentCompare.java +++ b/calc/com/tenwa/reckon/copydata/CalcRentCompare.java @@ -93,7 +93,7 @@ public class CalcRentCompare implements BizObjectCompare{ } public String compare(JBOTransaction tx) throws JBOException{ - String sql ="select id from O where O.own_id='"+ownId+"' and O.state_='0010' and O.ACC_TYPE='0010' and O.FbSdk='Y' and (O.account_type='out_account' or O.account_type='inAndOut_account')"; + String sql ="select id from O where O.own_id='"+ownId+"' and O.state_='0010' and O.ACC_TYPE='0010' and O.FbSdk='Y' and (O.account_type='out_account' or O.account_type='inAndOut_account') and account_purpose='default' "; if("in_account".equals(accountType)){ sql ="select id from O where O.own_id='"+ownId+"' and O.state_='0010' and O.ACC_TYPE='0010' and (O.account_type='in_account' or O.account_type='inAndOut_account') and account_purpose='default'"; }else if("inAndOut_account".equals(accountType)){ diff --git a/src_tenwa/com/tenwa/flow/comm/handler/CommercialVehicleHandler.java b/src_tenwa/com/tenwa/flow/comm/handler/CommercialVehicleHandler.java new file mode 100644 index 000000000..825dcc43c --- /dev/null +++ b/src_tenwa/com/tenwa/flow/comm/handler/CommercialVehicleHandler.java @@ -0,0 +1,26 @@ +package com.tenwa.flow.comm.handler; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.are.jbo.JBOTransaction; +import com.amarsoft.awe.dw.handler.impl.CommonHandler; +import jbo.com.tenwa.lease.carbrand.LB_CARDATA_MODEL; + +import java.math.BigDecimal; + +public class CommercialVehicleHandler extends CommonHandler { + @Override + protected void beforeUpdate(JBOTransaction tx, BizObject bo) throws Exception { + BizObjectManager lcmManage= JBOFactory.getBizObjectManager(LB_CARDATA_MODEL.CLASS_NAME, tx); + BizObject lcm = lcmManage.createQuery("brandname=:brandname AND seriesname=:seriesname AND modelname=:modelname ") + .setParameter("brandname", bo.getAttribute("BRAND").toString()) + .setParameter("seriesname", bo.getAttribute("CARS").toString()) + .setParameter("modelname", bo.getAttribute("MODELS").toString()).getSingleResult(true); + if(lcm != null){ + lcm.setAttributeValue("price" , new BigDecimal( bo.getAttribute("THE_GUIDED").toString()).divide(new BigDecimal("10000"))); + lcmManage.saveObject(lcm); + } + super.beforeUpdate(tx, bo); + } +} diff --git a/src_tenwa/com/tenwa/flow/comm/handler/PassengerCarHandler.java b/src_tenwa/com/tenwa/flow/comm/handler/PassengerCarHandler.java new file mode 100644 index 000000000..0a3f2bed7 --- /dev/null +++ b/src_tenwa/com/tenwa/flow/comm/handler/PassengerCarHandler.java @@ -0,0 +1,26 @@ +package com.tenwa.flow.comm.handler; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.BizObjectManager; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.are.jbo.JBOTransaction; +import com.amarsoft.awe.dw.handler.impl.CommonHandler; +import jbo.app.tenwa.customer.LB_CARDATA_COMMERCIAL_MODEL; + +import java.math.BigDecimal; + +public class PassengerCarHandler extends CommonHandler { + @Override + protected void beforeUpdate(JBOTransaction tx, BizObject bo) throws Exception { + BizObjectManager lccmManage= JBOFactory.getBizObjectManager(LB_CARDATA_COMMERCIAL_MODEL.CLASS_NAME, tx); + BizObject lccm = lccmManage.createQuery(" brand_name=:brand_name AND series_name=:series_name AND model_name=:model_name ") + .setParameter("brand_name", bo.getAttribute("BRAND").toString()) + .setParameter("series_name", bo.getAttribute("CARS").toString()) + .setParameter("model_name", bo.getAttribute("MODELS").toString()).getSingleResult(true); + if(lccm != null){ + lccm.setAttributeValue("price" , new BigDecimal( bo.getAttribute("THE_GUIDED").toString()).divide(new BigDecimal("10000"))); + lccmManage.saveObject(lccm); + } + super.beforeUpdate(tx, bo); + } +}