anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release20210415' into release20210415

Browse Source
This commit is contained in:
zhanglei 2021-03-23 15:11:45 +08:00
commit 69262065a2
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
View File

@ -1,4 +1,5 @@
<%@ page contentType="text/html; charset=GBK"%>
<%@ page import="com.tenwa.util.ProjectConstant"%>
<%@ include file="/Frame/resources/include/include_begin_info.jspf"%>
<%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=Info00;Describe=注释区;]~*/%>
@ -40,7 +41,9 @@
System.out.println(distributorType);
String sApplyType = CurPage.getParameter("ApplyType");
String sInputUserID = CurUser.getUserID();
String distributorNoConfig = ProjectConstant.DISTIRBUTOR_NO;//获取需要配置经销商
if(StringX.isSpace(sApplyType)) sApplyType = "";
if(StringX.isSpace(sInputUserID)) sInputUserID = "";
@ -240,11 +243,9 @@
sParams = sParams+",sex=1";
}
}
//判断是否是中车经销商。如果是中车的渠道类型是为ZC，如果是正常的合同渠道类型是CG
if("<%=distributorType%>" == "types03"){
//判断是否是中车经销商。如果是中车的渠道类型是为ZC，其它的则不存
if("<%=distributorNoConfig%>" == "<%=distributorNo%>" ){
sParams = sParams+",channel=ZC";
}else{
sParams = sParams+",channel=CG";
}
var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.projectapproval.BusinessApprovalStartAction","initFLow",sParams);//定义流程中需要的参数

4
src_tenwa/com/tenwa/lease/flow/project/businessapply/CustomerInfoManage.java
View File

@ -421,7 +421,9 @@ public class CustomerInfoManage {
proj.setAttributeValue("inputName", inputName);
proj.setAttributeValue("inputTel", inputTel);
proj.setAttributeValue("PROJECT_NO", projectNo);
proj.setAttributeValue("CHANNEL", channel);
if(channel != null && "ZC".equals(channel)){//只存中车进单的标识
proj.setAttributeValue("CHANNEL", channel);
}
proj.setAttributeValue("ZC_PROJECT_NUMBER", zcProjectNumber);
proj.setAttributeValue("ZC_CONTRACT_NUMBER", zcContractNumber);
}