From 89b7ee0db430d60c6133ca8cc85c5daded110070 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Sun, 21 Mar 2021 14:46:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=9A=E5=8A=A1=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E3=80=81=E4=B8=9A=E5=8A=A1=E6=92=A4=E9=94=80=E3=80=81?= =?UTF-8?q?=E5=90=88=E5=90=8C=E5=88=B6=E4=BD=9C=E3=80=81=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E3=80=81=E5=90=88=E5=90=8C=E6=92=A4=E9=94=80?= =?UTF-8?q?=E7=9A=84=E6=B8=A0=E9=81=93=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LBContractPersonBaseInfo.jsp | 10 ++++++ .../ContractApprovalApplyList.jsp | 3 +- .../ContractCancelApplyList.jsp | 3 +- .../ContractChangeApplyList_Car.jsp | 3 +- .../BusinessCancelApplyList.jsp | 3 +- .../BusinessChangeApplyList.jsp | 3 +- .../BusinessProjectTempInfo.jsp | 12 ++++--- .../ProjectApprovalCreationInfo.jsp | 4 ++- src_sql/棰勬姇SQL/v20210415/tft20210415.sql | 33 +++++++++++++++++++ .../businessapply/CustomerInfoManage.java | 4 +-- 10 files changed, 64 insertions(+), 14 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractPersonBaseInfo/LBContractPersonBaseInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractPersonBaseInfo/LBContractPersonBaseInfo.jsp index 7b1ff3df7..481955631 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractPersonBaseInfo/LBContractPersonBaseInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractPersonBaseInfo/LBContractPersonBaseInfo.jsp @@ -14,6 +14,8 @@ String compClientID = request.getParameter("CompClientID"); String RightType = CurPage.getParameter("RightType");//页面是否 是只读 String custype = CurPage.getParameter("customertype");//获取客户类型 + String channel = CurPage.getParameter("channel"); + if(sPrevUrl == null) sPrevUrl = ""; if((null!=sPhaseNo&&sPhaseNo.equals("0010")) && "BContractApproveFlow".equals(FlowNo)){ @@ -36,6 +38,12 @@ doTemp.setDataQueryClass("com.tenwa.flow.flowHistory.FlowDataInfoHistory");//如果是历史则新显示历史数据 } */ doTemp.setHtmlEvent("CONTRACT_NUMBER", "onChange", "copyContNumToContNo"); + if("ZC".equals(channel)){ + doTemp.setVisible("ZC_PROJECT_NUMBER",true); + doTemp.setRequired("ZC_PROJECT_NUMBER",true); + doTemp.setVisible("ZC_CONTRACT_NUMBER",true); + doTemp.setRequired("ZC_CONTRACT_NUMBER",true); + }; ASObjectWindowCalc dwTemp = new ASObjectWindowCalc(CurPage, doTemp,request); //ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "2";//freeform @@ -67,6 +75,8 @@ $("#div_920").find("[style='display:inline-block;width:6px;']").css("width","100"); $("#div_1410").find("[style='display:inline-block;width:6px;']").css("width","88"); $("#div_1390").find("[style='display:inline-block;width:6px;']").css("width","100"); + $("#div_1054").find("[style='display:inline-block;width:6px;']").css("width","88"); + $("#div_1058").find("[style='display:inline-block;width:6px;']").css("width","74"); /* 右侧 样式微调*/ $("#A_div_900").find("[style='display:inline-block;width:6px;']").css("width","86"); $("#div_930").find("[style='display:inline-block;width:6px;']").css("width","86"); diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp index a1b3fb6a5..07ced7196 100644 --- a/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp @@ -63,6 +63,7 @@ var isNetCar = sReturn[7]; var signType = sReturn[9]; var sealType = sReturn[10]; + var channel = sReturn[13]; if(flowno=="BContractApproveApply"&&"03" == customertype){ if(""== signType||null == signType||"undefined" == signType){ @@ -77,7 +78,7 @@ 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%>"; + sParams =sParams+",channel="+channel+",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]+",SubjectId="+sReturn[11]+",SubjectName="+sReturn[12]; diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractCancle/ContractCancelApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractCancle/ContractCancelApplyList.jsp index 99cf5a597..afef7c4e6 100644 --- a/WebContent/Tenwa/Lease/Flow/Contract/ContractCancle/ContractCancelApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractCancle/ContractCancelApplyList.jsp @@ -45,8 +45,9 @@ var CustomerType = sReturn[5]; var carAttributes = sReturn[6]; var leasehold = sReturn[7]; + var channel = sReturn[8]; var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>"; - sParams =sParams+",customertype="+CustomerType+",carAttributes="+carAttributes+",leasform="+leasehold+",ProjectId="+project_id+",FlowKey="+contract_number+",ProductId="+product_id+",ContractId="+contract_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>"; + sParams =sParams+",channel="+channel+",customertype="+CustomerType+",carAttributes="+carAttributes+",leasform="+leasehold+",ProjectId="+project_id+",FlowKey="+contract_number+",ProductId="+product_id+",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/Contract/ContractChange/ContractChangeApplyList_Car.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp index 1eb55265c..ce5294e0f 100644 --- a/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp +++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp @@ -39,6 +39,7 @@ var sealType = sReturn[11]; var SubjectId = sReturn[13]; var SubjectName = sReturn[14]; + var channel = sReturn[15]; if("03" == customertype){ if(""== signType||null == signType||"undefined" == signType){ @@ -57,7 +58,7 @@ 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+",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%>"; + sParams =sParams+",channel="+channel+",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/BusinessCancelApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessCancelApplyList.jsp index d9370933b..db61942a7 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessCancelApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessCancelApplyList.jsp @@ -21,8 +21,9 @@ var CustomerType = sReturn[4]; var carAttributes = sReturn[5]; var leasehold = sReturn[6]; + var channel = sReturn[11]; var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>"; - sParams =sParams+",customertype="+CustomerType+",carAttributes="+carAttributes+",leasform="+leasehold+",ProjectId="+id+",ProductId="+product_id+",FlowKey="+project_id+",ProjectName="+project_name+",ApplyType=<%=sApplyType%>"; + sParams =sParams+",channel="+channel+",customertype="+CustomerType+",carAttributes="+carAttributes+",leasform="+leasehold+",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/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessChangeApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessChangeApplyList.jsp index 2add316f8..65e62d83a 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessChangeApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessChangeApplyList.jsp @@ -24,12 +24,13 @@ var certtype = sReturn[8]; var SubjectId = sReturn[9]; var SubjectName = sReturn[10]; + var channel = sReturn[11]; if(""== SubjectId||null == SubjectId||"undefined" == SubjectId){ alert("该数据没有对应的主体，请联系管理员！"); return ; } var sParams = "ApplyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>"; - 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%>"; + sParams =sParams+",channel="+channel+",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/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp index 402f30d83..c6c5febaa 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp @@ -28,28 +28,30 @@ doTemp.setReadOnly("LEAS_FORM", true); doTemp.setReadOnly("PROJECT_SOURCE", false); - } + }; if("ReadOnly".equals(rightType)){ doTemp.setReadOnly("INPUTNAME", true); doTemp.setReadOnly("INPUTTEL", true); - } + doTemp.setReadOnly("ZC_PROJECT_NUMBER", true); + doTemp.setReadOnly("ZC_CONTRACT_NUMBER", true); + }; //如果是北汽的产品，业务申请号可编辑 if(!"ReadOnly".equals(rightType)&&sPhaseNo.equals("0010")&&"BAIC_MOTOR".equals(operationType)&&"BusinessApplyFlow".equals(FlowNo)){ doTemp.setReadOnly("PROJECT_NO", false); }else{ doTemp.setReadOnly("PROJECT_NO", true); - } + }; String userll=null; userll="/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp?CompClientID="; if("01".equals(custype)||"01".equals(customertype)){ userll="/Tenwa/Customer/Lessee/Person/CustomerCompanyTempInfo.jsp?CompClientID="; - } + }; if("ZC".equals(channel)){ doTemp.setVisible("ZC_PROJECT_NUMBER",true); doTemp.setRequired("ZC_PROJECT_NUMBER",true); doTemp.setVisible("ZC_CONTRACT_NUMBER",true); doTemp.setRequired("ZC_CONTRACT_NUMBER",true); - } + }; ASObjectWindowCalc dwTemp = new ASObjectWindowCalc(CurPage, doTemp,request); dwTemp.Style = "2";//freeform dwTemp.setGroupHidden("0020"); diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp index a2959fd7b..cd89df102 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp @@ -246,9 +246,11 @@ sParams = sParams+",sex=1"; } } - //判断是否是中车经销商 + //判断是否是中车经销商。如果是中车的渠道类型是为ZC，如果是正常的合同渠道类型是CG if("<%=distributorNoConfig%>" == "<%=distributorNo%>"){ sParams = sParams+",channel=ZC"; + }else{ + sParams = sParams+",channel=CG"; } var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.projectapproval.BusinessApprovalStartAction","initFLow",sParams);//定义流程中需要的参数 if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_" ) diff --git a/src_sql/棰勬姇SQL/v20210415/tft20210415.sql b/src_sql/棰勬姇SQL/v20210415/tft20210415.sql index dab3693bb..7de25f93d 100644 --- a/src_sql/棰勬姇SQL/v20210415/tft20210415.sql +++ b/src_sql/棰勬姇SQL/v20210415/tft20210415.sql @@ -7,12 +7,45 @@ Alter table lb_project_info_temp add column CHANNEL varchar(32) NULL COMMENT ' Alter table lb_contract_info add column CHANNEL varchar(32) NULL COMMENT '渠道' after SUBJECTNAME, add column ZC_PROJECT_NUMBER varchar(32) NULL COMMENT '中车申请号' after CHANNEL, add column ZC_CONTRACT_NUMBER varchar(32) NULL COMMENT '中车合同号' after ZC_PROJECT_NUMBER; Alter table lb_contract_info_temp add column CHANNEL varchar(32) NULL COMMENT '渠道' after SUBJECTNAME, add column ZC_PROJECT_NUMBER varchar(32) NULL COMMENT '中车申请号' after CHANNEL, add column ZC_CONTRACT_NUMBER varchar(32) NULL COMMENT '中车合同号' after ZC_PROJECT_NUMBER; Alter table lb_contract_info_his add column CHANNEL varchar(32) NULL COMMENT '渠道' after SUBJECTNAME, add column ZC_PROJECT_NUMBER varchar(32) NULL COMMENT '中车申请号' after CHANNEL, add column ZC_CONTRACT_NUMBER varchar(32) NULL COMMENT '中车合同号' after ZC_PROJECT_NUMBER; +update lb_project_info set channel='CG'; +update lb_project_info_temp set channel='CG'; +update lb_contract_info set channel='CG'; +update lb_contract_info_temp set channel='CG'; +update lb_contract_info_his set channel='CG'; +-- 业务申请详情页面添加中车申请号和中车合同编号 +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessProjectTempInfo','0074','0074','1','O','ZC_PROJECT_NUMBER','ZC_PROJECT_NUMBER','String','','中车申请号','','1','Text','1','1','','','','32','0','0','0','1','0',0,'','0010','','SYS_Designer','2021/03/20 14:48:55','SYS_Designer','2021/03/20 15:01:12','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('BusinessProjectTempInfo','0078','0078','1','O','ZC_CONTRACT_NUMBER','ZC_CONTRACT_NUMBER','String','','中车合同号','','1','Text','1','1','','','','32','0','0','0','1','0',0,'','0010','','SYS_Designer','2021/03/20 14:48:55','SYS_Designer','2021/03/20 15:01:12','0','','1','','','',''); -- 添加扣款卡页面选择账户名称的模糊搜索 delete from SELECT_CATALOG where selname='selectAccountByCusts'; Insert Into SELECT_CATALOG (selname,seltype,seldescribe,seltablename,selprimarykey,selbrowsemode,selargs,selhidefield,selcode,selfieldname,selfielddisp,selreturnvalue,selfilterfield,isinuse,mutilorsingle,attribute1,attribute2,attribute3,attribute4,attribute5,inputuser,inputorg,inputtime,updateuser,updatetime,remark) Values ('selectAccountByCusts','Sql','业务申请用扣款卡用户选择','','','Grid','String flowunid','custtype','select certid,FULLNAME as name,MOBILE as phone,''assuror'' as custtype,''担保人'' as typename from LB_GUARANTEE_UNIT_TEMP where flowunid=''#flowunid'' and CERTTYPE=''Ind01'' and case when ''01''=''#customerType'' then 1=1 else 1=2 end union select certid,name,tel as phone,''unionlessee'' as custtype,''共同申请人'' as typename from CUSTOMER_FAMILY_TEMP where flowunid=''#flowunid'' and Partner_=''Y'' union select certid,fullname as name,mobile as phone,''lessee'' as custtype,''承租人'' as typename from customer_person_temp where flowunid=''#flowunid''','证件号,姓名,手机号,code,客户类型','','certid@name@custtype@phone','name','1','Single','','','','','','SYS_Designer','','2018/08/07 17:58:13','SYS_Designer','2021/03/20 17:29:52',''); delete from SELECT_CATALOG where selname='selectAccountForChange'; Insert Into SELECT_CATALOG (selname,seltype,seldescribe,seltablename,selprimarykey,selbrowsemode,selargs,selhidefield,selcode,selfieldname,selfielddisp,selreturnvalue,selfilterfield,isinuse,mutilorsingle,attribute1,attribute2,attribute3,attribute4,attribute5,inputuser,inputorg,inputtime,updateuser,updatetime,remark) Values ('selectAccountForChange','Sql','扣款卡变更用扣款卡用户名选择','','','Grid','String ProjectId,String CustomerId','custtype','select certid,FULLNAME as name,MOBILE as phone,''assuror'' as custtype,''担保人'' as typename from LB_GUARANTEE_UNIT where project_id=''#ProjectId'' and CERTTYPE=''Ind01'' and case when ''01''=''#customerType'' then 1=1 else 1=2 end union select certid,name,tel as phone,''unionlessee'' as custtype,''共同申请人'' as typename from CUSTOMER_FAMILY where project_id=''#ProjectId'' AND Partner_=''Y'' union select certid,fullname as name,mobile as phone,''lessee'' as custtype,''承租人'' as typename from customer_person where customerid=''#CustomerId''','证件号,姓名,手机号,客户类型,客户类型','','certid@name@custtype@phone','name','1','Single','','','','','','SYS_Designer','','2018/08/07 18:29:37','SYS_Designer','2021/03/20 17:38:01',''); +-- 业务变更选择项目时添加渠道的返回值 +delete from SELECT_CATALOG where selname='selectBusinessRecreditProject'; +Insert Into SELECT_CATALOG (selname,seltype,seldescribe,seltablename,selprimarykey,selbrowsemode,selargs,selhidefield,selcode,selfieldname,selfielddisp,selreturnvalue,selfilterfield,isinuse,mutilorsingle,attribute1,attribute2,attribute3,attribute4,attribute5,inputuser,inputorg,inputtime,updateuser,updatetime,remark) Values ('selectBusinessRecreditProject','Sql','查询汽车业务复议项目','','','Grid','String userid','id,product_id,project_name,customertype,car_type,leas_form,operationType,certtype,custkind,subjectid,subjectname,channel','SELECT lpi.id,lpi.product_id,lpi.project_no,lpi.project_name,ci.customername,getItemName(''CertType'',ci.certtype) certtype,ci.certid,getItemName(''cust_kind'',lpi.project_industry) as custkind,getUserName(project_manage) as project_manage_name,getOrgName(lpi.project_dept) project_dept,lcs.status_name,ci.customertype,lpi.car_type,lpi.leas_form,psl.operationType,ci.certtype,lpi.subjectid,lpi.subjectname,lpi.channel FROM LB_PROJECT_INFO lpi left join lb_contract_status lcs on lpi.project_status=lcs.status_code LEFT JOIN LB_UNION_LESSEE lult on lpi.id=lult.project_id and lult.is_main=''y'' and( lult.contract_id is null or lult.contract_id='''') LEFT JOIN CUSTOMER_INFO ci on lult.customer_id=ci.customerid left join PRD_SPECIFIC_LIBRARY psl on psl.productid=lpi.product_id where lpi.project_status=''13'' and (SELECT COUNT(id) FROM lb_contract_info_temp WHERE project_id=lpi.ID)=0 and lpi.businesstype=''1'' {lpi,proj} and lpi.project_manage=''#userid'' order by lpi.project_no desc','id,产品编号,申请编号,项目名称,客户名称,证件类别,证件号码,内部行业,项目经理,出单部门,项目状态,客户类型,车辆车型,租赁方式,主体id,主体名称,渠道','','id@product_id@project_no@project_name@customertype@car_type@leas_form@operationType@certtype@subjectid@subjectname@channel','project_no,customername,project_name,certid','1','Single','','','','','','SYS_Designer','','2018/01/31 16:24:16','SYS_Designer','2021/03/21 11:03:32',''); + +-- 合同制作选择项目时添加渠道的返回值 +delete from SELECT_CATALOG where selname='SelectProjectForContract_Car'; +Insert Into SELECT_CATALOG (selname,seltype,seldescribe,seltablename,selprimarykey,selbrowsemode,selargs,selhidefield,selcode,selfieldname,selfielddisp,selreturnvalue,selfilterfield,isinuse,mutilorsingle,attribute1,attribute2,attribute3,attribute4,attribute5,inputuser,inputorg,inputtime,updateuser,updatetime,remark) Values ('SelectProjectForContract_Car','Sql','合同制作时项目查询-汽车业务','','','Grid','String userid,String businessType','id,product_id,customertype,leas_form,CAR_TYPE,IS_NETCAR,operationType,signType,sealType,subjectid,subjectname,channel','SELECT lpi.id, lpi.product_id, lpi.project_no, lpi.project_name, ci.customername, getItemName (''CertType'', ci.certtype) certtype, ci.certid, getUserName (lpi.project_manage) AS project_manage, getOrgLevelName (lpi.project_dept) project_dept, ci.customertype,lpi.leas_form,lpi.CAR_TYPE,lpi.IS_NETCAR,psl.operationType,psl.signType,psl.sealType,lpi.subjectid,lpi.subjectname,lpi.channel FROM LB_PROJECT_INFO lpi LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LB_CONTRACT_INFO lci ON lpi.id=lci.project_id LEFT JOIN LC_CONTRACT_CONDITION lcc ON lci.id=lcc.contract_id LEFT JOIN LB_UNION_LESSEE lult ON lpi.id = lult.project_id AND (lult.contract_id = '''' OR lult.contract_id IS NULL) LEFT JOIN CUSTOMER_INFO ci ON lult.customer_id = ci.customerid LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id WHERE lult.is_main = ''y'' AND lpi.project_status = ''13'' AND((lci.contract_status = ''21'' AND lpc.equip_amt>lcc.equip_amt) OR ((lult.CONTRACT_ID="" OR lult.CONTRACT_ID IS NULL)AND (SELECT COUNT(*) FROM lb_contract_info WHERE project_id=lpi.id)=0)) and lpi.PROJECT_MANAGE=''#userid'' and lpi.businesstype=''#businessType'' ORDER BY lpi.END_DATE desc','id,产品编号,申请编号,业务名称,客户名称,证件类别,证件号码,业务经理,经销商渠道/名称,业务类型,租赁方式,汽车类型,是否网约车,所属渠道,签约方式,盖章方式,主体ID,主体名称,渠道','project_name@style={width:350px;}','id@product_id@project_no@project_name@customertype@leas_form@CAR_TYPE@IS_NETCAR@operationType@signType@sealType@subjectid@subjectname@channel','project_no,project_name,customername,certid','1','Single','','','','','project_no@ @ @EqualsString,Contains@customername@ @ @EqualsString,Contains@project_name@ @ @EqualsString,Contains@certid@ @ @EqualsString,Contains','SYS_Designer','','2018/03/08 14:37:12','SYS_Designer','2021/03/21 13:40:44',''); +delete from SELECT_CATALOG where selname='SelectProjectForContract_Car_KE'; +Insert Into SELECT_CATALOG (selname,seltype,seldescribe,seltablename,selprimarykey,selbrowsemode,selargs,selhidefield,selcode,selfieldname,selfielddisp,selreturnvalue,selfilterfield,isinuse,mutilorsingle,attribute1,attribute2,attribute3,attribute4,attribute5,inputuser,inputorg,inputtime,updateuser,updatetime,remark) Values ('SelectProjectForContract_Car_KE','Sql','合同制作时项目查询-汽车业务-卡尔','','','Grid','String orgid,String businessType','id,product_id,customertype,leas_form,CAR_TYPE,IS_NETCAR,operationType,signType,sealType,subjectid,subjectname,channel','SELECT lpi.id, lpi.product_id, lpi.project_no, lpi.project_name, ci.customername, getItemName (''CertType'', ci.certtype) certtype, ci.certid, getUserName (lpi.project_manage) AS project_manage, getOrgLevelName (lpi.project_dept) project_dept, ci.customertype,lpi.leas_form,lpi.CAR_TYPE,lpi.IS_NETCAR,psl.operationType,psl.signType,psl.sealType,lpi.subjectid,lpi.subjectname,lpi.channel FROM LB_PROJECT_INFO lpi LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LB_CONTRACT_INFO lci ON lpi.id=lci.project_id LEFT JOIN LC_CONTRACT_CONDITION lcc ON lci.id=lcc.contract_id LEFT JOIN LB_UNION_LESSEE lult ON lpi.id = lult.project_id AND (lult.contract_id = '''' OR lult.contract_id IS NULL) LEFT JOIN CUSTOMER_INFO ci ON lult.customer_id = ci.customerid LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id WHERE lult.is_main = ''y'' AND lpi.project_status = ''13'' AND((lci.contract_status = ''21'' AND lpc.equip_amt>lcc.equip_amt) OR ((lult.CONTRACT_ID="" OR lult.CONTRACT_ID IS NULL)AND (SELECT COUNT(*) FROM lb_contract_info WHERE project_id=lpi.id)=0)) AND lpi.INPUTORGID=''#orgid'' and lpi.businesstype=''#businessType'' ORDER BY lpi.END_DATE desc','id,产品编号,申请编号,业务名称,客户名称,证件类别,证件号码,业务经理,经销商渠道/名称,业务类型,租赁方式,汽车类型,是否网约车,所属渠道,签约方式,盖章方式,主体id,主体名称,渠道','project_name@style={width:350px;}','id@product_id@project_no@project_name@customertype@leas_form@CAR_TYPE@IS_NETCAR@operationType@signType@sealType@subjectid@subjectname@channel','project_no,project_name,customername,certid','1','Single','','','','','project_no@ @ @EqualsString,Contains@customername@ @ @EqualsString,Contains@project_name@ @ @EqualsString,Contains@certid@ @ @EqualsString,Contains','SYS_Designer','','2019/05/16 14:25:34','SYS_Designer','2021/03/21 13:41:28',''); +-- 合同制作详情页面添加中车编号和中车合同号 +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBContractPersonBaseInfoTemp','1054','1054','1','lpi','ZC_PROJECT_NUMBER','ZC_PROJECT_NUMBER','String','','中车申请号','','1','Text','1','1','','','','32','0','1','0','1','0',0,'','0010','','SYS_Designer','2021/03/21 14:01:30','SYS_Designer','2021/03/21 14:08:06','0','','1','','','',''); +Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualname,colname,coltype,coldefaultvalue,colheader,colunit,colcolumntype,coleditstyle,colcheckformat,colalign,coleditsourcetype,coleditsource,colhtmlstyle,collimit,colvisible,colreadonly,colrequired,colsortable,isfilter,colspan,isautocomplete,groupid,colfilterrefid,inputuser,inputtime,updateuser,updatetime,isaudit,colfilterattrs,isupdate,parentcolindex,tips,colinnerbtevent,colfilteroptions) Values ('LBContractPersonBaseInfoTemp','1058','1058','1','lpi','ZC_CONTRACT_NUMBER','ZC_CONTRACT_NUMBER','String','','中车合同号','','1','Text','1','1','','','','32','0','1','0','1','0',0,'','0010','','SYS_Designer','2021/03/21 14:01:30','SYS_Designer','2021/03/21 14:08:06','0','','1','','','',''); + +-- 合同变更选择项目时添加渠道的返回值 +delete from SELECT_CATALOG where selname='SelectContractCar'; +Insert Into SELECT_CATALOG (selname,seltype,seldescribe,seltablename,selprimarykey,selbrowsemode,selargs,selhidefield,selcode,selfieldname,selfielddisp,selreturnvalue,selfilterfield,isinuse,mutilorsingle,attribute1,attribute2,attribute3,attribute4,attribute5,inputuser,inputorg,inputtime,updateuser,updatetime,remark) Values ('SelectContractCar','Sql','合同查询(汽车业务)','','','Grid','','id,project_id,product_id,contract_no,custkind,customertype,leas_form,CAR_TYPE,IS_NETCAR,operationType,sealType,signType,subjectid,subjectname,channel','SELECT lci.id,lult.project_id ,lci.product_id,lci.contract_no,lci.contract_number,lci.project_name,ci.customername,getItemName(''CertType'',ci.certtype) certtype,ci.certid,getItemName(''cust_kind'',lci.project_industry) as custkind,getUserName(lci.project_manage) as project_manage,getOrgLevelName(lci.project_dept) project_dept,ci.customertype,lci.leas_form,lpi.CAR_TYPE,lpi.IS_NETCAR,psl.operationType,psl.sealType,psl.signType,lci.subjectid,lci.subjectname,lci.channel FROM LB_CONTRACT_INFO lci LEFT JOIN LB_PROJECT_INFO lpi ON lpi.id = lci.project_id LEFT JOIN LB_UNION_LESSEE lult on lci.id=lult.contract_id LEFT JOIN CUSTOMER_INFO ci on lult.customer_id=ci.customerid LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid = lpi.product_id where lult.is_main=''y'' and lci.businesstype=''1'' and not EXISTS (select 1 from LC_CALC_CONDITION_STATUS ccs where ccs.contract_id=lci.id) and contract_status=''21'' and lci.inputuserid=''#userid'' {lci,contract} order by lci.contract_number desc','合同id,项目id,产品编号,合同编号,业务合同编号,项目名称,客户名称,证件类别,证件号码,内部行业,业务经理,经销商渠道/名称,客户类型,租赁方式,新车二手车,是否是网约车,产品类型,盖章模式,签约模式,主体id,主体名称,渠道','project_name@style={width:350px;}','id@project_id@product_id@contract_number@project_name@customername@customertype@leas_form@CAR_TYPE@IS_NETCAR@operationType@sealType@signType@subjectid@subjectname@channel','project_name,customername,contract_number,certid','1','Single','','','','','','SYS_Designer','','2018/02/01 16:04:28','SYS_Designer','2021/03/21 14:20:53',''); +delete from SELECT_CATALOG where selname='SelectContractCar_KE'; +Insert Into SELECT_CATALOG (selname,seltype,seldescribe,seltablename,selprimarykey,selbrowsemode,selargs,selhidefield,selcode,selfieldname,selfielddisp,selreturnvalue,selfilterfield,isinuse,mutilorsingle,attribute1,attribute2,attribute3,attribute4,attribute5,inputuser,inputorg,inputtime,updateuser,updatetime,remark) Values ('SelectContractCar_KE','Sql','合同查询(汽车业务)--卡尔','','','Grid','String orgid','id,project_id,product_id,contract_no,custkind,customertype,leas_form,CAR_TYPE,IS_NETCAR,operationType,sealType,signType,subjectid,subjectname,channel','SELECT lci.id,lult.project_id ,lci.product_id,lci.contract_no,lci.contract_number,lci.project_name,ci.customername,getItemName(''CertType'',ci.certtype) certtype,ci.certid,getItemName(''cust_kind'',lci.project_industry) as custkind,getUserName(lci.project_manage) as project_manage,getOrgLevelName(lci.project_dept) project_dept,ci.customertype,lci.leas_form,lpi.CAR_TYPE,lpi.IS_NETCAR,psl.operationType,psl.sealType,psl.signType,lci.subjectid,lci.subjectname,lci.channel FROM LB_CONTRACT_INFO lci LEFT JOIN LB_PROJECT_INFO lpi ON lpi.id = lci.project_id LEFT JOIN LB_UNION_LESSEE lult on lci.id=lult.contract_id LEFT JOIN CUSTOMER_INFO ci on lult.customer_id=ci.customerid LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid = lpi.product_id where lult.is_main=''y'' and lci.businesstype=''1'' and not EXISTS (select 1 from LC_CALC_CONDITION_STATUS ccs where ccs.contract_id=lci.id) and contract_status=''21'' and lci.inputorgid=''#orgid'' order by lci.contract_number desc','合同id,项目id,产品编号,合同编号,业务合同编号,项目名称,客户名称,证件类别,证件号码,内部行业,业务经理,经销商渠道/名称,客户类型,租赁方式,新车二手车,是否是网约车,产品类型,盖章模式,签约模式,主体id,主体名称,渠道','project_name@style={width:350px;}','id@project_id@product_id@contract_number@project_name@customername@customertype@leas_form@CAR_TYPE@IS_NETCAR@operationType@sealType@signType@subjectid@subjectname@channel','project_name,customername','1','Single','','','','','','SYS_Designer','','2019/05/16 14:31:20','SYS_Designer','2021/03/21 14:21:45',''); +-- 合同撤销选择项目时添加渠道的返回值 +delete from SELECT_CATALOG where selname='SelectContract_Car'; +Insert Into SELECT_CATALOG (selname,seltype,seldescribe,seltablename,selprimarykey,selbrowsemode,selargs,selhidefield,selcode,selfieldname,selfielddisp,selreturnvalue,selfilterfield,isinuse,mutilorsingle,attribute1,attribute2,attribute3,attribute4,attribute5,inputuser,inputorg,inputtime,updateuser,updatetime,remark) Values ('SelectContract_Car','Sql','合同撤销选择框(汽车)','','','Grid','String userid','id,project_id,product_id,contract_no,customertype,car_type,leas_form,channel','SELECT lci.id,lult.project_id ,lci.product_id,lci.contract_no,lci.contract_number,lci.project_name,ci.customername,getItemName(''CertType'',ci.certtype) certtype,ci.certid,getItemName(''cust_kind'',lci.project_industry) custkind,getUserName(lci.project_manage) as project_manage,getOrgLevelName(lci.project_dept) project_dept,ci.customertype,lci.car_type,lci.leas_form,lci.channel FROM LB_CONTRACT_INFO lci LEFT JOIN LB_UNION_LESSEE lult on lci.id=lult.contract_id LEFT JOIN CUSTOMER_INFO ci on lult.customer_id=ci.customerid where lult.is_main=''y'' and lci.businesstype = ''1'' and not EXISTS (select 1 from LC_CALC_CONDITION_STATUS ccs where ccs.contract_id=lci.id) and contract_status=''21'' {lci,contract} and lci.PROJECT_MANAGE=''#userid'' order by lci.contract_number desc','合同id,项目id,产品编号,合同编号,业务合同编号,项目名称,客户名称,证件类别,证件号码,内部行业,项目经理,项目部门,客户类型,车辆类型,租赁方法,渠道','project_name@style={width:350px;}','id@project_id@product_id@contract_number@project_name@customertype@car_type@leas_form@channel','project_name,customername','1','Single','','','','','','SYS_Designer','','2018/09/10 10:01:53','SYS_Designer','2021/03/21 14:31:44',''); +delete from SELECT_CATALOG where selname='SelectContract_Car_KE'; +Insert Into SELECT_CATALOG (selname,seltype,seldescribe,seltablename,selprimarykey,selbrowsemode,selargs,selhidefield,selcode,selfieldname,selfielddisp,selreturnvalue,selfilterfield,isinuse,mutilorsingle,attribute1,attribute2,attribute3,attribute4,attribute5,inputuser,inputorg,inputtime,updateuser,updatetime,remark) Values ('SelectContract_Car_KE','Sql','合同撤销选择框(汽车)(kaer)','','','Grid','String orgid','id,project_id,product_id,contract_no,custkind,customertype,car_type,leas_form,channel','SELECT lci.id,lult.project_id ,lci.product_id,lci.contract_no,lci.contract_number,lci.project_name,ci.customername,getItemName(''CertType'',ci.certtype) certtype,ci.certid,getItemName(''cust_kind'',lci.project_industry) as custkind,getUserName(lci.project_manage) as project_manage,getOrgLevelName(lci.project_dept) project_dept,ci.customertype,lci.car_type,lci.leas_form,lci.channel FROM LB_CONTRACT_INFO lci LEFT JOIN LB_UNION_LESSEE lult on lci.id=lult.contract_id LEFT JOIN CUSTOMER_INFO ci on lult.customer_id=ci.customerid where lult.is_main=''y'' and lci.businesstype = ''1'' and not EXISTS (select 1 from LC_CALC_CONDITION_STATUS ccs where ccs.contract_id=lci.id) and contract_status=''21'' {lci,contract} and lci.inputorgid=''#orgid'' order by lci.contract_number desc','合同id,项目id,产品编号,合同编号,业务合同编号,项目名称,客户名称,证件类别,证件号码,内部行业,业务经理,经销商渠道/名称,客户类型,车辆类型,租赁方法,渠道','project_name@style={width:350px;}','id@project_id@product_id@contract_number@project_name@customertype@car_type@leas_form@channel','project_name,customername','1','Single','','','','','','SYS_Designer','','2019/05/31 15:15:25','SYS_Designer','2021/03/21 14:32:20',''); + + diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java index a67fd942d..4850ad994 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java +++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java @@ -421,9 +421,7 @@ public class CustomerInfoManage { proj.setAttributeValue("inputName", inputName); proj.setAttributeValue("inputTel", inputTel); proj.setAttributeValue("PROJECT_NO", projectNo); - if( channel != null && channel.length() > 0 && !("null".equals(channel)) ){ - proj.setAttributeValue("CHANNEL", channel); - } + proj.setAttributeValue("CHANNEL", channel); proj.setAttributeValue("ZC_PROJECT_NUMBER", zcProjectNumber); proj.setAttributeValue("ZC_CONTRACT_NUMBER", zcContractNumber); }