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 
# Conflicts:
#	WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp
This commit is contained in:
zhanglei 2021-03-22 13:44:02 +08:00
commit c3819300fe
22 changed files with 285 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
WebContent/Tenwa/Lease/Flow/Comm/LBContractPersonBaseInfo/LBContractPersonBaseInfo.jsp
View File

@ -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");

6
WebContent/Tenwa/Lease/Flow/Comm/LBDebitCard/DebitCardInfo.jsp
View File

@ -23,6 +23,7 @@
String ApplyType=CurPage.getParameter("ApplyType");
String PhaseNo=CurPage.getParameter("PhaseNo");
String subjectId=CurPage.getParameter("SubjectId");//获取主体信息，用于是否签约查询
String channel=CurPage.getParameter("channel");
BizObjectManager ldclManager = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME);
BizObject ldcls = ldclManager.createQuery("select * from O where file_flag='yes' and ( flow_unid=:flowunid or contract_id=:contractid ) ").setParameter("flowunid", FlowUnid).setParameter("contractid", contractId).getSingleResult(false);
System.out.print("=========="+ldcls+"==========");
@ -188,13 +189,16 @@
}
if("BusinessApplyApply"=="<%=ApplyType%>"||"BusinessChangeApply"=="<%=ApplyType%>"||"BContractApproveApply"=="<%=ApplyType%>"||"BContractChangeApply"=="<%=ApplyType%>"){
var sparams = "account="+getItemValue(0,getRow(),"ACCOUNT")+",acc_number="+getItemValue(0,getRow(),"ACC_NUMBER")+",bank_name="+getItemValue(0,getRow(),"BANK_NAME")+",mobile="+getItemValue(0,getRow(),"MOBILE")+",projectid=<%=projectId%>,FlowUnid=<%=FlowUnid%>,contractid=<%=contractId%>,certId="+getItemValue(0,getRow(),"CERTID")+",applyType=<%=ApplyType%>,subjectId=<%=subjectId%>,collect_type="+getItemValue(0,getRow(),"collect_type");
var sparams = "account="+getItemValue(0,getRow(),"ACCOUNT")+",acc_number="+getItemValue(0,getRow(),"ACC_NUMBER")+",bank_name="+getItemValue(0,getRow(),"BANK_NAME")+",mobile="+getItemValue(0,getRow(),"MOBILE")+",projectid=<%=projectId%>,FlowUnid=<%=FlowUnid%>,contractid=<%=contractId%>,certId="+getItemValue(0,getRow(),"CERTID")+",applyType=<%=ApplyType%>,subjectId=<%=subjectId%>,channel=<%=channel%>,collect_type="+getItemValue(0,getRow(),"collect_type");
var meassge = RunJavaMethodTrans("com.tenwa.comm.customerfilterlist.DebitCardAction", "checkSign", sparams);
if("false"==meassge){
alert("合同已生成，请先删除合同再修改扣款卡信息！");
return ;
}else if("Y"==meassge){
setItemValue(0,0,"sign_status","Y");
}else if("ZCfalse" == meassge){
alert("该扣款卡信息没有签约，无法保存！");
return ;
}else{
setItemValue(0,0,"sign_status","");
}

3
WebContent/Tenwa/Lease/Flow/Contract/ContractApproval/ContractApprovalApplyList.jsp
View File

@ -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];

3
WebContent/Tenwa/Lease/Flow/Contract/ContractCancle/ContractCancelApplyList.jsp
View File

@ -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("@");

3
WebContent/Tenwa/Lease/Flow/Contract/ContractChange/ContractChangeApplyList_Car.jsp
View File

@ -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("@");

3
WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessCancelApplyList.jsp
View File

@ -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("@");

3
WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessChangeApplyList.jsp
View File

@ -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("@");

53
WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/BusinessProjectTempInfo.jsp
View File

@ -19,6 +19,8 @@
BizObject bo=JBOFactory.createBizObjectQuery("jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT", "flow_unid=:flowunid").setParameter("flowunid",sFlowUnid).getSingleResult(false);
String custype = CurPage.getParameter("CustomerType");
String customertype = CurPage.getParameter("customertype");
String channel = CurPage.getParameter("channel");
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
doTemp.setHtmlEvent("inputTel","onChange","checkTel");
//租赁形式set只读
@ -26,23 +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");
@ -70,10 +79,20 @@
if(!checkTel()){
return ;
}
if("ZC"=="<%=channel%>"){
if(!checkZcProjectNumber()){
return ;
}
if(!checkZcContractNumber()){
return ;
}
}
var leasfrom = getItemValue(0,getRow(),"LEAS_FORM");
var projectSource = getItemValue(0,getRow(),"PROJECT_SOURCE");
var inputName = getItemValue(0,getRow(),"inputName");
var inputTel = getItemValue(0,getRow(),"inputTel");
var zcProjectNumber = getItemValue(0,getRow(),"ZC_PROJECT_NUMBER");
var zcContractNumber = getItemValue(0,getRow(),"ZC_CONTRACT_NUMBER");
var customerType = "<%=custype%>";
var customerT = "<%=customertype%>";
var projectNo=getItemValue(0,getRow(),"PROJECT_NO");
@ -100,7 +119,7 @@
//as_save(0);
}
if(customerType=="03"||customerT=="03"){//自然人
frame_list.window.saveRecord(leasfrom,projectSource,inputName,inputTel,projectNo,operationType);
frame_list.window.saveRecord(leasfrom,projectSource,inputName,inputTel,projectNo,operationType,zcProjectNumber,zcContractNumber);
//as_save("myiframe0","frame_list.window.as_save(0);");
}
}
@ -130,5 +149,27 @@
return true;
}
}
function checkZcProjectNumber(){
var zcProjectNumber = getItemValue(0,getRow(0),"ZC_PROJECT_NUMBER");
if(zcProjectNumber==""){
setErrorTips("ZC_PROJECT_NUMBER","中车申请号不能为空!");
return false;
}else{
setErrorTips("ZC_PROJECT_NUMBER","");
return true;
}
}
function checkZcContractNumber(){
var zcContractNumber = getItemValue(0,getRow(0),"ZC_CONTRACT_NUMBER");
if(zcContractNumber==""){
setErrorTips("ZC_CONTRACT_NUMBER","中车合同号不能为空!");
return false;
}else{
setErrorTips("ZC_CONTRACT_NUMBER","");
return true;
}
}
</script>
<%@ include file="/Frame/resources/include/include_end.jspf"%>

10
WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/CustomerInfo.jsp
View File

@ -14,6 +14,8 @@
String FlowName = CurPage.getParameter("FlowName");//获取流程名称
String IsHistory = CurPage.getParameter("IsHistory");//获取流程名称
String projectId = CurPage.getParameter("ProjectId");
String channel = CurPage.getParameter("channel");
String customerid = Sqlca.getString("select customer_id from lb_union_lessee_temp where flowunid='"+flowunid+"'");
String sTempletNo = "";//--模板号--
String sexChange="";
@ -439,7 +441,7 @@
} */
}
function saveRecord(leasfrom,projectSource,inputName,inputTel,projectNo,operationType){//±£´æ
function saveRecord(leasfrom,projectSource,inputName,inputTel,projectNo,operationType,zcProjectNumber,zcContractNumber){//±£´æ
//校验申请人手机号和配偶手机号是否重复
var RepeatReault = "";
var customerType = "03";
@ -559,13 +561,13 @@
var certid=getItemValue(0,0,"CERTID");
<%-- var customerid=RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerAction","updateCustomerId",'certid='+certid+',flowunid=<%=flowunid%>'); --%>
// setItemValue(0,0,"customerid",customerid);
as_save("0","saveCertInfo('"+inputName+"','"+inputTel+"','"+leasfrom+"','"+projectSource+"','"+projectNo+"','"+operationType+"')");
as_save("0","saveCertInfo('"+inputName+"','"+inputTel+"','"+leasfrom+"','"+projectSource+"','"+projectNo+"','"+operationType+"','"+zcProjectNumber+"','"+zcContractNumber+"')");
return true;
};
}
function saveCertInfo(inputName,inputTel,leasfrom,projectSource,projectNo,operationType){
var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoManage","saveCertInfo",'projectNo='+projectNo+',inputName='+inputName+',operationType='+operationType+',inputTel='+inputTel+',project_source='+projectSource+',leas_from='+leasfrom+',idexpiry='+getItemValue(0,0,"idexpiry")+',certtype='+getItemValue(0,0,"certtype")+',customerid='+getItemValue(0,0,"customerid")+',flowunid=<%=flowunid%>,certid='+getItemValue(0,0,"certid")+',name='+getItemValue(0,0,"name")+',userid=<%=CurUser.getUserID()%>,orgid=<%=CurUser.getOrgID()%>');
function saveCertInfo(inputName,inputTel,leasfrom,projectSource,projectNo,operationType,zcProjectNumber,zcContractNumber){
var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerInfoManage","saveCertInfo",'zcProjectNumber='+zcProjectNumber+',zcContractNumber='+zcContractNumber+',projectNo='+projectNo+',inputName='+inputName+',operationType='+operationType+',inputTel='+inputTel+',project_source='+projectSource+',leas_from='+leasfrom+',idexpiry='+getItemValue(0,0,"idexpiry")+',certtype='+getItemValue(0,0,"certtype")+',customerid='+getItemValue(0,0,"customerid")+',flowunid=<%=flowunid%>,certid='+getItemValue(0,0,"certid")+',name='+getItemValue(0,0,"name")+',userid=<%=CurUser.getUserID()%>,orgid=<%=CurUser.getOrgID()%>,channel=<%=channel%>');
if(sResult == "SUCCESS"){
parent.reloadSelf();
}

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

@ -131,7 +131,7 @@
function checkDispalyDistributor() {
var distributorNo22 = "<%=distributorNo%>";
var distributorType22 = "<%=distributorType%>";
if(distributorType22 == "types03"){
if(distributorType22 == "type03"){
return true;
}
return false;

15
WebContent/WEB-INF/etc/jbo/jbo_lease.xml
View File

@ -140,6 +140,9 @@
<attribute name="LEGALPERSONID" label="法定代表人/经营者身份证号" TYPE="STRING" LENGTH="32"/>
<attribute name="subjectid" label="主体id" type="STRING" length="32"/>
<attribute name="SUBJECTNAME" label="主体名称" type="STRING" length="100"/>
<attribute name="CHANNEL" label="渠道" type="STRING" length="32"/>
<attribute name="ZC_PROJECT_NUMBER" label="中车申请号" type="STRING" length="32"/>
<attribute name="ZC_CONTRACT_NUMBER" label="中车合同号" type="STRING" length="32"/>
</attributes>
<manager>
<managerProperties>
@ -286,6 +289,9 @@
<attribute name="source_type" label="申请类型" type="STRING" length="32"/>
<attribute name="subjectid" label="主体id" type="STRING" length="32"/>
<attribute name="SUBJECTNAME" label="主体名称" type="STRING" length="100"/>
<attribute name="CHANNEL" label="渠道" type="STRING" length="32"/>
<attribute name="ZC_PROJECT_NUMBER" label="中车申请号" type="STRING" length="32"/>
<attribute name="ZC_CONTRACT_NUMBER" label="中车合同号" type="STRING" length="32"/>
</attributes>
<manager>
<managerProperties>
@ -796,6 +802,9 @@
<attribute name="LEGALPERSONID" label="法定代表人/经营者身份证号" TYPE="STRING" LENGTH="32"/>
<attribute name="SUBJECTID" label="主体id" TYPE="STRING" LENGTH="32"/>
<attribute name="SUBJECTNAME" label="主体名称" type="STRING" length="100"/>
<attribute name="CHANNEL" label="渠道" type="STRING" length="32"/>
<attribute name="ZC_PROJECT_NUMBER" label="中车申请号" type="STRING" length="32"/>
<attribute name="ZC_CONTRACT_NUMBER" label="中车合同号" type="STRING" length="32"/>
</attributes>
<manager>
<managerProperties>
@ -1064,6 +1073,9 @@
<attribute name="has_gps" label="是否已安装GPS" TYPE="STRING" LENGTH="2"/>
<attribute name="SUBJECTID" label="主体id" TYPE="STRING" LENGTH="32"/>
<attribute name="SUBJECTNAME" label="主体名称" type="STRING" length="100"/>
<attribute name="CHANNEL" label="渠道" type="STRING" length="32"/>
<attribute name="ZC_PROJECT_NUMBER" label="中车申请号" type="STRING" length="32"/>
<attribute name="ZC_CONTRACT_NUMBER" label="中车合同号" type="STRING" length="32"/>
</attributes>
<manager>
<managerProperties>
@ -2797,6 +2809,9 @@
<attribute name="LEGALPERSONID" label="法定代表人/经营者身份证号" TYPE="STRING" LENGTH="32"/>
<attribute name="SUBJECTID" label="主体id" TYPE="STRING" LENGTH="32"/>
<attribute name="SUBJECTNAME" label="主体名称" type="STRING" length="100"/>
<attribute name="CHANNEL" label="渠道" type="STRING" length="32"/>
<attribute name="ZC_PROJECT_NUMBER" label="中车申请号" type="STRING" length="32"/>
<attribute name="ZC_CONTRACT_NUMBER" label="中车合同号" type="STRING" length="32"/>
</attributes>
<manager>
<managerProperties>

32
calc/com/tenwa/reckon/executor/CashFlowExecutor.java
View File

@ -187,16 +187,24 @@ public class CashFlowExecutor {
SqlObject asql = new SqlObject("");
asql.setOriginalSql(sql);
Sqlca.executeSQL(asql);
//由于安鹏目前没有从最后一期一直往前抵扣，这里临时处理下灵活产品的
if( "Y".equals( cb.getFlexible() ) ){
String lcftSql = "select ID,PLAN_DATE,FUND_IN,FUND_OUT from lc_cash_flow_temp where flowunid ='"+tcb.getDocId()+"' and "+tcb.getPlanCName()+"='"+tcb.getPlanCValue()+"' order by plan_date desc";
List<Map<String, String>> lcftDate =DataOperatorUtil.getDataBySql(tx, lcftSql, null);
BigDecimal outMoney = null ;
BigDecimal inMoney = null ;
String updateSql = "" ;
String depositStyle = "";
Map<String, Map<String, String>> productCost = ProductParamUtil.getProductComponentType(productId, "PRD0315");
if( productCost != null && productCost.size() > 0 ){
Map<String, String> cautionMoney = productCost.get("CAUTION_MONEY");
if( cautionMoney != null && cautionMoney.size() > 0 ){
depositStyle = cautionMoney.get("DepositStyle");
}
}
String lcftSql = "select ID,PLAN_DATE,FUND_IN,FUND_OUT from lc_cash_flow_temp where flowunid ='"+tcb.getDocId()+"' and "+tcb.getPlanCName()+"='"+tcb.getPlanCValue()+"' order by plan_date desc";
List<Map<String, String>> lcftDate =DataOperatorUtil.getDataBySql(tx, lcftSql, null);
BigDecimal outMoney = null ;//±£Ö¤½ð
BigDecimal inMoney = null ;//ÿÆÚ×â½ð
String updateSql = "" ;
if( "caution_money_method01".equals( depositStyle ) ){//±£Ö¤½ðµÖ¿Û
for (int i=0 ; i < lcftDate.size() ; i++ ) {
if(i==0){
outMoney = new BigDecimal(lcftDate.get(i).get("FUND_OUT") );
outMoney = new BigDecimal(cb.getCautionMoney() );
inMoney = new BigDecimal(lcftDate.get(i).get("FUND_IN") );
}else{
inMoney = new BigDecimal(lcftDate.get(i).get("FUND_IN") );
@ -207,13 +215,19 @@ public class CashFlowExecutor {
Sqlca.executeSQL(asql);
outMoney = outMoney.subtract(inMoney);
}else{
updateSql = " update lc_cash_flow_temp set FUND_OUT='"+inMoney.subtract(outMoney)+"',FUND_OUT_DETAILS='抵扣保证金:"+inMoney.subtract(outMoney)+"',NET_FLOW='"+inMoney.subtract(outMoney)+"' where id='"+lcftDate.get(i).get("ID")+"' ";
updateSql = " update lc_cash_flow_temp set FUND_OUT='"+outMoney+"',FUND_OUT_DETAILS='µÖ¿Û±£Ö¤½ð:"+outMoney+"',NET_FLOW='"+inMoney.subtract(outMoney)+"' where id='"+lcftDate.get(i).get("ID")+"' ";
asql.setOriginalSql(updateSql);
Sqlca.executeSQL(asql);
break;
}
}
}else if ("caution_money_method02".equals( depositStyle )){//±£Ö¤½ðÍË»Ø
outMoney = new BigDecimal(cb.getCautionMoney() );
inMoney = new BigDecimal(lcftDate.get(0).get("FUND_IN") );
updateSql = " update lc_cash_flow_temp set FUND_OUT='"+outMoney+"',FUND_OUT_DETAILS='µÖ¿Û±£Ö¤½ð:"+outMoney+"',NET_FLOW='"+inMoney.subtract(outMoney)+"' where id='"+lcftDate.get(0).get("ID")+"' ";
asql.setOriginalSql(updateSql);
Sqlca.executeSQL(asql);
}
}

3
calc/com/tenwa/reckon/help/ConditionHelper.java
View File

@ -99,7 +99,8 @@ public class ConditionHelper {
throw new BusinessException( "灵活产品IRR区间值必须配置，请联业务人员！" );
}
if( !( irr.compareTo( new BigDecimal( irrMan ) ) <= 0 && irr.compareTo( new BigDecimal( irrMin ) ) >= 0 ) ){
throw new BusinessException( "IRR: "+irr.setScale( 2, 4 ).toString()+"，不在产品配置区间范围内！" );
// throw new BusinessException( "IRR: "+irr.setScale( 2, 4 ).toString()+"，不在产品配置区间范围内！" );
throw new BusinessException( "不在产品配置区间范围内！" );
}
//修改计算中的税率取值
List<Map<String, String>> pslData = DataOperatorUtil.getDataBySql("select leasform from prd_specific_library where productid='"+bean.getProductId()+"'");

24
src_core/com/tenwa/comm/customerfilterlist/DebitCardAction.java
View File

@ -35,6 +35,7 @@ import com.tenwa.collectaudit.cache.CollectAuditInfoCache;
import com.tenwa.comm.util.date.DateAssistant;
import com.tenwa.comm.util.jboutil.DataOperatorUtil;
import com.tenwa.reckon.util.DateUtil;
import com.tenwa.util.MultiSubjectUtil;
import com.zhongan.scorpoin.biz.common.CommonRequest;
import com.zhongan.scorpoin.biz.common.CommonResponse;
import com.zhongan.scorpoin.common.ZhongAnApiClient;
@ -59,6 +60,7 @@ public class DebitCardAction {
private String applyType;
private String collect_type;
private String subjectId;
private String channel;
public String getCustIdByFlowunid(JBOTransaction tx) throws JBOException{
String s=this.getFlowUnid();
@ -269,7 +271,7 @@ public class DebitCardAction {
}
//业务变更是否需要重新签约验证
public String checkSign(JBOTransaction tx) throws JBOException{
public String checkSign(JBOTransaction tx) throws Exception{
//校验合同文件是否生成的，扣款卡不需要校验是否生成合同文件
if(!"AccountChangeApply".equals(applyType)){
BizObjectManager ldclManager = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME);
@ -278,6 +280,18 @@ public class DebitCardAction {
return "false";
}
}
if("ZC".equals(channel)){
String sql = "select id from customer_account_input where collect_type='"+collect_type+"' and acc_number='"+acc_number+"' and account='"+account+"' and certid='"+certId+"' and tel='"+mobile+"' and subjectid='"+subjectId+"' and sign_status='Y' ";
List<Map<String, String>> dataBySql = DataOperatorUtil.getDataBySql(sql);
if( dataBySql == null || dataBySql.size() == 0){
return "ZCfalse";
}else if("YLcollect".equals(collect_type)){
return "Y";
}else{
}
return "N";
}
//查询历史是否签约
BizObjectManager lcsshManage = JBOFactory.getFactory().getManager(LB_CARD_SIGN_STATUS_HIS.CLASS_NAME);
BizObject lcss = lcsshManage.createQuery("select O.AGRMNO from O left join jbo.com.tenwa.lease.comm.LB_PROJECT_INFO lpi on lpi.id=O.project_id where O.tl_status='sign_status2' and O.account=:account and O.acc_number=:acc_number and O.certid=:certid and O.mobile=:mobile and O.sign_type=:sign_type and lpi.subjectid=:subjectId ")
@ -589,5 +603,13 @@ public class DebitCardAction {
public void setSubjectId(String subjectId) {
this.subjectId = subjectId;
}
public String getChannel() {
return channel;
}
public void setChannel(String channel) {
this.channel = channel;
}
}

12
src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO.java
View File

@ -329,4 +329,16 @@ public interface LB_CONTRACT_INFO{
* Ö÷ÌåÃû³Æ STRING(100)<br>
*/
public static final String SUBJECTNAME = "SUBJECTNAME";
/**
* 渠道 STRING(32)<br>
*/
public static final String CHANNEL = "CHANNEL";
/**
* 中车申请号 STRING(32)<br>
*/
public static final String ZC_PROJECT_NUMBER = "ZC_PROJECT_NUMBER";
/**
* 中车合同号 STRING(32)<br>
*/
public static final String ZC_CONTRACT_NUMBER = "ZC_CONTRACT_NUMBER";
}

12
src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_HIS.java
View File

@ -317,4 +317,16 @@ public interface LB_CONTRACT_INFO_HIS{
* Ö÷ÌåÃû³Æ STRING(100)<br>
*/
public static final String SUBJECTNAME = "SUBJECTNAME";
/**
* 渠道 STRING(32)<br>
*/
public static final String CHANNEL = "CHANNEL";
/**
* 中车申请号 STRING(32)<br>
*/
public static final String ZC_PROJECT_NUMBER = "ZC_PROJECT_NUMBER";
/**
* 中车合同号 STRING(32)<br>
*/
public static final String ZC_CONTRACT_NUMBER = "ZC_CONTRACT_NUMBER";
}

12
src_jbo/jbo/com/tenwa/lease/comm/LB_CONTRACT_INFO_TEMP.java
View File

@ -321,4 +321,16 @@ public interface LB_CONTRACT_INFO_TEMP{
* Ö÷ÌåÃû³Æ STRING(100)<br>
*/
public static final String SUBJECTNAME = "SUBJECTNAME";
/**
* 渠道 STRING(32)<br>
*/
public static final String CHANNEL = "CHANNEL";
/**
* 中车申请号 STRING(32)<br>
*/
public static final String ZC_PROJECT_NUMBER = "ZC_PROJECT_NUMBER";
/**
* 中车合同号 STRING(32)<br>
*/
public static final String ZC_CONTRACT_NUMBER = "ZC_CONTRACT_NUMBER";
}

12
src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO.java
View File

@ -253,4 +253,16 @@ public interface LB_PROJECT_INFO{
* Ö÷ÌåÃû³Æ STRING(100)<br>
*/
public static final String SUBJECTNAME = "SUBJECTNAME";
/**
* 渠道 STRING(32)<br>
*/
public static final String CHANNEL = "CHANNEL";
/**
* 中车申请号 STRING(32)<br>
*/
public static final String ZC_PROJECT_NUMBER = "ZC_PROJECT_NUMBER";
/**
* 中车合同号 STRING(32)<br>
*/
public static final String ZC_CONTRACT_NUMBER = "ZC_CONTRACT_NUMBER";
}

12
src_jbo/jbo/com/tenwa/lease/comm/LB_PROJECT_INFO_TEMP.java
View File

@ -253,4 +253,16 @@ public interface LB_PROJECT_INFO_TEMP{
* Ö÷ÌåÃû³Æ STRING(100)<br>
*/
public static final String SUBJECTNAME = "SUBJECTNAME";
/**
* 渠道 STRING(32)<br>
*/
public static final String CHANNEL = "CHANNEL";
/**
* 中车申请号 STRING(32)<br>
*/
public static final String ZC_PROJECT_NUMBER = "ZC_PROJECT_NUMBER";
/**
* 中车合同号 STRING(32)<br>
*/
public static final String ZC_CONTRACT_NUMBER = "ZC_CONTRACT_NUMBER";
}

52
src_sql/预投SQL/v20210415/tft20210415.sql Normal file
View File

@ -0,0 +1,52 @@
-- 修改经销选择所属渠道可以选择中车的（更新生产需要改成对应的distributor_no）
delete from SELECT_CATALOG where selname='SelectCompanyNew';
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 ('SelectCompanyNew','Sql','经销商子分属公司-新','distributor_info','','Grid','','distributor_no','select distributor_name,distributor_no from distributor_info where F_I_TYPE=''f_i_type03'' or distributor_no=''DSTB20210319006682''','渠道商名称,渠道商编码','distributor_name@style={width:500px}','distributor_name@distributor_no','distributor_name','1','Single','distributor_name@1','distributor_name@String','','','','SYS_Designer','','2020/11/04 15:35:18','SYS_Designer','2021/03/19 18:08:26','');
-- 添加表对应的字段
Alter table lb_project_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_project_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 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','');

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

@ -51,6 +51,9 @@ public class CustomerInfoManage {
private String distributorCode;
private String projectNo;
private String operationType;
private String zcProjectNumber;
private String zcContractNumber;
private String channel;
public String getDistributorCode() {
return distributorCode;
@ -280,6 +283,30 @@ public class CustomerInfoManage {
this.operationType = operationType;
}
public String getZcProjectNumber() {
return zcProjectNumber;
}
public void setZcProjectNumber(String zcProjectNumber) {
this.zcProjectNumber = zcProjectNumber;
}
public String getZcContractNumber() {
return zcContractNumber;
}
public void setZcContractNumber(String zcContractNumber) {
this.zcContractNumber = zcContractNumber;
}
public String getChannel() {
return channel;
}
public void setChannel(String channel) {
this.channel = channel;
}
public String saveCustomerFamilyFormal(JBOTransaction tx){
try{
BizObjectManager bom = JBOFactory.getBizObjectManager(CUSTOMER_FAMILY.CLASS_NAME,tx);
@ -394,6 +421,9 @@ public class CustomerInfoManage {
proj.setAttributeValue("inputName", inputName);
proj.setAttributeValue("inputTel", inputTel);
proj.setAttributeValue("PROJECT_NO", projectNo);
proj.setAttributeValue("CHANNEL", channel);
proj.setAttributeValue("ZC_PROJECT_NUMBER", zcProjectNumber);
proj.setAttributeValue("ZC_CONTRACT_NUMBER", zcContractNumber);
}
//update ÏîÄ¿Ãû³Æ
if(buss != null){

1
src_tenwa/com/tenwa/util/ProjectConstant.java
View File

@ -7,5 +7,6 @@ package com.tenwa.util;
public class ProjectConstant {
public static final String CREDIT_RESULT_TYPE="0010";
public static final String DISTIRBUTOR_NO="DSTB20210319006682";
}