From 3cd74bb09f41ee78a01ac112d99cedde1397fead Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Fri, 12 Oct 2018 17:39:35 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=9C=AC=E6=96=B9=E8=B4=A6?=
 =?UTF-8?q?=E6=88=B7=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91=202.=E9=93=B6?=
 =?UTF-8?q?=E8=A1=8C=E8=B4=A6=E6=88=B7=E7=B1=BB=E5=9E=8B=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=94=B6=E4=BB=98=E6=AC=BE=E5=8A=9F=E8=83=BD=E3=80=82=203.?=
 =?UTF-8?q?=E5=AE=9E=E9=99=85=E4=BB=98=E6=AC=BE=E5=8F=91=E8=B5=B7=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=EF=BC=88=E7=94=A8=E6=88=B7=E5=90=8D=E2=80=98=E5=AE=89?=
 =?UTF-8?q?=E9=B9=8F=E5=9B=BD=E9=99=85=E2=80=99=E5=86=99=E6=AD=BB=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=AA=E6=9C=89=E5=AE=89=E9=B9=8F=E5=9B=BD=E9=99=85=E7=A7=9F?=
 =?UTF-8?q?=E8=B5=81=EF=BC=88=E6=B7=B1=E5=9C=B3=EF=BC=89=E6=89=8D=E8=83=BD?=
 =?UTF-8?q?=E5=8F=91=E8=B5=B7=E4=BB=98=E6=AC=BE=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OwnConfig/BOwnAccount/BOwnAccount.jsp             |  8 ++++++--
 calc/com/tenwa/reckon/copydata/CalcRentCompare.java   |  5 ++---
 .../tenwa/sdk/controller/CmbToCallbackController.java | 11 ++++++-----
 .../com/tenwa/sdk/controller/CmbToPayController.java  |  9 +++++----
 src_cmb/com/tenwa/sdk/controller/PayController.java   |  8 ++++++--
 .../projectapproval/BusinessApprovalStartAction.java  |  9 +++++++++
 6 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp
index 47253c4de..40422a3c0 100644
--- a/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp
+++ b/WebContent/Tenwa/Core/SystemConfig/OwnConfig/BOwnAccount/BOwnAccount.jsp
@@ -69,6 +69,10 @@
 <%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=Info06;Describe=定义按钮事件-;]~*/%>
 <script type="text/javascript">
 /*~[Describe=保存记录;InputParam=无;OutPutParam=无;]~*/
+ $(function(){
+	 changeFbSdk();
+ });
+
 	function saveRecord(){
 		var accountType = getItemValue(0, 0, "account_type");
 		var accType = getItemValue(0, 0, "acc_type");
@@ -77,10 +81,10 @@
 		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")||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()");
 		}else{
-			alert("启用状态下的账户账号类型已存在，请检查！");
+			alert("启用状态下的银企直连账户只能存在一个，请检查！");
 		} 
 	}
 	
diff --git a/calc/com/tenwa/reckon/copydata/CalcRentCompare.java b/calc/com/tenwa/reckon/copydata/CalcRentCompare.java
index 4e3bdbeeb..bb6235780 100644
--- a/calc/com/tenwa/reckon/copydata/CalcRentCompare.java
+++ b/calc/com/tenwa/reckon/copydata/CalcRentCompare.java
@@ -49,9 +49,8 @@ public class CalcRentCompare implements BizObjectCompare{
 		FbSdk = fbSdk;
 	}
 	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'";
-		BizObject bo = JBOFactory.createBizObjectQuery(OWN_ACCOUNT.CLASS_NAME,sql)
-				.setParameter("accType", accType).setParameter("accountType", accountType).getSingleResult(false);
+		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).getSingleResult(false);
 		if(bo==null||"".equals(bo)){
 			return "null";
 		}
diff --git a/src_cmb/com/tenwa/sdk/controller/CmbToCallbackController.java b/src_cmb/com/tenwa/sdk/controller/CmbToCallbackController.java
index 8f9c08199..c3f330079 100644
--- a/src_cmb/com/tenwa/sdk/controller/CmbToCallbackController.java
+++ b/src_cmb/com/tenwa/sdk/controller/CmbToCallbackController.java
@@ -63,16 +63,16 @@ public class CmbToCallbackController extends BaseFlowStartAction {
 		 * 本方放款账户获取######开始
 		 */
 		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 ) {
 			map.put("code", "1") ;
-			map.put("msg", "本方账户不存在,请检查") ;
+			map.put("msg", "没有匹配的本方账户,请在本方账户中检查！") ;
 			JSONObject jsonObj = JSONObject.fromObject(map);
 			return jsonObj.toString();
 		}
 		if( accountBoList!=null && accountBoList.size()>1 ) {
 			map.put("code", "1") ;
-			map.put("msg", "启用的汽车类放款账户有多个请检查,请检查") ;
+			map.put("msg", "启用的汽车类放款账户只能同时存在一个,请在本方账户中检查！") ;
 			JSONObject jsonObj = JSONObject.fromObject(map);
 			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";
 		int    DATTYP = 2;
 		
diff --git a/src_cmb/com/tenwa/sdk/controller/CmbToPayController.java b/src_cmb/com/tenwa/sdk/controller/CmbToPayController.java
index 1c7dee0da..18d7df719 100644
--- a/src_cmb/com/tenwa/sdk/controller/CmbToPayController.java
+++ b/src_cmb/com/tenwa/sdk/controller/CmbToPayController.java
@@ -88,10 +88,10 @@ public class CmbToPayController extends BaseFlowStartAction {
 		 * 本方放款账户获取######开始
 		 */
 		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) {
 			map.put("code", "1") ;
-			map.put("msg", "本方账户不存在,请检查") ;
+			map.put("msg", "没有匹配的本方账户,请在本方账户中检查！") ;
 			JSONObject jsonObj = JSONObject.fromObject(map);
 			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";
 		int    DATTYP = 2;
 		String BUSMOD = "00001";  //默认参数 请按照实际情况谨慎修改
diff --git a/src_cmb/com/tenwa/sdk/controller/PayController.java b/src_cmb/com/tenwa/sdk/controller/PayController.java
index b1e87f9d8..b3cf1d148 100644
--- a/src_cmb/com/tenwa/sdk/controller/PayController.java
+++ b/src_cmb/com/tenwa/sdk/controller/PayController.java
@@ -105,7 +105,9 @@ public class PayController extends BaseFlowStartAction {
 			JSONObject jsonObj = JSONObject.fromObject(map);
 			return jsonObj.toString();
 		}
-		String LGNNAM = infoBo.getAttribute("OWN_NAME").toString();
+		//安鹏要求采用固定写死值。
+		//String LGNNAM = accountBo.getAttribute("OWN_NAME").toString();
+		String LGNNAM = "安鹏经办";
 		String FUNNAM = "NTSTLINF";
 		int    DATTYP = 2;
 		
@@ -231,7 +233,9 @@ public class PayController extends BaseFlowStartAction {
 			JSONObject jsonObj = JSONObject.fromObject(map);
 			return jsonObj.toString();
 		}
-		String LGNNAM = infoBo.getAttribute("OWN_NAME").toString();
+		//安鹏要求采用固定写死值。
+		//String LGNNAM = accountBo.getAttribute("OWN_NAME").toString();
+		String LGNNAM = "安鹏经办";
 		String FUNNAM = "DCPAYREQ";
 		int    DATTYP = 2;
 		String BUSMOD = "00001";  //默认参数 请按照实际情况谨慎修改
diff --git a/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java b/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java
index 19e4c6fd9..740d06024 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java
@@ -41,6 +41,7 @@ public class BusinessApprovalStartAction extends BaseFlowStartAction{
 	private String geartype;
 	private String ProductName;
 	private String ProductId;
+	private String HaveCommission;
 	
 	private String CurOrgID;
 	
@@ -290,4 +291,12 @@ public class BusinessApprovalStartAction extends BaseFlowStartAction{
 	public void setCurOrgID(String curOrgID) {
 		CurOrgID = curOrgID;
 	}
+	public String getHaveCommission() {
+		return HaveCommission;
+	}
+
+	public void setHaveCommission(String haveCommission) {
+		HaveCommission = haveCommission;
+	}
+
 }