From 07f6537f85cc802370f54dc1022bd852b92ae151 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Tue, 24 Jul 2018 15:13:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=8F=E9=94=80=E5=95=86?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E7=BB=93=E6=9D=9F=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributorAccountTempToFormalBusiness.java | 1 + .../DistributorInfoTempToFormalBusiness.java | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DistributorAccountTempToFormalBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DistributorAccountTempToFormalBusiness.java index f95626184..88c592aa3 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DistributorAccountTempToFormalBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DistributorAccountTempToFormalBusiness.java @@ -44,6 +44,7 @@ public class DistributorAccountTempToFormalBusiness extends BaseBussiness { fromCondtion.put("flowunid",this.getAttribute("FlowUnid").toString()); toCondtion.clear(); toCondtion.put("distributor_id", dsatlst.get(0).getAttribute("distributor_id").getString()); + DataOperatorUtil.deleteJBOByCondtion(DISTRIBUTOR_ACCOUNT.CLASS_NAME, toCondtion, Sqlca); DataOperatorUtil.copyJBOSet(DISTRIBUTOR_ACCOUNT_TEMP.CLASS_NAME, fromCondtion, DISTRIBUTOR_ACCOUNT.CLASS_NAME, toCondtion, null, null, Sqlca); } diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DistributorInfoTempToFormalBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DistributorInfoTempToFormalBusiness.java index 61b69d660..b37e9ff56 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DistributorInfoTempToFormalBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/DistributorInfoTempToFormalBusiness.java @@ -41,6 +41,7 @@ public class DistributorInfoTempToFormalBusiness extends BaseBussiness { String orgid=this.saveOrgInfo(Sqlca); MapfromCondtion=new HashMap(); fromCondtion.put("flowunid",this.getAttribute("FlowUnid").toString()); + String flowName = this.getAttribute("FlowName").toString(); BizObject dst= DataOperatorUtil.getSingleJBO(DISTRIBUTOR_INFO_TEMP.CLASS_NAME, fromCondtion, Sqlca); String disStatus = dst.getAttribute("distributor_status").toString(); dst.setAttributeValue("orgid",orgid ); @@ -56,7 +57,16 @@ public class DistributorInfoTempToFormalBusiness extends BaseBussiness { toCondtion.clear(); toCondtion.put("distributor_no", dst.getAttribute("distributor_no").getString()); - DataOperatorUtil.copyJBOSet(DISTRIBUTOR_INFO_TEMP.CLASS_NAME, fromCondtion, DISTRIBUTOR_INFO.CLASS_NAME, toCondtion, null, dc, Sqlca); + + Map otherProperty =new HashMap(); + if("经销商变更审核流程".equals(flowName)){ + otherProperty.clear(); + BizObject di = DataOperatorUtil.getSingleJBO(DISTRIBUTOR_INFO.CLASS_NAME, toCondtion, Sqlca); + otherProperty.put("DISTRIBUTOR_NO", di.getAttribute("DISTRIBUTOR_NO").toString()); + otherProperty.put("ORGID", di.getAttribute("ORGID").toString()); + } + + DataOperatorUtil.copyJBOSet(DISTRIBUTOR_INFO_TEMP.CLASS_NAME, fromCondtion, DISTRIBUTOR_INFO.CLASS_NAME, toCondtion, otherProperty, dc, Sqlca); String sMessage="true"; return sMessage; }