From 475c80fe68f11c2d91ffd2899b43801d997b5bc0 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Tue, 29 Oct 2019 11:20:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=98=E9=87=8F=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=EF=BC=8C=E4=B8=9A=E5=8A=A1=E5=8F=98=E6=9B=B4=E9=85=8D?= =?UTF-8?q?=E5=81=B6=E4=BF=A1=E6=81=AF=E9=87=8D=E5=A4=8D=E3=80=81=E6=8F=90?= =?UTF-8?q?=E5=89=8D=E7=BB=93=E6=B8=85=E6=9C=89=E6=95=B0=E6=8D=AE=E4=B8=8D?= =?UTF-8?q?=E5=B8=A6=E5=BD=93=E5=89=8D=E7=B3=BB=E7=BB=9F=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E3=80=81=E6=8E=A5=E5=8F=A3=E5=B9=B3=E5=8F=B0=E8=BF=9B=E5=8D=95?= =?UTF-8?q?=E5=90=88=E5=90=8C=E5=88=B6=E4=BD=9C=E6=97=A0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LBContractPersonBaseInfo/LBContractPersonBaseInfo.jsp | 4 ++-- .../Comm/LCContractTerminate/LCContractTerminateInfo.jsp | 5 ++++- .../commbusiness/LBCustomerRelaFormalToTempBusiness.java | 3 ++- .../commbusiness/LBCustomerRelaTempToFormalBusiness.java | 8 ++++++-- .../LBProCustomerRelaTempToFormalBusiness.java | 6 +++++- 5 files changed, 19 insertions(+), 7 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractPersonBaseInfo/LBContractPersonBaseInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractPersonBaseInfo/LBContractPersonBaseInfo.jsp index 072aba593..7b1ff3df7 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractPersonBaseInfo/LBContractPersonBaseInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractPersonBaseInfo/LBContractPersonBaseInfo.jsp @@ -32,9 +32,9 @@ isShowButton=false; doTemp.setReadOnly("CONTRACT_NUMBER", true); } - if(null!=ishistory&&ishistory.equals("true")){ + /* if(null!=ishistory&&ishistory.equals("true")){ doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataInfoHistory");//如果是历史则新显示历史数据 - } + } */ doTemp.setHtmlEvent("CONTRACT_NUMBER", "onChange", "copyContNumToContNo"); ASObjectWindowCalc dwTemp = new ASObjectWindowCalc(CurPage, doTemp,request); //ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp index 24b275ad0..a863f67f3 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp @@ -246,7 +246,10 @@ jQuery(function(){ setItemValue(0,0,"flowunid","<%=flowunid%>"); - setItemValue(0,0,"PAYDAY_DATE","<%=StringFunction.getToday()%>"); + var payday_date = getItemValue(0,getRow(),"PAYDAY_DATE"); + if(""==payday_date || "undefined"==payday_date || null == payday_date){ + setItemValue(0,0,"PAYDAY_DATE","<%=StringFunction.getToday()%>"); + } //设置商定罚息带出逾期罚息 //setItemValue(0,0,"AGREED_PENALTY",getItemValue(0,0,'DUN_PENALTY')); //判断其他应收和其他应退是否为空 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 cfed4bdb2..4a13211b1 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaFormalToTempBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaFormalToTempBusiness.java @@ -50,6 +50,7 @@ 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()); DataOperatorUtil.copyJBOSet(CUSTOMER_FAMILY.CLASS_NAME, fromCondtion, CUSTOMER_FAMILY_TEMP.CLASS_NAME, null, other, null, Sqlca); } for(BizObject unit:unitList){ @@ -64,7 +65,7 @@ public class LBCustomerRelaFormalToTempBusiness extends BaseBussiness { fromCondtion.put("customerid", unit.getAttribute("ASSUROR").getString()); DataOperatorUtil.copyJBOSet(CUSTOMER_PERSON.CLASS_NAME, fromCondtion, CUSTOMER_PERSON_TEMP.CLASS_NAME, null, other, null, Sqlca); DataOperatorUtil.copyJBOSet(CUSTOMER_CERT.CLASS_NAME, fromCondtion, CUSTOMER_CERT_TEMP.CLASS_NAME, null, other, null, Sqlca); - DataOperatorUtil.copyJBOSet(CUSTOMER_FAMILY.CLASS_NAME, fromCondtion, CUSTOMER_FAMILY_TEMP.CLASS_NAME, null, other, null, Sqlca); + //DataOperatorUtil.copyJBOSet(CUSTOMER_FAMILY.CLASS_NAME, fromCondtion, CUSTOMER_FAMILY_TEMP.CLASS_NAME, null, other, null, Sqlca); DataOperatorUtil.copyJBOSet(CUSTOMER_ADDRESS.CLASS_NAME, fromCondtion, CUSTOMER_ADDRESS_TEMP.CLASS_NAME, null, other, null, Sqlca); } diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaTempToFormalBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaTempToFormalBusiness.java index 79e85bbbc..51129974a 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaTempToFormalBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaTempToFormalBusiness.java @@ -48,6 +48,7 @@ public class LBCustomerRelaTempToFormalBusiness extends BaseBussiness { String certType = this.getAttribute("certtype").toString(); //String certId = this.getAttribute("certNo").toString(); String certId = this.getAttribute("certid").toString(); + String flowName = this.getAttribute("FlowName").toString(); BizObjectManager bomCT1 = JBOFactory.getBizObjectManager(CUSTOMER_CERT.CLASS_NAME,Sqlca); BizObjectManager bomCTT1 = JBOFactory.getBizObjectManager(CUSTOMER_TYPE.CLASS_NAME,Sqlca); //客户类型临时表 List boCT1 = bomCT1.createQuery("certtype='"+certType+"' and certid='"+certId+"'").getResultList(false); @@ -171,8 +172,11 @@ public class LBCustomerRelaTempToFormalBusiness extends BaseBussiness { //配偶信息不考虑存量客户 fromCondtion.clear(); fromCondtion.put("flowunid",this.getAttribute("FlowUnid").toString()); - fromCondtion.put("project_id",this.getAttribute("ProjectId").toString()); - DataOperatorUtil.copyJBOSet(CUSTOMER_FAMILY_TEMP.CLASS_NAME, fromCondtion, CUSTOMER_FAMILY.CLASS_NAME, null, null, null, Sqlca); + otherProperty.clear(); + if("业务变更流程".equals(flowName)){ + otherProperty.put("project_id",this.getAttribute("ProjectId").toString()); + } + DataOperatorUtil.copyJBOSet(CUSTOMER_FAMILY_TEMP.CLASS_NAME, fromCondtion, CUSTOMER_FAMILY.CLASS_NAME, null, otherProperty, null, Sqlca); String sMessage="true"; return sMessage; } 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..902521fc5 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProCustomerRelaTempToFormalBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProCustomerRelaTempToFormalBusiness.java @@ -38,6 +38,7 @@ public class LBProCustomerRelaTempToFormalBusiness extends BaseBussiness { @Override public Object run(Transaction Sqlca) throws Exception { this.initBussinessParam(Sqlca); + String flowName = this.getAttribute("FlowName").toString(); MapfromCondtion=new HashMap(); fromCondtion.put("flowunid",this.getAttribute("FlowUnid").toString()); List lults= DataOperatorUtil.getSetJBO(LB_UNION_LESSEE_TEMP.CLASS_NAME, fromCondtion, Sqlca); @@ -59,8 +60,11 @@ 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_ADDRESS_TEMP.CLASS_NAME, fromCondtion, CUSTOMER_ADDRESS.CLASS_NAME, toCondtion, null, cc, Sqlca); + if("业务变更流程".equals(flowName)){ + 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;