From 4345b3445d50f1a02996f93d30b9dfa533f80e40 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Tue, 8 Oct 2019 19:25:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributorApproval/LDistributorInfo.jsp | 4 ++-- .../DistributorChange/LDistributorInfo.jsp | 4 ++-- .../app/vehicleAssessment/vehicleAssessmentController.java | 7 ++++--- .../commbusiness/LBCustomerRelaProjToContractBusiness.java | 5 +++-- .../commbusiness/LBProjectIntoTempInitCarBusiness.java | 2 +- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp index 0673494d5..25810df47 100644 --- a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp +++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp @@ -231,11 +231,11 @@ $(function(){ setItemValue(0,0,'MARGIN_SCALE_SET','0'); }else{ setItemRequired(0,'TOTAL',false); - setItemRequired(0,'MARGIN_SCALE_SET',true); + setItemRequired(0,'MARGIN_SCALE_SET',false); setItemRequired(0,'LIMIT_END_DATE',true); setItemValue(0,0,'MARGIN_SCALE_SET',''); setItemValue(0,0,'TOTAL',''); - alert("保证金比例必填"); + //alert("保证金比例必填"); } } function changeTotalRequiredv(){ diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorInfo.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorInfo.jsp index a704d8957..b898e4c68 100644 --- a/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorInfo.jsp +++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorChange/LDistributorInfo.jsp @@ -188,11 +188,11 @@ function saveproj_name(){ setItemValue(0,0,'MARGIN_SCALE_SET','0'); }else{ setItemRequired(0,'TOTAL',false); - setItemRequired(0,'MARGIN_SCALE_SET',true); + setItemRequired(0,'MARGIN_SCALE_SET',false); setItemRequired(0,'LIMIT_END_DATE',true); setItemValue(0,0,'MARGIN_SCALE_SET',''); setItemValue(0,0,'TOTAL',''); - alert("保证金比例必填"); + //alert("保证金比例必填"); } } function changeTotalRequiredv(){ diff --git a/src_tenwa/com/tenwa/lease/app/vehicleAssessment/vehicleAssessmentController.java b/src_tenwa/com/tenwa/lease/app/vehicleAssessment/vehicleAssessmentController.java index 59557e1cf..c49ba2dca 100644 --- a/src_tenwa/com/tenwa/lease/app/vehicleAssessment/vehicleAssessmentController.java +++ b/src_tenwa/com/tenwa/lease/app/vehicleAssessment/vehicleAssessmentController.java @@ -97,14 +97,15 @@ public class vehicleAssessmentController { if(null == itemno || "".equals(itemno) || itemno.length() == 0 ){ return "没有查询到对应的上牌地区信息！！！"; }else{ - BizObject usedCarCode = codeSNT.createQuery("select itemname,itemno FROM O WHERE codeno='UsedCarCode' AND itemno=:AREA") + /*BizObject usedCarCode = codeSNT.createQuery("select itemname,itemno FROM O WHERE codeno='UsedCarCode' AND itemno=:AREA") .setParameter("AREA",itemno).getSingleResult(false); if(null != usedCarCode){ zone = itemno; }else{ zone = itemno.substring(0,4)+"00"; - } - System.out.println("二手车评估地址ID:"+zone); + }*/ + zone = itemno; + System.out.println("二手车评估地址ID:"+zone); } } diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaProjToContractBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaProjToContractBusiness.java index bf6b11715..b9d249b15 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaProjToContractBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBCustomerRelaProjToContractBusiness.java @@ -32,12 +32,13 @@ public class LBCustomerRelaProjToContractBusiness extends BaseBussiness { this.initBussinessParam(Sqlca); MapfromCondtion=new HashMap(); fromCondtion.put("PROJECT_ID",this.getAttribute("ProjectId").toString()); - fromCondtion.put("contract_id",""); + Map other=new HashMap(); other.put("flowunid",this.getAttribute("FlowUnid").toString()); DataOperatorUtil.copyJBOSet(LB_GUARANTEE_UNIT.CLASS_NAME, fromCondtion, LB_GUARANTEE_UNIT_TEMP.CLASS_NAME, null, other, null,Sqlca); DataOperatorUtil.copyJBOSet(CUSTOMER_FAMILY.CLASS_NAME, fromCondtion, CUSTOMER_FAMILY_TEMP.CLASS_NAME, null, other, null, Sqlca); - List unionList= DataOperatorUtil.getSetJBO(LB_UNION_LESSEE.CLASS_NAME, fromCondtion, Sqlca); + fromCondtion.put("contract_id",""); + List unionList= DataOperatorUtil.getSetJBO(LB_UNION_LESSEE.CLASS_NAME, fromCondtion, Sqlca); //List unitList=DataOperatorUtil.getSetJBO(LB_GUARANTEE_UNIT.CLASS_NAME, fromCondtion, Sqlca); for(BizObject union:unionList){ fromCondtion.clear(); diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java index e4f53fd8c..3d71ec037 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java @@ -123,7 +123,7 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness { MapfamilyProperty=new HashMap(); familyProperty.put("FLOWUNID", flowunid); familyProperty.put(CUSTOMER_INFO_TEMP.customerid, customerId); - familyProperty.put("name", custName); + //familyProperty.put("name", custName); //更新CUSTOMER_PERSON MappersonProperty=new HashMap(); personProperty.put("FLOWUNID", flowunid);