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 cfd8bd015..0188e48c5 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountTempToFormalBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerAccountTempToFormalBusiness.java @@ -40,6 +40,7 @@ public class LBCustomerAccountTempToFormalBusiness extends BaseBussiness{ otherProperty.put("CONTRACT_ID",this.getAttribute("ContractId").toString()); Map other=new HashMap(); other.put("CONTRACT_ID",this.getAttribute("ContractId").toString()); + String flowUnid = this.getAttribute("FlowUnid").toString(); //查看该扣款卡信息是否签约验证过 String flowname=(String)this.getAttribute("FlowName"); if("合同制作流程".equals(flowname)){ @@ -58,13 +59,24 @@ public class LBCustomerAccountTempToFormalBusiness extends BaseBussiness{ signFromCondtion.put("PROJECT_ID",this.getAttribute("ProjectId").toString()); DataOperatorUtil.copyJBOSet(CUSTOMER_ACCOUNT.CLASS_NAME, signFromCondtion,CUSTOMER_ACCOUNT_HIS.CLASS_NAME, null, null,null, Sqlca); } + //查看在业务变更过程中是否进行签约 + BizObjectManager catManager = JBOFactory.getBizObjectManager(CUSTOMER_ACCOUNT_TEMP.CLASS_NAME,Sqlca); + BizObject cat = catManager.createQuery(" flowunid=:flowunid ").setParameter("flowunid", flowUnid).getSingleResult(false); + if(cat != null){ + BizObject ca = CcaManager.createQuery(" acc_number=:acc_number AND bank_name=:bank_name AND account=:account AND mobile=:mobile and SIGN_STATUS='Y' ") + .setParameter("acc_number", cat.getAttribute("acc_number").getString()).setParameter("bank_name", cat.getAttribute("bank_name").getString()) + .setParameter("account", cat.getAttribute("account").getString()).setParameter("mobile", cat.getAttribute("mobile").getString()).getSingleResult(false); + if(ca != null){ + other.put("SIGN_STATUS", "Y"); + } + } DataOperatorUtil.copyJBOSet(CUSTOMER_ACCOUNT_TEMP.CLASS_NAME, fromCondtion,CUSTOMER_ACCOUNT.CLASS_NAME, toCondtion, other,null, Sqlca); }else if(!"合同变更流程".equals(flowname)){ 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(); - fromCondtion.put("flowunid",this.getAttribute("FlowUnid").toString()); + fromCondtion.put("flowunid",flowUnid); fromCondtion.put("Partner_", "Y"); toCondtion.clear(); toCondtion.put("PROJECT_ID",this.getAttribute("ProjectId").toString()); diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaFormalToTempBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaFormalToTempBusiness.java index 4a13211b1..0ebd1db7e 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaFormalToTempBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaFormalToTempBusiness.java @@ -50,7 +50,8 @@ public class LBCustomerRelaFormalToTempBusiness extends BaseBussiness { } DataOperatorUtil.copyJBOSet(CUSTOMER_CERT.CLASS_NAME, fromCondtion, CUSTOMER_CERT_TEMP.CLASS_NAME, null, other, null, Sqlca); - fromCondtion.put("project_id", this.getAttribute("ProjectId").toString()); + fromCondtion.clear(); + fromCondtion.put("project_id", this.getAttribute("ProjectId").toString()); DataOperatorUtil.copyJBOSet(CUSTOMER_FAMILY.CLASS_NAME, fromCondtion, CUSTOMER_FAMILY_TEMP.CLASS_NAME, null, other, null, Sqlca); } for(BizObject unit:unitList){ diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProCustomerRelaTempToFormalBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProCustomerRelaTempToFormalBusiness.java index a02aeb136..2ed25dd61 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProCustomerRelaTempToFormalBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProCustomerRelaTempToFormalBusiness.java @@ -59,9 +59,14 @@ public class LBProCustomerRelaTempToFormalBusiness extends BaseBussiness { DataOperatorUtil.copyJBOSet(CUSTOMER_COMPANY_TEMP.CLASS_NAME, fromCondtion, CUSTOMER_COMPANY.CLASS_NAME, toCondtion, null, cc, Sqlca); } DataOperatorUtil.copyJBOSet(CUSTOMER_CERT_TEMP.CLASS_NAME, fromCondtion, CUSTOMER_CERT.CLASS_NAME, toCondtion, null, cc, Sqlca); - DataOperatorUtil.copyJBOSet(CUSTOMER_FAMILY_TEMP.CLASS_NAME, fromCondtion, CUSTOMER_FAMILY.CLASS_NAME, toCondtion, null, cc, Sqlca); + //DataOperatorUtil.copyJBOSet(CUSTOMER_FAMILY_TEMP.CLASS_NAME, fromCondtion, CUSTOMER_FAMILY.CLASS_NAME, toCondtion, null, cc, Sqlca); DataOperatorUtil.copyJBOSet(CUSTOMER_ADDRESS_TEMP.CLASS_NAME, fromCondtion, CUSTOMER_ADDRESS.CLASS_NAME, toCondtion, null, cc, Sqlca); } + fromCondtion.clear(); + fromCondtion.put("flowunid",this.getAttribute("FlowUnid").toString()); + toCondtion.clear(); + toCondtion.put("PROJECT_ID", this.getAttribute("ProjectId").toString()); + DataOperatorUtil.copyJBOSet(CUSTOMER_FAMILY_TEMP.CLASS_NAME, fromCondtion, CUSTOMER_FAMILY.CLASS_NAME, toCondtion, null, cc, Sqlca); String sMessage="true"; return sMessage; }