From 62b825a6beb9397c09deea720c0f201dff9be8d0 Mon Sep 17 00:00:00 2001
From: tangft <32189@DESKTOP-M6TAG3K>
Date: Thu, 18 Apr 2019 14:00:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A3=E6=AC=BE=E5=8D=A1=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=EF=BC=8C=E6=9B=B4=E6=8D=A2=E6=88=90=E5=B7=B2?=
 =?UTF-8?q?=E7=BB=8F=E7=AD=BE=E7=BA=A6=E8=BF=87=E7=9A=84=E6=89=A3=E6=AC=BE?=
 =?UTF-8?q?=E5=8D=A1=E4=B8=8D=E9=9C=80=E8=A6=81=E5=86=8D=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E7=AD=BE=E7=BA=A6=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LBCustomerAccountChangeToFormalBusiness.java   | 14 ++++++++------
 .../LBCustomerAccountTempToFormalBusiness.java     | 14 ++++++++------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountChangeToFormalBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountChangeToFormalBusiness.java
index 30e53279e..d86466207 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountChangeToFormalBusiness.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountChangeToFormalBusiness.java
@@ -32,6 +32,7 @@ public class LBCustomerAccountChangeToFormalBusiness extends BaseBussiness{
 	@Override
 	public Object run(Transaction Sqlca) throws Exception {
 		this.initBussinessParam(Sqlca);
+		String status = "N";//默认签约状态
 		String flowunid = this.getAttribute("ObjectNo").toString();
 		//如果是扣款卡信息变更从正式表倒到临时表中
 		String flowname=(String)this.getAttribute("FlowName");
@@ -54,15 +55,16 @@ public class LBCustomerAccountChangeToFormalBusiness extends BaseBussiness{
 				fromCond.put("BANK_NAME", cat.getAttribute("BANK_NAME").getString());
 				fromCond.put("MOBILE", cat.getAttribute("MOBILE").getString());
 				fromCond.put("PROJECT_ID", this.getAttribute("ProjectId").toString());
-				BizObject cah = DataOperatorUtil.getSingleJBO(CUSTOMER_ACCOUNT_HIS.CLASS_NAME, fromCond, Sqlca);
-				if(cah==null){
-					other.put(CUSTOMER_ACCOUNT.sign_status, "N");
-				}else{
-					other.put(CUSTOMER_ACCOUNT.sign_status, cah.getAttribute("SIGN_STATUS").getString());
+				List<BizObject> cahs = DataOperatorUtil.getSetJBO(CUSTOMER_ACCOUNT_HIS.CLASS_NAME, fromCond, Sqlca);
+				for (BizObject cah : cahs) {
+					if("Y".equals(cah.getAttribute("SIGN_STATUS").getString())){
+						status = "Y";
+						break;
+					}
 				}
-				
 			}
 		}
+		other.put(CUSTOMER_ACCOUNT.sign_status, status);
 		Map<String,String> fromCondtion = new HashMap<String, String>();
 		fromCondtion.put("flowunid", flowunid);
 		Map<String,String> toCondtion = new HashMap<String, String>();
diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountTempToFormalBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountTempToFormalBusiness.java
index b7fccea5e..8cb23b19e 100644
--- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountTempToFormalBusiness.java
+++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountTempToFormalBusiness.java
@@ -30,6 +30,7 @@ public class LBCustomerAccountTempToFormalBusiness extends BaseBussiness{
 	@Override
 	public Object run(Transaction Sqlca) throws Exception {
 		this.initBussinessParam(Sqlca);
+		String status = "N";//默认签约状态
 		Map<String,String>fromCondtion=this.getDefaultTempToFormalFromCondtion();
 		Map<String,String> toCondtion=new HashMap<String,String>();
 		toCondtion.put("PROJECT_ID",this.getAttribute("ProjectId").toString());        
@@ -50,15 +51,16 @@ public class LBCustomerAccountTempToFormalBusiness extends BaseBussiness{
 				fromCond.put("ACC_NUMBER", cat.getAttribute("ACC_NUMBER").getString());
 				fromCond.put("BANK_NAME", cat.getAttribute("BANK_NAME").getString());
 				fromCond.put("MOBILE", cat.getAttribute("MOBILE").getString());
-				BizObject cah = DataOperatorUtil.getSingleJBO(CUSTOMER_ACCOUNT_HIS.CLASS_NAME, fromCond, Sqlca);
-				if(cah==null){
-					other.put(CUSTOMER_ACCOUNT.sign_status, "N");
-				}else{
-					other.put(CUSTOMER_ACCOUNT.sign_status, cah.getAttribute("SIGN_STATUS").getString());
+				List<BizObject> cahs = DataOperatorUtil.getSetJBO(CUSTOMER_ACCOUNT_HIS.CLASS_NAME, fromCond, Sqlca);
+				for (BizObject cah : cahs) {
+					if("Y".equals(cah.getAttribute("SIGN_STATUS").getString())){
+						status = "Y";
+						break;
+					}
 				}
-				
 			}
 		}
+		other.put(CUSTOMER_ACCOUNT.sign_status, status);
 		DataOperatorUtil.copyJBOSet(CUSTOMER_ACCOUNT_TEMP.CLASS_NAME, fromCondtion,CUSTOMER_ACCOUNT.CLASS_NAME, toCondtion, other,null, Sqlca);
 		DataOperatorUtil.copyJBOSet(LB_GUARANTEE_UNIT_TEMP.CLASS_NAME, fromCondtion,LB_GUARANTEE_UNIT.CLASS_NAME, toCondtion, otherProperty,null, Sqlca);
 		fromCondtion.clear();