From 38a6578528e8362c4063a95551ee93e49e7bd749 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Fri, 29 Nov 2019 20:36:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E4=BC=A0=E7=BB=9F=E5=92=8C=E6=B1=BD?= =?UTF-8?q?=E8=BD=A6=E7=B1=BB=E4=BC=A0=E7=BB=9F=E4=B8=BB=E9=A2=98=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=90=88=E5=90=8C=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Lease/Flow/Comm/LBContract/LBContractInfo.jsp | 14 ++++++++++++++ .../ContractApproval/ContractApprovalApplyList.jsp | 14 ++++++++++++-- .../ProjectApprovalCreationInfo.jsp | 12 +----------- .../group/CustomerGroupCompanyController.java | 9 +++++---- .../LBProjectIntoTempInitBusiness.java | 2 -- .../LBProjectIntoTempToContractBusiness.java | 4 ++++ 6 files changed, 36 insertions(+), 19 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractInfo.jsp index 903555bed..34e3c54ee 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractInfo.jsp @@ -287,6 +287,20 @@ init(); + + function selectManySubject(){ + AsDialog.OpenSelector("selectManySubject","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.5) + "px", + function(sReturn){ + if(!sReturn||sReturn=="_CANCEL_"||sReturn=="") + { + //alert(getHtmlMessage('1'));//请选择一条信息！ + return; + } + sReturn = sReturn.split("@"); + setItemValue(0,0,"subjectid",sReturn[0]); + setItemValue(0,0,"subjectname",sReturn[1]); + },"请选择客户",''); + } <%/*~END~*/%> diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp index fa86b174f..c3773a3d0 100644 --- a/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp @@ -61,7 +61,8 @@ var isNetCar = sReturn[7]; var signType = sReturn[9]; var sealType = sReturn[10]; - if("03" == customertype){ + + if(flowno=="BContractApproveApply"&&"03" == customertype){ if(""== signType||null == signType||"undefined" == signType){ alert("请在产品中配置签约方式！！！"); return ; @@ -71,13 +72,22 @@ return ; } } + var gpsVendor = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.GpsVendorCheck","getGpsVendor","productId="+product_id); var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>,gpsVendor="+gpsVendor; sParams =sParams+",signType="+signType+",sealType="+sealType+",isNetCar="+isNetCar+",carAttributes="+carAttributes+",leasform="+leasform+",ProductId="+product_id+",ProjectId="+id+",ProjectNo="+project_id+",customertype="+customertype+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>"; if(flowno=="BContractApproveApply"){ sParams =sParams+",operationType="+sReturn[8]; - } + }else{ + var SubjectName = ""; + var messages = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoCheck","selectTitleName","SubjectId="+sReturn[5]); + message = messages.split("@"); + if("error"!=message[0]){ + SubjectName = message[1]; + } + sParams =sParams+",SubjectId="+sReturn[5]+",SubjectName="+SubjectName; + } var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.contract.contractapproval.ContractApprovalStartAction","initFLow",sParams); diff --git a/WebContent/Tenwa/Lease/Flow/Project/ProjectApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/ProjectApproval/ProjectApprovalCreationInfo.jsp index 689b46ea1..d3981b543 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/ProjectApproval/ProjectApprovalCreationInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/ProjectApproval/ProjectApprovalCreationInfo.jsp @@ -90,16 +90,8 @@ alert("该用户无权限发起申请！"); return; } - - var messages = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoCheck","selectTitleName","SubjectId="+SubjectId); - message = messages.split("@"); - if("error"==message[0]){ - alert(message[1]); - return; - } - var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>"; - sParams =sParams+",SubjectId="+SubjectId+",SubjectName="+message[1]+",CustId="+custid+",CustName=" + custname+",ProductId="+productid+",ProductName="+productname+",businesstype="+businesstype; + sParams =sParams+",CustId="+custid+",CustName=" + custname+",ProductId="+productid+",ProductName="+productname+",businesstype="+businesstype; var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.projectapproval.ProjectApprovalStartAction","initFLow",sParams); if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_" ) { @@ -135,7 +127,6 @@ diff --git a/src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java b/src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java index 7fa810ffd..d47dedabc 100644 --- a/src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java +++ b/src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java @@ -235,13 +235,14 @@ public class CustomerGroupCompanyController { //校验经销商额度是否足够 public String checkTotal(JBOTransaction tx) throws Exception{ Conn conn = new Conn(tx); - String sql = "SELECT IFNULL(di.total,0)-IFNULL(lcc.CLEAN_LEASE_MONEY,0) total FROM lb_contract_info lci LEFT JOIN DISTRIBUTOR_INFO di ON di.distributor_no=lci.distributor_id LEFT JOIN LC_CALC_CONDITION lcc ON lcc.contract_id=lci.id WHERE lci.id=? "; + String sql = "SELECT IFNULL(di.total,0)-IFNULL(lcc.CLEAN_LEASE_MONEY,0) total,di.CHANNELTYPE FROM lb_contract_info lci LEFT JOIN DISTRIBUTOR_INFO di ON di.distributor_no=lci.distributor_id LEFT JOIN LC_CALC_CONDITION lcc ON lcc.contract_id=lci.id WHERE lci.id=? "; List> results = conn.executeQuery(sql, this.contractId); String istotal = results.get(0).get("total"); - if(new Double(istotal)>0){ - return "true"; + String channeltype = results.get(0).get("CHANNELTYPE"); + if("01".equals(channeltype) && new Double(istotal) <= 0){ + return "经销商额度不足！"; } - return "经销商额度不足！"; + return "true"; } diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitBusiness.java index 94f4ef62a..646968c98 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitBusiness.java @@ -62,8 +62,6 @@ public class LBProjectIntoTempInitBusiness extends BaseBussiness { bo.setAttributeValue("PROJECT_INDUSTRY", PROJECT_INDUSTRY); bo.setAttributeValue("InputUserID", asUser.getUserID()); bo.setAttributeValue("InputTime", StringFunction.getToday()); - bo.setAttributeValue("subjectid",this.getAttribute("SubjectId")); - bo.setAttributeValue("subjectname",this.getAttribute("SubjectName")); bm.saveObject(bo); String sMessage="true"; return sMessage; diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempToContractBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempToContractBusiness.java index 919ebc438..4c3238198 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempToContractBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempToContractBusiness.java @@ -24,6 +24,10 @@ public class LBProjectIntoTempToContractBusiness extends BaseBussiness { otherProperty.put("CONTRACT_NO",this.getAttribute("ContractNo").toString()); // otherProperty.put("CONTRACT_NUMBER",this.getAttribute("ContractNo").toString()); otherProperty.put("Project_Id", this.getAttribute("ProjectId").toString()); + + otherProperty.put("subjectid", this.getAttribute("SubjectId").toString()); + otherProperty.put("subjectname", this.getAttribute("SubjectName").toString()); + service.copyOrLoadProjectInfoToContract(Sqlca, fromCondtion, null,otherProperty, ServiceOperatorEnum.FormalToTemp); String sMessage="true"; return sMessage;