From dfe51f8265c6f2b568ecef99f7b41495163ce212 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Fri, 6 Dec 2019 16:58:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BB=E4=BD=93=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ContractApproval/ContractApprovalApplyList.jsp | 2 +- .../ContractChange/ContractChangeApplyList_Car.jsp | 10 ++++++++-- .../Flow/Project/BusinessApplication/ApprovalForm.jsp | 6 ++++++ .../BusinessApplication/BusinessChangeApplyList.jsp | 8 +++++++- WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 3 +++ .../group/CustomerGroupCompanyController.java | 2 +- 6 files changed, 26 insertions(+), 5 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp index c3773a3d0..c1a364b66 100644 --- a/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp @@ -78,7 +78,7 @@ 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]; + sParams =sParams+",operationType="+sReturn[8]+",SubjectId="+sReturn[11]+",SubjectName="+sReturn[12]; }else{ var SubjectName = ""; var messages = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoCheck","selectTitleName","SubjectId="+sReturn[5]); diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp index eddd6d776..0dba4546e 100644 --- a/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp +++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp @@ -34,6 +34,9 @@ var signType = sReturn[12]; var sealType = sReturn[11]; + var SubjectId = sReturn[13]; + var SubjectName = sReturn[14]; + if("03" == customertype){ if(""== signType||null == signType||"undefined" == signType){ alert("请在产品中配置签约方式！！！"); @@ -44,10 +47,13 @@ return ; } } - + if(""== SubjectId||null == SubjectId||"undefined" == SubjectId){ + alert("该数据没有对应的主体，请联系管理员！"); + 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+",operationType="+operationType+",isNetCar="+isNetCar+",carAttributes="+carAttributes+",leasform="+leasform+",customertype="+customertype+",ProjectId="+project_id+",FlowKey="+contract_number+",ProductId="+product_id+",ProjectNo="+project_no+",ContractId="+contract_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>"; + sParams =sParams+",SubjectId="+SubjectId+",SubjectName="+SubjectName+",signType="+signType+",sealType="+sealType+",operationType="+operationType+",isNetCar="+isNetCar+",carAttributes="+carAttributes+",leasform="+leasform+",customertype="+customertype+",ProjectId="+project_id+",FlowKey="+contract_number+",ProductId="+product_id+",ProjectNo="+project_no+",ContractId="+contract_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>"; var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams); if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return; var sReturnInfos=sReturnInfo.split("@"); diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp index 13b98a676..a3c62d22f 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp @@ -46,6 +46,12 @@ }else{ isShowButton=true; } + if("业务申请流程".equals(flowName)&&("0030".equals(phaseNo)||"0040".equals(phaseNo)||"0050".equals(phaseNo)||"0060".equals(phaseNo)||"0070".equals(phaseNo))){ + dwTemp.getDataObject().setVisible("subjectname", true); + }else { + dwTemp.getDataObject().setVisible("subjectname", false); + } + if("0010".equals(phaseNo)){//经销商 dwTemp.setGroupHidden("0020,0030,0040,0050"); }else if("0030".equals(phaseNo)){//初审 diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessChangeApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessChangeApplyList.jsp index 02b059d8f..14b5da44c 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessChangeApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessChangeApplyList.jsp @@ -22,8 +22,14 @@ var leasehold = sReturn[6]; var operationType = sReturn[7]; var certtype = sReturn[8]; + var SubjectId = sReturn[9]; + var SubjectName = sReturn[10]; + if(""== SubjectId||null == SubjectId||"undefined" == SubjectId){ + alert("该数据没有对应的主体，请联系管理员！"); + return ; + } var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>"; - sParams =sParams+",certtype="+certtype+",customertype="+CustomerType+",carAttributes="+carAttributes+",leasform="+leasehold+",operationType="+operationType+",ProjectId="+id+",ProductId="+product_id+",FlowKey="+project_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>"; + sParams =sParams+",SubjectId="+SubjectId+",SubjectName="+SubjectName+",certtype="+certtype+",customertype="+CustomerType+",carAttributes="+carAttributes+",leasform="+leasehold+",operationType="+operationType+",ProjectId="+id+",ProductId="+product_id+",FlowKey="+project_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>"; var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams); if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return; var sReturnInfos=sReturnInfo.split("@"); diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index a33882ce7..a30bd41e7 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -4696,6 +4696,9 @@ + + + diff --git a/src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java b/src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java index d47dedabc..8db6a72f1 100644 --- a/src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java +++ b/src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java @@ -238,7 +238,7 @@ public class CustomerGroupCompanyController { 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"); - String channeltype = results.get(0).get("CHANNELTYPE"); + String channeltype = results.get(0).get("channeltype"); if("01".equals(channeltype) && new Double(istotal) <= 0){ return "经销商额度不足！"; }