anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.修改本方账户校验逻辑

Browse Source 
2.银行账户类型增加收付款功能。
3.实际付款发起申请（用户名‘安鹏国际’写死，只有安鹏国际租赁（深圳）才能发起付款）
This commit is contained in:
zhangbb 2018-10-12 17:39:35 +08:00
parent 8cef11522d
commit 3cd74bb09f
6 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,6 +69,10 @@
<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=Info06;Describe=定义按钮事件-;]~*/%> <%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=Info06;Describe=定义按钮事件-;]~*/%>
<script type="text/javascript"> <script type="text/javascript">
/*~[Describe=保存记录;InputParam=无;OutPutParam=无;]~*/ /*~[Describe=保存记录;InputParam=无;OutPutParam=无;]~*/
$(function(){
changeFbSdk();
});
function saveRecord(){ function saveRecord(){
var accountType = getItemValue(0, 0, "account_type"); var accountType = getItemValue(0, 0, "account_type");
var accType = getItemValue(0, 0, "acc_type"); var accType = getItemValue(0, 0, "acc_type");
@ -77,10 +81,10 @@
var id="<%=id%>"; var id="<%=id%>";
var sParams = "accountType="+accountType+",accType="+accType+",state="+state+",FbSdk="+FbSdk; var sParams = "accountType="+accountType+",accType="+accType+",state="+state+",FbSdk="+FbSdk;
var sReturn = RunJavaMethodTrans("com.tenwa.reckon.copydata.CalcRentCompare", "compare",sParams ); var sReturn = RunJavaMethodTrans("com.tenwa.reckon.copydata.CalcRentCompare", "compare",sParams );
if(sReturn=="null"||(sReturn=="notNull"&&state!="0010")||(sReturn=="notNull"&&state=="0010"&&FbSdk!="Y")||sReturn==id){ if(sReturn=="null"||(sReturn!="null"&&state!="0010")||(sReturn!="null"&&state=="0010"&&FbSdk!="Y")||(sReturn!="null"&&state=="0010"&&FbSdk=="Y"&&accountType!="out_account"&&accountType!="inAndOut_account")||sReturn==id){
as_save("myiframe0","parent.AsDialog.ClosePage()"); as_save("myiframe0","parent.AsDialog.ClosePage()");
}else{ }else{
alert("启用状态下的账户账号类型已存在，请检查！"); alert("启用状态下的银企直连账户只能存在一个，请检查！");
} }
} }

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

@ -49,9 +49,8 @@ public class CalcRentCompare implements BizObjectCompare{
FbSdk = fbSdk; FbSdk = fbSdk;
} }
public String compare(JBOTransaction tx) throws JBOException{ public String compare(JBOTransaction tx) throws JBOException{
String sql ="select * from O where O.state_='0010' and O.ACC_TYPE=:accType and ACCOUNT_TYPE=:accountType and FbSdk='Y'"; String sql ="select * from O where O.state_='0010' and O.ACC_TYPE='0010' and O.FbSdk='Y' and (O.account_type='out_account' or O.account_type='inAndOut_account')";
BizObject bo = JBOFactory.createBizObjectQuery(OWN_ACCOUNT.CLASS_NAME,sql) BizObject bo = JBOFactory.createBizObjectQuery(OWN_ACCOUNT.CLASS_NAME,sql).getSingleResult(false);
.setParameter("accType", accType).setParameter("accountType", accountType).getSingleResult(false);
if(bo==null||"".equals(bo)){ if(bo==null||"".equals(bo)){
return "null"; return "null";
} }

11
src_cmb/com/tenwa/sdk/controller/CmbToCallbackController.java
View File

@ -63,16 +63,16 @@ public class CmbToCallbackController extends BaseFlowStartAction {
* 本方放款账户获取######开始 * 本方放款账户获取######开始
*/ */
BizObjectManager accountManager = JBOFactory.getBizObjectManager(OWN_ACCOUNT.CLASS_NAME); BizObjectManager accountManager = JBOFactory.getBizObjectManager(OWN_ACCOUNT.CLASS_NAME);
List<BizObject> accountBoList = accountManager.createQuery("select o.acc_number,o.acc_bank,o.acc_name,o.branch_code,oi.OWN_NAME from o join jbo.com.tenwa.entity.comm.own.OWN_INFO oi on o.own_id = oi.OWN_NUMBER where o.money_type='01' and o.state_='0010' and acc_type='0010' and account_type='out_account' or account_type='inAndOut_account' ").getResultList(false); List<BizObject> accountBoList = accountManager.createQuery("select o.acc_number,o.acc_bank,o.acc_name,o.branch_code,oi.OWN_NAME from o left join jbo.com.tenwa.entity.comm.own.OWN_INFO oi on o.own_id = oi.OWN_NUMBER where o.money_type='01' 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 oi.OWN_NAME='安鹏国际融资租赁（深圳）有限公司'").getResultList(false);
if( accountBoList==null ) { if( accountBoList==null ) {
map.put("code", "1") ; map.put("code", "1") ;
map.put("msg", "本方账户不存在,请检查") ; map.put("msg", "没有匹配的本方账户,请在本方账户中检查！") ;
JSONObject jsonObj = JSONObject.fromObject(map); JSONObject jsonObj = JSONObject.fromObject(map);
return jsonObj.toString(); return jsonObj.toString();
} }
if( accountBoList!=null && accountBoList.size()>1 ) { if( accountBoList!=null && accountBoList.size()>1 ) {
map.put("code", "1") ; map.put("code", "1") ;
map.put("msg", "启用的汽车类放款账户有多个请检查,请检查") ; map.put("msg", "启用的汽车类放款账户只能同时存在一个,请在本方账户中检查！") ;
JSONObject jsonObj = JSONObject.fromObject(map); JSONObject jsonObj = JSONObject.fromObject(map);
return jsonObj.toString(); return jsonObj.toString();
} }
@ -80,8 +80,9 @@ public class CmbToCallbackController extends BaseFlowStartAction {
/* /*
* 本方放款账户获取######结束 * 本方放款账户获取######结束
*/ */
//安鹏要求采用固定写死值。
String LGNNAM = accountBo.getAttribute("OWN_NAME").toString(); //String LGNNAM = accountBo.getAttribute("OWN_NAME").toString();
String LGNNAM = "安鹏经办";
String FUNNAM = "NTSTLINF"; String FUNNAM = "NTSTLINF";
int DATTYP = 2; int DATTYP = 2;

9
src_cmb/com/tenwa/sdk/controller/CmbToPayController.java
View File

@ -88,10 +88,10 @@ public class CmbToPayController extends BaseFlowStartAction {
* 本方放款账户获取######开始 * 本方放款账户获取######开始
*/ */
BizObjectManager accountManager = JBOFactory.getBizObjectManager(OWN_ACCOUNT.CLASS_NAME); BizObjectManager accountManager = JBOFactory.getBizObjectManager(OWN_ACCOUNT.CLASS_NAME);
List<BizObject> accountBoList = accountManager.createQuery("select o.id,o.acc_number,o.acc_bank,o.acc_name,o.branch_code,oi.OWN_NAME from o join jbo.com.tenwa.entity.comm.own.OWN_INFO oi on o.own_id = oi.OWN_NUMBER where o.money_type='01' and o.state_='0010' and acc_type='0010' and (account_type='out_account' or account_type='inAndOut_account') ").getResultList(false); List<BizObject> accountBoList = accountManager.createQuery("select o.id,o.acc_number,o.acc_bank,o.acc_name,o.branch_code,oi.OWN_NAME from o left join jbo.com.tenwa.entity.comm.own.OWN_INFO oi on o.own_id = oi.OWN_NUMBER where o.money_type='01' 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 oi.OWN_NAME='安鹏国际融资租赁（深圳）有限公司'").getResultList(false);
if( accountBoList==null ||accountBoList.size()==0) { if( accountBoList==null ||accountBoList.size()==0) {
map.put("code", "1") ; map.put("code", "1") ;
map.put("msg", "本方账户不存在,请检查") ; map.put("msg", "没有匹配的本方账户,请在本方账户中检查！") ;
JSONObject jsonObj = JSONObject.fromObject(map); JSONObject jsonObj = JSONObject.fromObject(map);
return jsonObj.toString(); return jsonObj.toString();
} }
@ -111,8 +111,9 @@ public class CmbToPayController extends BaseFlowStartAction {
* 付款申请基础信息定义######开始 * 付款申请基础信息定义######开始
*/ */
//安鹏要求采用固定写死值。
String LGNNAM = accountBo.getAttribute("OWN_NAME").toString(); //String LGNNAM = accountBo.getAttribute("OWN_NAME").toString();
String LGNNAM = "安鹏经办";
String FUNNAM = "DCPAYREQ"; String FUNNAM = "DCPAYREQ";
int DATTYP = 2; int DATTYP = 2;
String BUSMOD = "00001"; //默认参数 请按照实际情况谨慎修改 String BUSMOD = "00001"; //默认参数 请按照实际情况谨慎修改

8
src_cmb/com/tenwa/sdk/controller/PayController.java
View File

@ -105,7 +105,9 @@ public class PayController extends BaseFlowStartAction {
JSONObject jsonObj = JSONObject.fromObject(map); JSONObject jsonObj = JSONObject.fromObject(map);
return jsonObj.toString(); return jsonObj.toString();
} }
String LGNNAM = infoBo.getAttribute("OWN_NAME").toString(); //安鹏要求采用固定写死值。
//String LGNNAM = accountBo.getAttribute("OWN_NAME").toString();
String LGNNAM = "安鹏经办";
String FUNNAM = "NTSTLINF"; String FUNNAM = "NTSTLINF";
int DATTYP = 2; int DATTYP = 2;
@ -231,7 +233,9 @@ public class PayController extends BaseFlowStartAction {
JSONObject jsonObj = JSONObject.fromObject(map); JSONObject jsonObj = JSONObject.fromObject(map);
return jsonObj.toString(); return jsonObj.toString();
} }
String LGNNAM = infoBo.getAttribute("OWN_NAME").toString(); //安鹏要求采用固定写死值。
//String LGNNAM = accountBo.getAttribute("OWN_NAME").toString();
String LGNNAM = "安鹏经办";
String FUNNAM = "DCPAYREQ"; String FUNNAM = "DCPAYREQ";
int DATTYP = 2; int DATTYP = 2;
String BUSMOD = "00001"; //默认参数 请按照实际情况谨慎修改 String BUSMOD = "00001"; //默认参数 请按照实际情况谨慎修改

9
src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java
View File

@ -41,6 +41,7 @@ public class BusinessApprovalStartAction extends BaseFlowStartAction{
private String geartype; private String geartype;
private String ProductName; private String ProductName;
private String ProductId; private String ProductId;
private String HaveCommission;
private String CurOrgID; private String CurOrgID;
@ -290,4 +291,12 @@ public class BusinessApprovalStartAction extends BaseFlowStartAction{
public void setCurOrgID(String curOrgID) { public void setCurOrgID(String curOrgID) {
CurOrgID = curOrgID; CurOrgID = curOrgID;
} }
public String getHaveCommission() {
return HaveCommission;
}
public void setHaveCommission(String haveCommission) {
HaveCommission = haveCommission;
}
} }