From 43c655cc11f35fa980b855830f9a84f9a7fccc10 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Tue, 23 Mar 2021 09:15:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=8F=91=E8=B5=B7=E5=8F=82=E6=95=B0=E5=92=8CIRR?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessApproval/ProjectApprovalCreationInfo.jsp | 7 +++++++ calc/com/tenwa/reckon/executor/CashFlowExecutor.java | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp index fdfc30cc7..658d6e331 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApproval/ProjectApprovalCreationInfo.jsp @@ -240,6 +240,13 @@ sParams = sParams+",sex=1"; } } + //判断是否是中车经销商。如果是中车的渠道类型是为ZC，如果是正常的合同渠道类型是CG + if("<%=distributorType%>" == "types03"){ + 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/calc/com/tenwa/reckon/executor/CashFlowExecutor.java b/calc/com/tenwa/reckon/executor/CashFlowExecutor.java index 97d5d1442..482996878 100644 --- a/calc/com/tenwa/reckon/executor/CashFlowExecutor.java +++ b/calc/com/tenwa/reckon/executor/CashFlowExecutor.java @@ -132,7 +132,7 @@ public class CashFlowExecutor { if("Y".equals( cb.getFlexible() ) ){ Map> productRevenue = tcb.getProductRevenues(); String GPSDifference = productRevenues.get( "GPSDifference" ).get( "GPSDifference" ); - sql += "union all select DATE_FORMAT(CURDATE(),'%Y/%m/%d') plan_date,'"+GPSDifference+"' flowin,'GPS差额:"+GPSDifference+"' flowindetail,'' flowout,'' flowoutdetil,'"+GPSDifference+"' cleanfow from dual "; + sql += "union all select plan_date,'"+GPSDifference+"' flowin,'GPS差额:"+GPSDifference+"' flowindetail,'' flowout,'' flowoutdetil,'"+GPSDifference+"' cleanfow from lc_fund_plan_temp where flowunid = '"+tcb.getDocId()+"' and fee_type='feetype10' "; } }else if("ORACLE".equals(InitDBType.DBTYPE)){ sql += "INSERT INTO " +Tools.getTable(tcb.getContractCashTb())+ " (id," + tcb.getPlanCName() + "";