From 7deea3b0f8bef992849ecf6e7b205209448d33da Mon Sep 17 00:00:00 2001
From: xiezhiwen <xiezhiwen@xiezhiwen-PC>
Date: Thu, 7 Mar 2019 10:11:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=AD=E8=AF=81=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../VoucherConfig/LvVoucherLoanInfo.jsp       |   2 +-
 .../Lease/App/Interface/Ebank/LCEbankList.jsp |   9 +-
 .../tenwa/apzl/discount/LbDiscountList.jsp    |   5 +-
 .../CreateVoucherActualPaymentTradition.java  |   3 +-
 .../CreateVoucherContractTerminate.java       |   4 +-
 .../CreateVoucherCustCautionMoneyIncome.java  |   4 +-
 .../CreateVoucherDepositDeductionToMoney.java |   4 +-
 ...CreateVoucherForInterestSubsidyImport.java |  17 ++-
 ...ContractActualPaymentTraditionVoucher.java |  12 +-
 .../ContractBeforeOnhireToVoucher.java        |   7 +-
 .../ContractOnhireVoucherTradition.java       |   3 +-
 .../ContractTerminate.java                    |  26 ++--
 .../CreateVoucherDepositDeduction.java        |   3 +-
 .../IncomeVoucher.java                        |   6 +-
 .../RedIncomeVoucher.java                     |   9 +-
 .../CreateVoucherMonthSettlement.java         |   2 +-
 .../CreateVoucherOnhireTradition.java         |   3 +-
 .../CreateVoucherRedRentIncome.java           |   4 +-
 .../CreateVoucherToBeforeOnhire.java          |   6 +-
 .../InsertVoucherRentIncome.java              |  30 ++--
 .../fund/copyebank/LCEbankInfoHandler.java    |   3 +-
 .../com/tenwa/lease/app/ebank/EbankUse.java   | 132 +++++++++++++++++-
 22 files changed, 220 insertions(+), 74 deletions(-)

diff --git a/WebContent/Tenwa/Core/Voucher/VoucherConfig/LvVoucherLoanInfo.jsp b/WebContent/Tenwa/Core/Voucher/VoucherConfig/LvVoucherLoanInfo.jsp
index 53ec1b172..01cbe2603 100644
--- a/WebContent/Tenwa/Core/Voucher/VoucherConfig/LvVoucherLoanInfo.jsp
+++ b/WebContent/Tenwa/Core/Voucher/VoucherConfig/LvVoucherLoanInfo.jsp
@@ -34,7 +34,7 @@
 	    	sReturn = sReturn.split("@");
 	    	setItemValue(0,getRow(),"LOAN_SUBJECT",sReturn[0]);
 	    	setItemValue(0,getRow(),"SUBJECTS_NAME",sReturn[1]);
-			},"请选项目经理");
+			},"请选择科目");
 	}
 </script>
 <%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankList.jsp b/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankList.jsp
index 55f20fe3e..a6a8160ef 100644
--- a/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankList.jsp
+++ b/WebContent/Tenwa/Lease/App/Interface/Ebank/LCEbankList.jsp
@@ -43,7 +43,7 @@
 <script type="text/javascript">
 
 	function createVoucher(){
-		 var res=RunJavaMethodTrans("com.tenwa.lease.app.ebank.EbankUse","createEbankVoucher","");
+		 var res=RunJavaMethodTrans("com.tenwa.lease.app.ebank.EbankUse","createEbankVoucher","userID="+"<%=CurUser.getUserID()%>");
 		 if(res=="true"){
 			 alert("生成成功!");
 			 location.reload(true); 
@@ -120,7 +120,7 @@
 	    	    				reloadSelf();});
 	}
 	function importExcelNew(){
-		 var res=RunJavaMethodTrans("com.tenwa.lease.app.ebank.EbankUse","createEbankVoucher","");
+		 var res=RunJavaMethodTrans("com.tenwa.lease.app.ebank.EbankUse","createEbankVoucher2","userId="+"<%=CurUser.getUserID()%>");
 	}
 	
 	
@@ -182,6 +182,7 @@
 
 	// 确认收入
 	function confirmIncome(){
+		
 		 // 获取ID
 		 var sPara = getItemValue(0,getRow(0),'ID');
 		 // 获取摘要
@@ -201,7 +202,7 @@
 		 
 		 var VOUCHERNO="PZ2018072100000052";
 		 var SUMMARY="确认收入";
-		 var res=RunJavaMethodTrans("com.tenwa.lease.app.ebank.EbankUse","createLeftEbankIncomeVoucher","ebdataid="+sPara +",VOUCHERNO="+VOUCHERNO +",SUMMARY="+SUMMARY);
+		 var res=RunJavaMethodTrans("com.tenwa.lease.app.ebank.EbankUse","createLeftEbankIncomeVoucher","ebdataid="+sPara +",VOUCHERNO="+VOUCHERNO +",SUMMARY="+SUMMARY+",userId="+"<%=CurUser.getUserID()%>");
 		 if(res=="true"){
 			 alert("确认收入成功");
 			 location.reload(true); 
@@ -229,7 +230,7 @@
 		 }
 		 var VOUCHERNO="PZ2018072100000051";
 		 var SUMMARY="确认退回";
-		 var res=RunJavaMethodTrans("com.tenwa.lease.app.ebank.EbankUse","createLeftEbankIncomeVoucher","ebdataid="+sPara +",VOUCHERNO="+VOUCHERNO +",SUMMARY="+SUMMARY);
+		 var res=RunJavaMethodTrans("com.tenwa.lease.app.ebank.EbankUse","createLeftEbankIncomeVoucher","ebdataid="+sPara +",VOUCHERNO="+VOUCHERNO +",SUMMARY="+SUMMARY+",userId="+"<%=CurUser.getUserID()%>");
 		 if(res=="true"){
 			 alert("确认退回成功");
 			 location.reload(true);  
diff --git a/WebContent/com/tenwa/apzl/discount/LbDiscountList.jsp b/WebContent/com/tenwa/apzl/discount/LbDiscountList.jsp
index 059a61229..9464ad830 100644
--- a/WebContent/com/tenwa/apzl/discount/LbDiscountList.jsp
+++ b/WebContent/com/tenwa/apzl/discount/LbDiscountList.jsp
@@ -54,7 +54,7 @@
 	
 	// 导入贴息生成凭证
 	function importExcelNew(){
-		 var res=RunJavaMethodTrans("com.tenwa.voucher.CreateVoucherProcess.CreateVoucherForInterestSubsidyImport","createInterSubsidyVoucher","");
+		 var res=RunJavaMethodTrans("com.tenwa.voucher.CreateVoucherProcess.CreateVoucherForInterestSubsidyImport","createInterSubsidyVoucher","userId="+"<%=CurUser.getUserID()%>");
 	}
 	
 	function downloadFile(id){
@@ -76,11 +76,12 @@
 		AsControl.OpenView(sUrl,'SerialNo=' +sPara ,'_self','');
 	}
 	function do_delete(){
+		debugger;
 		var sPara = getItemValue(0,getRow(0),'ID');
 		if(confirm("是否删除？")){
 			// 删除生成反冲贴息凭证
 			if(typeof(sPara)!="undefined" || sPara.length>0 ){
-				var res = RunJavaMethodTrans("com.tenwa.voucher.CreateVoucherProcess.CreateVoucherForInterestSubsidyImport", "createInterSubsidyRecoilVoucher", "id="+sPara);
+				var res = RunJavaMethodTrans("com.tenwa.voucher.CreateVoucherProcess.CreateVoucherForInterestSubsidyImport", "createInterSubsidyRecoilVoucher", "id="+sPara+",userId="+"<%=CurUser.getUserID()%>");
 			}			
 			as_delete(0);
 		}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java
index a043ae9d3..e707681e2 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java
@@ -22,7 +22,7 @@ import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl;
  */
 public class CreateVoucherActualPaymentTradition extends BaseBussiness{
 	
-	public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception {
+	public String CreateVoucher(String FlowUnid,String VOUCHERNO,String userid) throws Exception {
 		// 创建事物
 		Transaction Sqlca =null;
 		Sqlca =  Transaction.createTransaction(CacheLoaderFactory.getDataSource());
@@ -79,7 +79,6 @@ public class CreateVoucherActualPaymentTradition extends BaseBussiness{
 		
 		// 设置常用参数
 		String VOUCHER_TYPE="1"; // 凭证分类 	金蝶
-		String userid ="admin";
 		
 		for (int i=0;i<dataList.size();i++){
 			MONEY=dataList.get(i).get("MONEY");//差额放款中-购置融资租赁资产-传统租赁资产里面的--首付款
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java
index 64f8034a0..97a000d19 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java
@@ -14,7 +14,7 @@ import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl;
 
 public class CreateVoucherContractTerminate {
 
-	public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception {
+	public String CreateVoucher(String FlowUnid,String VOUCHERNO,String userid) throws Exception {
 		
 		Transaction Sqlca =null;
 		Map<String,String> map=new HashMap<String, String>();
@@ -93,7 +93,7 @@ public class CreateVoucherContractTerminate {
 
 		CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl();
 		String VOUCHER_TYPE="1";// 凭证分类 	金蝶
-		String userid ="admin";
+
 		for (int i=0;i<dataList.size();i++){
 				MONEY=dataList.get(i).get("MONEY");
 				MONEYNOTAX=dataList.get(i).get("MONEYNOTAX").toString();
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java
index 5517a9918..b9c3f2e22 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java
@@ -15,7 +15,7 @@ import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl;
 
 public class CreateVoucherCustCautionMoneyIncome extends BaseBussiness {
 
-	public String CreateVoucher(String FlowUnid, String VOUCHERNO, String FeeType) throws Exception {
+	public String CreateVoucher(String FlowUnid, String VOUCHERNO, String FeeType,String userid) throws Exception {
 
 		Transaction Sqlca = null;
 		Map<String, String> map = new HashMap<String, String>();
@@ -57,7 +57,7 @@ public class CreateVoucherCustCautionMoneyIncome extends BaseBussiness {
 		List<Map<String, String>> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql, map);
 		CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl();
 		String VOUCHER_TYPE = "1";// 凭证分类 金蝶
-		String userid = "admin";
+
 		//遍历获取结果集, 将结果写入map中
 		for (int i = 0; i < dataList.size(); i++) {
 			MONEY = dataList.get(i).get("MONEY").toString();
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionToMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionToMoney.java
index b181767df..139bf9373 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionToMoney.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionToMoney.java
@@ -15,7 +15,7 @@ import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl;
 
 public class CreateVoucherDepositDeductionToMoney extends BaseBussiness {
 
-	public String CreateVoucher(String FlowUnid, String VOUCHERNO) throws Exception {
+	public String CreateVoucher(String FlowUnid, String VOUCHERNO,String userid) throws Exception {
 
 		Transaction Sqlca = null;
 		Map<String, String> map = new HashMap<String, String>();
@@ -48,7 +48,7 @@ public class CreateVoucherDepositDeductionToMoney extends BaseBussiness {
 		List<Map<String, String>> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql, map);
 		CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl();
 		String VOUCHER_TYPE = "1";// 凭证分类 金蝶
-		String userid = "admin";
+
 		//遍历获取结果集, 将结果写入map中
 		for (int i = 0; i < dataList.size(); i++) {
 			MONEY = dataList.get(i).get("MONEY").toString();
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForInterestSubsidyImport.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForInterestSubsidyImport.java
index fe05570b8..1a36bed3f 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForInterestSubsidyImport.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherForInterestSubsidyImport.java
@@ -15,12 +15,19 @@ import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl;
 
 public class CreateVoucherForInterestSubsidyImport {
 	private String id;
+	private String userId;
 	public String getId() {
 		return id;
 	}
 	public void setId(String id) {
 		this.id = id;
 	}
+	public String getUserId() {
+		return userId;
+	}
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
 
 	/**
 	 * 导入贴息生成凭证
@@ -55,7 +62,10 @@ public class CreateVoucherForInterestSubsidyImport {
 		List<Map<String, String>> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql, null);
 		CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl();
 		String VOUCHER_TYPE = "1";// 凭证分类 金蝶
-		String userid = "admin";
+		String userid =userId;
+		if(userid==null || "".equals(userid)) {
+			userid="admin";
+		}
 		for (int i=0;i<dataList.size();i++){
 			MONEY=dataList.get(i).get("MONEY").toString();
 			MONEYNOTAX=dataList.get(i).get("MONEYNOTAX").toString();
@@ -134,7 +144,10 @@ public class CreateVoucherForInterestSubsidyImport {
 		
 		CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl();
 		String VOUCHER_TYPE = "1";// 凭证分类 金蝶
-		String userid = "admin";
+		String userid =userId;
+		if(userid==null || "".equals(userid)) {
+			userid="admin";
+		}
 		for (int i=0;i<dataList.size();i++){
 			MONEY=dataList.get(i).get("MONEY").toString();
 			MONEYNOTAX=dataList.get(i).get("MONEYNOTAX").toString();
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractActualPaymentTraditionVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractActualPaymentTraditionVoucher.java
index d87a56d91..d5f0d8d26 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractActualPaymentTraditionVoucher.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractActualPaymentTraditionVoucher.java
@@ -12,10 +12,10 @@ public class ContractActualPaymentTraditionVoucher  extends BaseBussiness {
 	public Object run(Transaction Sqlca) throws Exception {
 		this.initBussinessParam(Sqlca);
 		String FlowUnid=this.getAttribute("FlowUnid").toString();
-		
+		String userid = this.getAttribute("CurUserID").toString();
 		CreateVoucherActualPaymentTradition cvap = new CreateVoucherActualPaymentTradition();
 		// 差额放款和非差额放款共有部分
-		cvap.CreateVoucher(FlowUnid, "PZ2018092500000159"); // 购置融资租赁资产-传统租赁资产--回租  --差额放款
+		cvap.CreateVoucher(FlowUnid, "PZ2018092500000159",userid); // 购置融资租赁资产-传统租赁资产--回租  --差额放款
 		// cvap.CreateVoucher(FlowUnid, "PZ2018092600000223"); // 购置融资租赁资产-传统租赁资产--直租
 		
 		//cvap.CreateVoucher(FlowUnid, "PZ2018092500000160"); // 购置融资租赁资产-其他--回租
@@ -26,25 +26,25 @@ public class ContractActualPaymentTraditionVoucher  extends BaseBussiness {
 		//cvap.CreateVoucher(FlowUnid, "PZ2018092600000225"); // 给经销商放款-非差额放款--直租
 		
 		// 差额放款部分
-		cvap.CreateVoucher(FlowUnid, "PZ2018092500000162"); // 经销商支付的预付款(首付)--回租
+		cvap.CreateVoucher(FlowUnid, "PZ2018092500000162",userid); // 经销商支付的预付款(首付)--回租
 		//cvap.CreateVoucher(FlowUnid, "PZ2018092600000226"); // 经销商支付的预付款(首付)--直租
 		
 		//cvap.CreateVoucher(FlowUnid, "PZ2018092500000163"); // 给经销商放款-首付冲抵--回租
 		//cvap.CreateVoucher(FlowUnid, "PZ2018092600000227"); // 给经销商放款-首付冲抵--直租
 		
-		cvap.CreateVoucher(FlowUnid, "PZ2018092500000164"); // 客户记录保证金--回租
+		cvap.CreateVoucher(FlowUnid, "PZ2018092500000164",userid); // 客户记录保证金--回租
 		//cvap.CreateVoucher(FlowUnid, "PZ2018092600000229"); // 客户记录保证金--直租
 		
 		//cvap.CreateVoucher(FlowUnid, "PZ2018092500000165"); // 给经销商放款-保证金冲抵--回租
 		//cvap.CreateVoucher(FlowUnid, "PZ2018092600000230"); // 给经销商放款-保证金冲抵--直租
 		
-		cvap.CreateVoucher(FlowUnid, "PZ2018092500000166"); // 收到客户手续费--回租
+		cvap.CreateVoucher(FlowUnid, "PZ2018092500000166",userid); // 收到客户手续费--回租
 		//cvap.CreateVoucher(FlowUnid, "PZ2018092600000231"); // 收到客户手续费--直租
 		
 		//cvap.CreateVoucher(FlowUnid, "PZ2018092500000167"); // 给经销商放款-手续费冲抵--回租
 		//cvap.CreateVoucher(FlowUnid, "PZ2018092600000232"); // 给经销商放款-手续费冲抵--直租
 		
-		cvap.CreateVoucher(FlowUnid, "PZ2018092500000169"); // 给经销商放款-差额放款--回租
+		cvap.CreateVoucher(FlowUnid, "PZ2018092500000169",userid); // 给经销商放款-差额放款--回租
 		//cvap.CreateVoucher(FlowUnid, "PZ2018092600000233"); // 给经销商放款-差额放款--直租
 
 		return "true";
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractBeforeOnhireToVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractBeforeOnhireToVoucher.java
index b3c62b874..e4b10b997 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractBeforeOnhireToVoucher.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractBeforeOnhireToVoucher.java
@@ -12,15 +12,16 @@ public class ContractBeforeOnhireToVoucher  extends BaseBussiness {
 	public Object run(Transaction Sqlca) throws Exception {
 		this.initBussinessParam(Sqlca);
 		String FlowUnid=this.getAttribute("ObjectNo").toString();
+		String userid = this.getAttribute("CurUserID").toString();
 		CreateVoucherToBeforeOnhire cvbo = new CreateVoucherToBeforeOnhire();
 		// 传统
-		cvbo.CreateVoucher(FlowUnid, "PZ2018092500000156","feetype2"); // 收到客户保证金--回租
+		cvbo.CreateVoucher(FlowUnid, "PZ2018092500000156","feetype2",userid); // 收到客户保证金--回租
 		// cvbo.CreateVoucher(FlowUnid, "PZ2018092600000244","feetype2"); // 收到客户保证金--直租
 		
-		cvbo.CreateVoucher(FlowUnid, "PZ2018092500000157","feetype1"); // 收到客户手续费--回租
+		cvbo.CreateVoucher(FlowUnid, "PZ2018092500000157","feetype1",userid); // 收到客户手续费--回租
 		// cvbo.CreateVoucher(FlowUnid, "PZ2018092600000245","feetype1"); // 收到客户手续费--直租
 		
-		cvbo.CreateVoucher(FlowUnid, "PZ2018092500000158","feetype5"); // 收到客户预付款(首付)--回租
+		cvbo.CreateVoucher(FlowUnid, "PZ2018092500000158","feetype5",userid); // 收到客户预付款(首付)--回租
 		// cvbo.CreateVoucher(FlowUnid, "PZ2018092600000246","feetype5"); // 收到客户预付款(首付)--直租
 		
 		// 汽车类传统
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucherTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucherTradition.java
index 6efb586c3..b6f7ff32a 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucherTradition.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractOnhireVoucherTradition.java
@@ -12,9 +12,10 @@ public class ContractOnhireVoucherTradition  extends BaseBussiness {
 	public Object run(Transaction Sqlca) throws Exception {
 		this.initBussinessParam(Sqlca);
 		String FlowUnid=this.getAttribute("FlowUnid").toString();
+		String userid = this.getAttribute("CurUserID").toString();
 		CreateVoucherOnhireTradition cvot=new CreateVoucherOnhireTradition();
 		// 传统
-		cvot.CreateVoucher(FlowUnid, "PZ2018092500000170"); //客户支付的应收账款总金额 --回租
+		cvot.CreateVoucher(FlowUnid, "PZ2018092500000170",userid); //客户支付的应收账款总金额 --回租
 		//cvot.CreateVoucher(FlowUnid, "PZ2018092800000247"); //客户支付的应收账款总金额 --直租
 		// 汽车类传统
 		//cvot.CreateVoucher(FlowUnid, "PZ2018092500000202"); //客户支付的应收账款总金额 --回租
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractTerminate.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractTerminate.java
index 599b1f60e..01d2ea9a3 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractTerminate.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/ContractTerminate.java
@@ -14,41 +14,41 @@ public class ContractTerminate extends BaseBussiness {
 	public Object run(Transaction Sqlca) throws Exception {
 		this.initBussinessParam(Sqlca);
 		String FlowUnid=this.getAttribute("FlowUnid").toString();
-		
+		String userid = this.getAttribute("CurUserID").toString();
 		CreateVoucherContractTerminate cvct=new CreateVoucherContractTerminate();
 		
-		cvct.CreateVoucher(FlowUnid, "PZ2018072100000045");//提前还款-调整未实现利息收入--回租
+		cvct.CreateVoucher(FlowUnid, "PZ2018072100000045",userid);//提前还款-调整未实现利息收入--回租
 		//cvct.CreateVoucher(FlowUnid, "PZ2018080400000099");// 未实现的利息（不含税）--直租
 		
-		cvct.CreateVoucher(FlowUnid, "PZ2018081700000127");// 提前还款-收到的逾期租金--回租
+		cvct.CreateVoucher(FlowUnid, "PZ2018081700000127",userid);// 提前还款-收到的逾期租金--回租
 		
-		cvct.CreateVoucher(FlowUnid, "PZ2018081700000129");// 提前还款-将当月利息转收入-- 回租
+		cvct.CreateVoucher(FlowUnid, "PZ2018081700000129",userid);// 提前还款-将当月利息转收入-- 回租
 		
-		cvct.CreateVoucher(FlowUnid, "PZ2018081700000128");//提前还款-收到的逾期利息--回租
+		cvct.CreateVoucher(FlowUnid, "PZ2018081700000128",userid);//提前还款-收到的逾期利息--回租
 		
-		cvct.CreateVoucher(FlowUnid, "PZ2018081700000130");//提前还款-收到的违约金--回租
+		cvct.CreateVoucher(FlowUnid, "PZ2018081700000130",userid);//提前还款-收到的违约金--回租
 		//cves.CreateVoucher(FlowUnid, "PZ2018081700000131");//收到的违约金--直租
 		
-		cvct.CreateVoucher(FlowUnid, "PZ2018081700000132");//提前还款-收到的提前还款手续费--回租
+		cvct.CreateVoucher(FlowUnid, "PZ2018081700000132",userid);//提前还款-收到的提前还款手续费--回租
 		//cves.CreateVoucher(FlowUnid, "PZ2018081700000133");//收到的手续费--直租
 		
-		cvct.CreateVoucher(FlowUnid, "PZ2018072100000047");//提前还款-收到的提前日息差--回租
+		cvct.CreateVoucher(FlowUnid, "PZ2018072100000047",userid);//提前还款-收到的提前日息差--回租
 		//cvct.CreateVoucher(FlowUnid, "PZ2018081700000125");//提前还款-收到的提前日息差--直租
 		
-		cvct.CreateVoucher(FlowUnid, "PZ2018081700000138");//提前还款-收到的一年内利息--回租
+		cvct.CreateVoucher(FlowUnid, "PZ2018081700000138",userid);//提前还款-收到的一年内利息--回租
 		//cves.CreateVoucher(FlowUnid, "PZ2018081700000139");//收到的提前还款一年内剩余利息--直租
 		
-		cvct.CreateVoucher(FlowUnid, "PZ2018081700000134");//提前还款-收到名义货价--回租
+		cvct.CreateVoucher(FlowUnid, "PZ2018081700000134",userid);//提前还款-收到名义货价--回租
 		//cves.CreateVoucher(FlowUnid, "PZ2018081700000135");//收到名义货价--直租
 		
-		cvct.CreateVoucher(FlowUnid, "PZ2018081700000136");//提前还款-收到的提前还款剩余本金----银行未带
+		cvct.CreateVoucher(FlowUnid, "PZ2018081700000136",userid);//提前还款-收到的提前还款剩余本金----银行未带
 		//cvct.CreateVoucher(FlowUnid, "PZ2018081700000137");//收到的提前还款剩余本金--直租
 		
 
-		cvct.CreateVoucher(FlowUnid, "PZ2018072100000046");//提前还款-确认贴息收入--回租
+		cvct.CreateVoucher(FlowUnid, "PZ2018072100000046",userid);//提前还款-确认贴息收入--回租
 		//cvct.CreateVoucher(FlowUnid, "PZ2018080400000100");//未实现的利息的税金--直租
 		
-		cvct.CreateVoucher(FlowUnid, "PZ2018081700000122");//提前还款-确认手续费（按月分摊）--回租
+		cvct.CreateVoucher(FlowUnid, "PZ2018081700000122",userid);//提前还款-确认手续费（按月分摊）--回租
 		//cvct.CreateVoucher(FlowUnid, "PZ2018081700000123");//确认未实现利息收入(不含税)--直租
 
 		// CreateVoucherEarlySettlement cves = new CreateVoucherEarlySettlement();
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/CreateVoucherDepositDeduction.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/CreateVoucherDepositDeduction.java
index 7f2f8dac7..1dc4c1277 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/CreateVoucherDepositDeduction.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/CreateVoucherDepositDeduction.java
@@ -13,8 +13,9 @@ public class CreateVoucherDepositDeduction extends BaseBussiness {
 	public Object run(Transaction Sqlca) throws Exception {
 		this.initBussinessParam(Sqlca);
 		String FlowUnid=this.getAttribute("FlowUnid").toString();
+		String userid = this.getAttribute("CurUserID").toString();
 		CreateVoucherDepositDeductionToMoney cvdd=new CreateVoucherDepositDeductionToMoney();
-		cvdd.CreateVoucher(FlowUnid, "PZ2018072100000053");//保证金抵扣--回租
+		cvdd.CreateVoucher(FlowUnid, "PZ2018072100000053",userid);//保证金抵扣--回租
 		//cvdd.CreateVoucher(FlowUnid, "PZ2018112300000003");//保证金抵扣--回租
 		return "true";
 	}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java
index 89a9427e1..6a4330444 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/IncomeVoucher.java
@@ -13,12 +13,12 @@ public class IncomeVoucher extends BaseBussiness {
 	public Object run(Transaction Sqlca) throws Exception {
 		this.initBussinessParam(Sqlca);
 		String FlowUnid=this.getAttribute("FlowUnid").toString();
-		
+		String userid = this.getAttribute("CurUserID").toString();
 		CreateVoucherCustCautionMoneyIncome cvci=new CreateVoucherCustCautionMoneyIncome();
-		cvci.CreateVoucher(FlowUnid, "PZ2018072100000026", "feetype30");//收到的违约金/罚款 --回租
+		cvci.CreateVoucher(FlowUnid, "PZ2018072100000026", "feetype30",userid);//收到的违约金/罚款 --回租
 		// cvci.CreateVoucher(FlowUnid, "PZ2018080400000083", "feetype30");//收到的违约金/罚款--直租
 		
-		cvci.CreateVoucher(FlowUnid, "PZ2018072100000031", "feetype4");//回款-收到名义货价--回租
+		cvci.CreateVoucher(FlowUnid, "PZ2018072100000031", "feetype4",userid);//回款-收到名义货价--回租
 		//cvci.CreateVoucher(FlowUnid, "PZ2018080400000087", "feetype4");//回款-收到名义货价--直租
 		
 		//cvci.CreateVoucher(FlowUnid, "PZ2018071100000012", "feetype2");//收到客户保证金 --回租
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java
index 4edbfabf4..89f7567c8 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java
@@ -18,14 +18,15 @@ public class RedIncomeVoucher extends BaseBussiness {
 	public Object run(Transaction Sqlca) throws Exception {
 		this.initBussinessParam(Sqlca);
 		String FlowUnid=this.getAttribute("FlowUnid").toString();
+		String userid = this.getAttribute("CurUserID").toString();
 		CreateVoucherRedRentIncome cvri=new CreateVoucherRedRentIncome();
-		cvri.CreateVoucher(FlowUnid, "PZ2018072100000038");//网银回款反冲--收到的逾期利息--回租
+		cvri.CreateVoucher(FlowUnid, "PZ2018072100000038",userid);//网银回款反冲--收到的逾期利息--回租
 		
-		cvri.CreateVoucher(FlowUnid, "PZ2018072100000039");//网银回款反冲-收到的违约金/罚款--回租
+		cvri.CreateVoucher(FlowUnid, "PZ2018072100000039",userid);//网银回款反冲-收到的违约金/罚款--回租
 		
-		cvri.CreateVoucher(FlowUnid, "PZ2018072100000037");//网银回款反冲--收到的租金--回租
+		cvri.CreateVoucher(FlowUnid, "PZ2018072100000037",userid);//网银回款反冲--收到的租金--回租
 		
-		cvri.CreateVoucher(FlowUnid, "PZ2018072100000043"); //网银回款反冲-收到名义货价--回租
+		cvri.CreateVoucher(FlowUnid, "PZ2018072100000043",userid); //网银回款反冲-收到名义货价--回租
 		
 		
 		return "true";
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java
index 5f63d56b5..ce0460b08 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java
@@ -88,7 +88,7 @@ public class CreateVoucherMonthSettlement{
 
 		CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl();
 		String VOUCHER_TYPE="1";// 凭证分类 	金蝶
-		String userid ="admin";
+		String userid ="yuejie";
 		for (int i=0;i<dataList.size();i++){
 			MONEY=dataList.get(i).get(moneyType).toString();
 			//FEEMONEY=dataList.get(i).get(FEEMONEY).toString();
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherOnhireTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherOnhireTradition.java
index be78b839a..0efe654cb 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherOnhireTradition.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherOnhireTradition.java
@@ -19,7 +19,7 @@ import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl;
  */
 public class CreateVoucherOnhireTradition extends BaseBussiness{
 	
-	public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception {
+	public String CreateVoucher(String FlowUnid,String VOUCHERNO,String userid) throws Exception {
 		// 创建事物
 		Transaction Sqlca =null;
 		Sqlca =  Transaction.createTransaction(CacheLoaderFactory.getDataSource());
@@ -60,7 +60,6 @@ public class CreateVoucherOnhireTradition extends BaseBussiness{
 		
 		// 设置常用参数
 		String VOUCHER_TYPE="1"; // 凭证分类 	金蝶
-		String userid ="admin";
 		
 		for (int i=0;i<dataList.size();i++){
 			OTHERSMONEY=dataList.get(i).get("MONEY");// 车款-首付款+保险+其他
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncome.java
index 156ecbbac..4b3741399 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncome.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncome.java
@@ -15,7 +15,7 @@ import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl;
 
 public class CreateVoucherRedRentIncome {
 
-	public void CreateVoucher(String FlowUnid,String VOUCHERNO){
+	public void CreateVoucher(String FlowUnid,String VOUCHERNO,String userid){
 		
 		Transaction Sqlca =null;
 		try{
@@ -63,7 +63,7 @@ public class CreateVoucherRedRentIncome {
 
 		CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl();
 		String VOUCHER_TYPE="1";// 凭证分类 	金蝶
-		String userid ="admin";
+
 		for (int i=0;i<dataList.size();i++){
 			MONEY=dataList.get(i).get("MONEY").toString();
 			MONEYNOTAX=dataList.get(i).get("MONEYNOTAX").toString();
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToBeforeOnhire.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToBeforeOnhire.java
index f770ba238..06379d2f2 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToBeforeOnhire.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherToBeforeOnhire.java
@@ -15,7 +15,7 @@ import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl;
 
 public class CreateVoucherToBeforeOnhire extends BaseBussiness {
 
-	public String CreateVoucher(String FlowUnid, String VOUCHERNO, String FeeType) throws Exception {
+	public String CreateVoucher(String FlowUnid, String VOUCHERNO, String FeeType,String userid) throws Exception {
 
 		Transaction Sqlca = null;
 		Map<String, String> map = new HashMap<String, String>();
@@ -67,7 +67,9 @@ public class CreateVoucherToBeforeOnhire extends BaseBussiness {
 		List<Map<String, String>> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql, map);
 		CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl();
 		String VOUCHER_TYPE = "1";// 凭证分类 金蝶
-		String userid = "admin";
+		if(userid==null || "".equals(userid)) {
+			userid="admin";
+		}
 		//遍历获取结果集, 将结果写入map中
 		for (int i = 0; i < dataList.size(); i++) {
 			MONEY = dataList.get(i).get("MONEY").toString();
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java
index 6a4c818e7..53e49186f 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java
@@ -52,16 +52,16 @@ public class InsertVoucherRentIncome {
 			 */
 			//收到的租金--网银-未逾期及逾期未过月的--(汽车)
 			if("PZ2018072100000024".equals(VOUCHERNO)){
-				sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f75,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(lvri.hire_date, '%Y/%m/%d') f1,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3,'收到的租金',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number = '1'  THEN lvri.rent  WHEN LV.sort_number = '2'  THEN LVRI.INTEREST ELSE 0.00 END f7,CASE WHEN lv.sort_number = '3' THEN lvri.corpus  WHEN lv.sort_number = '4' THEN lvri.interest  WHEN lv.sort_number = '5' THEN ROUND(lvri.interest/getTax(lci.leas_form,'租息',lcct.start_date),2) WHEN lv.sort_number = '6' THEN (lvri.interest-ROUND(lvri.interest/getTax(lci.leas_form,'租息',lcct.start_date),2)) ELSE 0.00 END f8,'IT管理员',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '6' THEN '' ELSE lci.contract_number END AS contract_number,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_id END,CASE WHEN lv.sort_number = '5' THEN '0604' ELSE '' END,'','已完整',DATE_FORMAT(NOW(),'%Y/%m/%d %h:%i:%s'),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,lci.leas_form FROM lv_rent_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id=lci.id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id=lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2018072100000024')) lv ON lv.proj_type = lci.leas_form WHERE LCI.BUSINESSTYPE = '1' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金%' AND f58 IS NOT NULL) AND lvri.rent > 0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
+				sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f75,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(lvri.hire_date, '%Y/%m/%d') f1,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3,'收到的租金',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number = '1'  THEN lvri.rent  WHEN LV.sort_number = '2'  THEN LVRI.INTEREST ELSE 0.00 END f7,CASE WHEN lv.sort_number = '3' THEN lvri.corpus  WHEN lv.sort_number = '4' THEN lvri.interest  WHEN lv.sort_number = '5' THEN ROUND(lvri.interest/getTax(lci.leas_form,'租息',lcct.start_date),2) WHEN lv.sort_number = '6' THEN (lvri.interest-ROUND(lvri.interest/getTax(lci.leas_form,'租息',lcct.start_date),2)) ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '6' THEN '' ELSE lci.contract_number END AS contract_number,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_id END,CASE WHEN lv.sort_number = '5' THEN '0604' ELSE '' END,'','已完整',DATE_FORMAT(NOW(),'%Y/%m/%d %h:%i:%s'),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,lci.leas_form FROM lv_rent_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id=lci.id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id=lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2018072100000024')) lv ON lv.proj_type = lci.leas_form WHERE LCI.BUSINESSTYPE = '1' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金%' AND f58 IS NOT NULL) AND lvri.rent > 0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
 			}
 			//收到的租金--网银-逾期过月--(汽车)
 			if("PZ2018080400000081".equals(VOUCHERNO)){
-				sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67 ) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(lvri.hire_date, '%Y/%m/%d') f1,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3,'收到的租金',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number = '1'  THEN lvri.rent   ELSE 0.00 END f7,CASE WHEN lv.sort_number = '2' THEN lvri.corpus  WHEN lv.sort_number = '3' THEN lvri.interest ELSE 0.00 END f8,'IT管理员',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,CASE WHEN lv.sort_number = '1' THEN '' ELSE lci.contract_number END AS contract_number,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END,'','','已完整',DATE_FORMAT(NOW(),'%Y/%m/%d %h:%i:%s'),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,lci.leas_form FROM lv_rent_income2 lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id=lci.id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id=lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2018080400000081')) lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE = '1' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金%' AND f58 IS NOT NULL) AND lvri.rent > 0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
+				sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67 ) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(lvri.hire_date, '%Y/%m/%d') f1,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3,'收到的租金',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number = '1'  THEN lvri.rent   ELSE 0.00 END f7,CASE WHEN lv.sort_number = '2' THEN lvri.corpus  WHEN lv.sort_number = '3' THEN lvri.interest ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,CASE WHEN lv.sort_number = '1' THEN '' ELSE lci.contract_number END AS contract_number,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END,'','','已完整',DATE_FORMAT(NOW(),'%Y/%m/%d %h:%i:%s'),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,lci.leas_form FROM lv_rent_income2 lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id=lci.id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id=lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2018080400000081')) lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE = '1' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金%' AND f58 IS NOT NULL) AND lvri.rent > 0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
 			}
 			//收到的逾期利息--网银
 			if("PZ2018072100000025".equals(VOUCHERNO)){
-				// sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f1,f3,f5,f6,f7,f8,f12,f15,f49,f50,f51,f52,f59,f60,f61,f62,f64,f65,f73,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') f1,lvri.voucher_f3,'收到的逾期利息',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2) WHEN lv.sort_number = '3' THEN lvri.penalty - (ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2)) ELSE 0.00 END AS f8,'IT管理员',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,lci.contract_number,CASE WHEN lv.loan_direction = '1' THEN '业务系统待查客户' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.loan_direction = '2' THEN '04' ELSE '' END,CASE WHEN lv.loan_direction = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END,CASE WHEN lv.loan_direction = '2' THEN '0603' ELSE '' END,lvri.OWN_NUMBER,'已完整',NOW(3),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,CASE WHEN lv.sort_number = '2' THEN lci.leas_form ELSE '' END FROM lv_penalty_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id WHERE lvc.voucher_no IN ('PZ2018072100000025','PZ2018080400000082'))lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE = '1' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的逾期利息%' AND f58 IS NOT NULL) AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
-				sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f75,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') f1,lv.subjects_code AS f2,lvri.voucher_f3,'收到的逾期利息',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'租息',lcct.start_date),2) WHEN lv.sort_number = '3' THEN lvri.penalty - (ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'租息',lcct.start_date),2)) ELSE 0.00 END AS f8,'IT管理员',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '3' THEN '' ELSE lci.contract_number END AS contract_number,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_id END,CASE WHEN lv.sort_number = '2' THEN '0603' ELSE '' END,'','已完整',DATE_FORMAT(NOW(),'%Y/%m/%d %h:%i:%s'),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,lci.leas_form  FROM lv_penalty_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id=lci.id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.subjects_code FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id=lvl.loan_subject WHERE lvc.voucher_no IN ('PZ2018072100000025')) lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE = '1' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的逾期利息%' AND f58 IS NOT NULL) AND lvri.penalty>0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
+				// sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f1,f3,f5,f6,f7,f8,f12,f15,f49,f50,f51,f52,f59,f60,f61,f62,f64,f65,f73,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') f1,lvri.voucher_f3,'收到的逾期利息',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2) WHEN lv.sort_number = '3' THEN lvri.penalty - (ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2)) ELSE 0.00 END AS f8,'定时任务-每天生成租金实收凭证',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,lci.contract_number,CASE WHEN lv.loan_direction = '1' THEN '业务系统待查客户' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.loan_direction = '2' THEN '04' ELSE '' END,CASE WHEN lv.loan_direction = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END,CASE WHEN lv.loan_direction = '2' THEN '0603' ELSE '' END,lvri.OWN_NUMBER,'已完整',NOW(3),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,CASE WHEN lv.sort_number = '2' THEN lci.leas_form ELSE '' END FROM lv_penalty_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id WHERE lvc.voucher_no IN ('PZ2018072100000025','PZ2018080400000082'))lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE = '1' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的逾期利息%' AND f58 IS NOT NULL) AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
+				sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f75,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') f1,lv.subjects_code AS f2,lvri.voucher_f3,'收到的逾期利息',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'租息',lcct.start_date),2) WHEN lv.sort_number = '3' THEN lvri.penalty - (ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'租息',lcct.start_date),2)) ELSE 0.00 END AS f8,'定时任务-每天生成租金实收凭证',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '3' THEN '' ELSE lci.contract_number END AS contract_number,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_id END,CASE WHEN lv.sort_number = '2' THEN '0603' ELSE '' END,'','已完整',DATE_FORMAT(NOW(),'%Y/%m/%d %h:%i:%s'),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,lci.leas_form  FROM lv_penalty_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id=lci.id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.subjects_code FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id=lvl.loan_subject WHERE lvc.voucher_no IN ('PZ2018072100000025')) lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE = '1' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的逾期利息%' AND f58 IS NOT NULL) AND lvri.penalty>0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
 			}
 			
 			/**
@@ -69,25 +69,25 @@ public class InsertVoucherRentIncome {
 			 */
 			//收到的租金-月付--网银-未逾期及逾期未过月的(传统)
 			if("PZ2018100900000298".equals(VOUCHERNO)){
-				sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f75,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(lvri.hire_date, '%Y/%m/%d') f1,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3,'收到的租金',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number = '1' THEN lvri.rent WHEN LV.sort_number = '2' THEN LVRI.INTEREST ELSE 0.00 END f7,CASE WHEN lv.sort_number = '3' THEN lvri.corpus WHEN lv.sort_number = '4' THEN lvri.interest WHEN lv.sort_number = '5' THEN ROUND(lvri.interest / getTax (lci.leas_form,'租息',lcct.start_date),2) WHEN lv.sort_number = '6' THEN (lvri.interest - ROUND(lvri.interest / getTax (lci.leas_form,'租息',lcct.start_date),2)) ELSE 0.00 END f8,'IT管理员',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '6' THEN '' ELSE lci.contract_number END AS contract_number,CASE WHEN lv.sort_number = '1' THEN '传统B端待查客户' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000CT' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_id END,CASE WHEN lv.sort_number = '5' THEN '0604' ELSE '' END,'','已完整',DATE_FORMAT(NOW(), '%Y/%m/%d %h:%i:%s'),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,lci.leas_form FROM lv_rent_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2018100900000298')) lv ON lv.proj_type = lci.leas_form WHERE LCI.BUSINESSTYPE = '2' AND lcct.INCOME_NUMBER_YEAR='income_1' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金%' AND f58 IS NOT NULL) AND lvri.rent > 0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
+				sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f75,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(lvri.hire_date, '%Y/%m/%d') f1,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3,'收到的租金',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number = '1' THEN lvri.rent WHEN LV.sort_number = '2' THEN LVRI.INTEREST ELSE 0.00 END f7,CASE WHEN lv.sort_number = '3' THEN lvri.corpus WHEN lv.sort_number = '4' THEN lvri.interest WHEN lv.sort_number = '5' THEN ROUND(lvri.interest / getTax (lci.leas_form,'租息',lcct.start_date),2) WHEN lv.sort_number = '6' THEN (lvri.interest - ROUND(lvri.interest / getTax (lci.leas_form,'租息',lcct.start_date),2)) ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '6' THEN '' ELSE lci.contract_number END AS contract_number,CASE WHEN lv.sort_number = '1' THEN '传统B端待查客户' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000CT' WHEN lv.sort_number = '6' THEN '' ELSE lvri.cust_id END,CASE WHEN lv.sort_number = '5' THEN '0604' ELSE '' END,'','已完整',DATE_FORMAT(NOW(), '%Y/%m/%d %h:%i:%s'),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,lci.leas_form FROM lv_rent_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2018100900000298')) lv ON lv.proj_type = lci.leas_form WHERE LCI.BUSINESSTYPE = '2' AND lcct.INCOME_NUMBER_YEAR='income_1' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金%' AND f58 IS NOT NULL) AND lvri.rent > 0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
 			}
 			//收到的租金-月付--网银-逾期过月(传统)
 			if("PZ2018092500000171".equals(VOUCHERNO)){
-				sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67 ) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(lvri.hire_date, '%Y/%m/%d') f1,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3,'收到的租金',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number = '1'  THEN lvri.rent   ELSE 0.00 END f7,CASE WHEN lv.sort_number = '2' THEN lvri.corpus  WHEN lv.sort_number = '3' THEN lvri.interest ELSE 0.00 END f8,'IT管理员',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,CASE WHEN lv.sort_number = '1' THEN '' ELSE lci.contract_number END AS contract_number,CASE WHEN lv.sort_number = '1' THEN '传统B端待查客户' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000CT' ELSE lvri.cust_id END,'','','已完整',DATE_FORMAT(NOW(),'%Y/%m/%d %h:%i:%s'),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,lci.leas_form FROM lv_rent_income2 lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id=lci.id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id=lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2018092500000171')) lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE = '2' AND lcct.INCOME_NUMBER_YEAR='income_1' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金%' AND f58 IS NOT NULL) AND lvri.rent > 0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
+				sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67 ) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(lvri.hire_date, '%Y/%m/%d') f1,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3,'收到的租金',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number = '1'  THEN lvri.rent   ELSE 0.00 END f7,CASE WHEN lv.sort_number = '2' THEN lvri.corpus  WHEN lv.sort_number = '3' THEN lvri.interest ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,CASE WHEN lv.sort_number = '1' THEN '' ELSE lci.contract_number END AS contract_number,CASE WHEN lv.sort_number = '1' THEN '传统B端待查客户' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000CT' ELSE lvri.cust_id END,'','','已完整',DATE_FORMAT(NOW(),'%Y/%m/%d %h:%i:%s'),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,lci.leas_form FROM lv_rent_income2 lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id=lci.id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id=lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2018092500000171')) lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE = '2' AND lcct.INCOME_NUMBER_YEAR='income_1' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金%' AND f58 IS NOT NULL) AND lvri.rent > 0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
 			}
 			
 			//收到的租金-季付--网银-未逾期及逾期未过月的(传统)
 			if("PZ2019022500000012".equals(VOUCHERNO)){
-				sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f75,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(lvri.hire_date, '%Y/%m/%d') f1,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3,'收到的租金',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number = '1' THEN lvri.rent WHEN LV.sort_number = '2' THEN (LVRI.INTEREST -ROUND(LVRI.INTEREST /getTax(lci.leas_form,'租息',lcct.start_date),2))ELSE 0.00 END f7,CASE WHEN lv.sort_number = '3' THEN lvri.corpus WHEN lv.sort_number = '4' THEN lvri.interest WHEN lv.sort_number = '5' THEN (LVRI.INTEREST -ROUND(LVRI.INTEREST /getTax(lci.leas_form,'租息',lcct.start_date),2)) ELSE 0.00 END f8,'IT管理员',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '2' OR lv.sort_number = '5' THEN '' ELSE lci.contract_number END AS contract_number,CASE WHEN lv.sort_number = '1' THEN '传统B端待查客户' WHEN lv.sort_number = '5' THEN '' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000CT' WHEN lv.sort_number = '5' THEN '' ELSE lvri.cust_id END,'','','已完整',DATE_FORMAT(NOW(), '%Y/%m/%d %h:%i:%s'),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,lci.leas_form FROM lv_rent_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2019022500000012')) lv ON lv.proj_type = lci.leas_form WHERE LCI.BUSINESSTYPE = '2' AND lcct.INCOME_NUMBER_YEAR = 'income_3' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金%' AND f58 IS NOT NULL) AND lvri.rent > 0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
+				sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f75,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(lvri.hire_date, '%Y/%m/%d') f1,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3,'收到的租金',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number = '1' THEN lvri.rent WHEN LV.sort_number = '2' THEN (LVRI.INTEREST -ROUND(LVRI.INTEREST /getTax(lci.leas_form,'租息',lcct.start_date),2))ELSE 0.00 END f7,CASE WHEN lv.sort_number = '3' THEN lvri.corpus WHEN lv.sort_number = '4' THEN lvri.interest WHEN lv.sort_number = '5' THEN (LVRI.INTEREST -ROUND(LVRI.INTEREST /getTax(lci.leas_form,'租息',lcct.start_date),2)) ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '2' OR lv.sort_number = '5' THEN '' ELSE lci.contract_number END AS contract_number,CASE WHEN lv.sort_number = '1' THEN '传统B端待查客户' WHEN lv.sort_number = '5' THEN '' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000CT' WHEN lv.sort_number = '5' THEN '' ELSE lvri.cust_id END,'','','已完整',DATE_FORMAT(NOW(), '%Y/%m/%d %h:%i:%s'),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,lci.leas_form FROM lv_rent_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id = lci.id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id = lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2019022500000012')) lv ON lv.proj_type = lci.leas_form WHERE LCI.BUSINESSTYPE = '2' AND lcct.INCOME_NUMBER_YEAR = 'income_3' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金%' AND f58 IS NOT NULL) AND lvri.rent > 0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
 			}
 			//收到的租金-季付--网银-逾期过月(传统)
 			if("PZ2019022500000011".equals(VOUCHERNO)){
-				sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67 ) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(lvri.hire_date, '%Y/%m/%d') f1,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3,'收到的租金',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number = '1'  THEN lvri.rent   ELSE 0.00 END f7,CASE WHEN lv.sort_number = '2' THEN lvri.corpus  WHEN lv.sort_number = '3' THEN lvri.interest ELSE 0.00 END f8,'IT管理员',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,CASE WHEN lv.sort_number = '1' THEN '' ELSE lci.contract_number END AS contract_number,CASE WHEN lv.sort_number = '1' THEN '传统B端待查客户' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000CT' ELSE lvri.cust_id END,'','','已完整',DATE_FORMAT(NOW(),'%Y/%m/%d %h:%i:%s'),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,lci.leas_form FROM lv_rent_income2 lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id=lci.id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id=lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2019022500000011')) lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE = '2' AND lcct.INCOME_NUMBER_YEAR='income_3' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金%' AND f58 IS NOT NULL) AND lvri.rent > 0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
+				sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67 ) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(lvri.hire_date, '%Y/%m/%d') f1,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3,'收到的租金',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number = '1'  THEN lvri.rent   ELSE 0.00 END f7,CASE WHEN lv.sort_number = '2' THEN lvri.corpus  WHEN lv.sort_number = '3' THEN lvri.interest ELSE 0.00 END f8,'定时任务-每天生成租金实收凭证',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,CASE WHEN lv.sort_number = '1' THEN '' ELSE lci.contract_number END AS contract_number,CASE WHEN lv.sort_number = '1' THEN '传统B端待查客户' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000CT' ELSE lvri.cust_id END,'','','已完整',DATE_FORMAT(NOW(),'%Y/%m/%d %h:%i:%s'),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,lci.leas_form FROM lv_rent_income2 lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id=lci.id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.SUBJECTS_CODE FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id=lvl.LOAN_SUBJECT WHERE lvc.voucher_no IN ('PZ2019022500000011')) lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE = '2' AND lcct.INCOME_NUMBER_YEAR='income_3' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金%' AND f58 IS NOT NULL) AND lvri.rent > 0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
 			}
 			
 			//收到的逾期利息--网银(传统)
 			if("PZ2018092500000172".equals(VOUCHERNO)){
-				sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f75,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') f1,lv.subjects_code AS f2,lvri.voucher_f3,'收到的逾期利息',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'租息',lcct.start_date),2) WHEN lv.sort_number = '3' THEN lvri.penalty - (ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'租息',lcct.start_date),2)) ELSE 0.00 END AS f8,'IT管理员',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '3' THEN '' ELSE lci.contract_number END AS contract_number,CASE WHEN lv.sort_number = '1' THEN '传统B端待查客户' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000CT' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_id END,CASE WHEN lv.sort_number = '2' THEN '0603' ELSE '' END,'','已完整',DATE_FORMAT(NOW(),'%Y/%m/%d %h:%i:%s'),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,lci.leas_form  FROM lv_penalty_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id=lci.id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.subjects_code FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id=lvl.loan_subject WHERE lvc.voucher_no IN ('PZ2018092500000172')) lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE = '2' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的逾期利息%' AND f58 IS NOT NULL) AND lvri.penalty>0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
+				sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,f2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,f59,f60,f61,f62,f65,f73,f75,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') f1,lv.subjects_code AS f2,lvri.voucher_f3,'收到的逾期利息',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'租息',lcct.start_date),2) WHEN lv.sort_number = '3' THEN lvri.penalty - (ROUND(lvri.penalty / getTax (LCI.LEAS_FORM,'租息',lcct.start_date),2)) ELSE 0.00 END AS f8,'定时任务-每天生成租金实收凭证',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '3' THEN '' ELSE lci.contract_number END AS contract_number,CASE WHEN lv.sort_number = '1' THEN '传统B端待查客户' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000CT' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_id END,CASE WHEN lv.sort_number = '2' THEN '0603' ELSE '' END,'','已完整',DATE_FORMAT(NOW(),'%Y/%m/%d %h:%i:%s'),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,lci.leas_form  FROM lv_penalty_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN lc_calc_condition lcct ON lcct.contract_id=lci.id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number,lsc.subjects_code FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id LEFT JOIN lv_stacts_config lsc ON lsc.id=lvl.loan_subject WHERE lvc.voucher_no IN ('PZ2018092500000172')) lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE = '2' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的逾期利息%' AND f58 IS NOT NULL) AND lvri.penalty>0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
 			}
 			
 			/**
@@ -95,17 +95,17 @@ public class InsertVoucherRentIncome {
 			 */
 			/*//收到的租金--网银(汽车传统)
 			if("PZ2018092500000203".equals(VOUCHERNO)||"PZ2018100900000296".equals(VOUCHERNO)){
-				sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f1,f3,f5,f6,f7,f8,f12,f15,f49,f50,f51,f52,f59,f60,f61,f62,f64,f65,f73,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') f1,lvri.voucher_f3,'收到的租金',lv.LOAN_SUBJECT,CASE WHEN lv.LOAN_DIRECTION = '1' THEN lvri.rent ELSE 0.00 END,CASE WHEN lv.LOAN_DIRECTION = '2' THEN lvri.rent ELSE 0.00 END,'IT管理员',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,lci.contract_number,CASE WHEN lv.loan_direction = '1' THEN '业务系统待查客户' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.loan_direction = '2' THEN '04' ELSE '' END,CASE WHEN lv.loan_direction = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END,CASE WHEN lv.loan_direction = '2' THEN '04' ELSE '' END,lvri.OWN_NUMBER,'已完整',NOW(),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,CASE WHEN lv.loan_direction = '2' THEN lci.leas_form ELSE '' END FROM lv_rent_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id WHERE lvc.voucher_no IN ('PZ2018092500000203','PZ2018100900000296')) lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE='3' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金%' AND f58 IS NOT NULL) AND lvri.rent > 0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
+				sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f1,f3,f5,f6,f7,f8,f12,f15,f49,f50,f51,f52,f59,f60,f61,f62,f64,f65,f73,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') f1,lvri.voucher_f3,'收到的租金',lv.LOAN_SUBJECT,CASE WHEN lv.LOAN_DIRECTION = '1' THEN lvri.rent ELSE 0.00 END,CASE WHEN lv.LOAN_DIRECTION = '2' THEN lvri.rent ELSE 0.00 END,'定时任务-每天生成租金实收凭证',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,lci.contract_number,CASE WHEN lv.loan_direction = '1' THEN '业务系统待查客户' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.loan_direction = '2' THEN '04' ELSE '' END,CASE WHEN lv.loan_direction = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END,CASE WHEN lv.loan_direction = '2' THEN '04' ELSE '' END,lvri.OWN_NUMBER,'已完整',NOW(),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,CASE WHEN lv.loan_direction = '2' THEN lci.leas_form ELSE '' END FROM lv_rent_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id WHERE lvc.voucher_no IN ('PZ2018092500000203','PZ2018100900000296')) lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE='3' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金%' AND f58 IS NOT NULL) AND lvri.rent > 0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
 			}
 			*/
 			//收到的逾期利息--网银(汽车传统)
 			/*if("PZ2018092500000204".equals(VOUCHERNO)||"PZ2018100900000297".equals(VOUCHERNO)){
-				sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f1,f3,f5,f6,f7,f8,f12,f15,f49,f50,f51,f52,f59,f60,f61,f62,f64,f65,f73,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') f1,lvri.voucher_f3,'收到的逾期利息',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN ROUND(lvri.penalty / getTax(LCI.LEAS_FORM,'逾期利息',LCI.INPUTTIME),2) WHEN lv.sort_number = '3' THEN lvri.penalty - (ROUND(lvri.penalty / getTax(LCI.LEAS_FORM,'逾期利息',LCI.INPUTTIME),2)) ELSE 0.00 END AS f8,'IT管理员',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,lci.contract_number,CASE WHEN lv.loan_direction = '1' THEN '业务系统待查客户' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.loan_direction = '2' THEN '04' ELSE '' END,CASE WHEN lv.loan_direction = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END,CASE WHEN lv.loan_direction = '2' THEN '05' ELSE '' END,lvri.OWN_NUMBER,'已完整',NOW(),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,CASE WHEN lv.sort_number = '2' THEN lci.leas_form ELSE '' END FROM lv_penalty_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id WHERE lvc.voucher_no IN ('PZ2018092500000204','PZ2018100900000297')) lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE='3' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的逾期利息%' AND f58 IS NOT NULL) AND lvri.penalty > 0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
+				sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f1,f3,f5,f6,f7,f8,f12,f15,f49,f50,f51,f52,f59,f60,f61,f62,f64,f65,f73,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4) periodyear,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') f1,lvri.voucher_f3,'收到的逾期利息',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number = '1' THEN lvri.penalty ELSE 0.00 END AS f7,CASE WHEN lv.sort_number = '2' THEN ROUND(lvri.penalty / getTax(LCI.LEAS_FORM,'逾期利息',LCI.INPUTTIME),2) WHEN lv.sort_number = '3' THEN lvri.penalty - (ROUND(lvri.penalty / getTax(LCI.LEAS_FORM,'逾期利息',LCI.INPUTTIME),2)) ELSE 0.00 END AS f8,'定时任务-每天生成租金实收凭证',DATE_FORMAT(SYSDATE(), '%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 1, 4),SUBSTR(DATE_FORMAT(SYSDATE(), '%Y%m%d'), 5, 2),lv.sort_number,lci.contract_number,CASE WHEN lv.loan_direction = '1' THEN '业务系统待查客户' ELSE lvri.cust_name END AS cust_name,lv.loan_subject,CASE WHEN lv.loan_direction = '2' THEN '04' ELSE '' END,CASE WHEN lv.loan_direction = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END,CASE WHEN lv.loan_direction = '2' THEN '05' ELSE '' END,lvri.OWN_NUMBER,'已完整',NOW(),'0',lv.modular_number,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,CASE WHEN lv.sort_number = '2' THEN lci.leas_form ELSE '' END FROM lv_penalty_income lvri LEFT JOIN lb_contract_info lci ON lci.id = lvri.contract_id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY,lvl.sort_number,lvl.loan_subject,lvc.modular_number FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID = lvc.id WHERE lvc.voucher_no IN ('PZ2018092500000204','PZ2018100900000297')) lv ON lv.proj_type = lci.LEAS_FORM WHERE LCI.BUSINESSTYPE='3' AND lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的逾期利息%' AND f58 IS NOT NULL) AND lvri.penalty > 0 AND lvri.EBANK_NUMBER IS NOT NULL AND lvri.EBANK_NUMBER <> '' ORDER BY lvri.voucher_f3 ";
 			}
 			*/
 			// 收到的贴息
 			/*if("PZ2018072100000028".equals(VOUCHERNO)||"PZ2018080400000085".equals(VOUCHERNO)){
-				sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f1,f3,f5,f6,f7,f8,f12,f15,f49,f50,f51,f52,f59,f60,f61,f62,f64,f65,f73,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(),'-','') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(),'%Y%m%d'),1,4) periodyear,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') f1,lvri.voucher_f3,'收到的贴息',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number='1' THEN lvri.rent ELSE 0.00 END as f7,CASE WHEN lv.sort_number='2' THEN round(lvri.rent/getTax(LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2) WHEN lv.sort_number='3'  then  lvri.rent-(ROUND(lvri.rent/getTax(LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2)) ELSE 0.00 END as f8,'IT管理员',DATE_FORMAT(SYSDATE(),'%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(),'%Y%m%d'),1,4),SUBSTR(DATE_FORMAT(SYSDATE(),'%Y%m%d'),5,2),lv.sort_number,lci.contract_number,lvri.cust_name,lv.loan_subject,CASE WHEN lv.loan_direction='2' THEN '04' ELSE '' END,lvri.cust_id,CASE WHEN lv.loan_direction='2' THEN '02' ELSE '' END,lvri.OWN_NUMBER,'已完整',NOW(3),'0',lv.modular_number,CASE WHEN lv.loan_direction='1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,CASE WHEN lv.sort_number = '2' THEN lci.leas_form ELSE '' END FROM lv_discount_income lvri LEFT JOIN lb_contract_info lci ON lci.id=lvri.contract_id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY ,lvl.sort_number,lvl.loan_subject,lvc.modular_number FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID=lvc.id WHERE lvc.voucher_no IN ('PZ2018080400000085','PZ2018072100000028')) lv ON lv.proj_type=lci.LEAS_FORM WHERE lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的贴息%' and f58 is not null) and lvri.rent>0 ORDER BY lvri.voucher_f3";
+				sql_where="INSERT INTO voucher_v8 (id,evidence_message,periodyear,f1,f3,f5,f6,f7,f8,f12,f15,f49,f50,f51,f52,f59,f60,f61,f62,f64,f65,f73,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67) SELECT REPLACE(UUID(),'-','') id,'凭证输出' evidence_message,SUBSTR(DATE_FORMAT(SYSDATE(),'%Y%m%d'),1,4) periodyear,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') f1,lvri.voucher_f3,'收到的贴息',lv.LOAN_SUBJECT,CASE WHEN lv.sort_number='1' THEN lvri.rent ELSE 0.00 END as f7,CASE WHEN lv.sort_number='2' THEN round(lvri.rent/getTax(LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2) WHEN lv.sort_number='3'  then  lvri.rent-(ROUND(lvri.rent/getTax(LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2)) ELSE 0.00 END as f8,'定时任务-每天生成租金实收凭证',DATE_FORMAT(SYSDATE(),'%Y/%m/%d'),lv.OWNED_COMPANY,lv.OWNED_COMPANY,SUBSTR(DATE_FORMAT(SYSDATE(),'%Y%m%d'),1,4),SUBSTR(DATE_FORMAT(SYSDATE(),'%Y%m%d'),5,2),lv.sort_number,lci.contract_number,lvri.cust_name,lv.loan_subject,CASE WHEN lv.loan_direction='2' THEN '04' ELSE '' END,lvri.cust_id,CASE WHEN lv.loan_direction='2' THEN '02' ELSE '' END,lvri.OWN_NUMBER,'已完整',NOW(3),'0',lv.modular_number,CASE WHEN lv.loan_direction='1' THEN '1' ELSE '-1' END,'admin',lvri.income_id,CASE WHEN lv.sort_number = '2' THEN lci.leas_form ELSE '' END FROM lv_discount_income lvri LEFT JOIN lb_contract_info lci ON lci.id=lvri.contract_id LEFT JOIN (SELECT lvc.PROJ_TYPE,lvl.id,lvl.LOAN_DIRECTION,lvc.OWNED_COMPANY ,lvl.sort_number,lvl.loan_subject,lvc.modular_number FROM lv_voucher_config lvc LEFT JOIN lv_voucher_loan lvl ON lvl.VOUCHER_ID=lvc.id WHERE lvc.voucher_no IN ('PZ2018080400000085','PZ2018072100000028')) lv ON lv.proj_type=lci.LEAS_FORM WHERE lvri.income_id NOT IN (SELECT f58 FROM voucher_v8 WHERE module_name LIKE '%-收到的贴息%' and f58 is not null) and lvri.rent>0 ORDER BY lvri.voucher_f3";
 			}*/
 			
 			SqlObject asql = new SqlObject(sql_where);
@@ -133,10 +133,10 @@ public class InsertVoucherRentIncome {
 		
 		// String sql="INSERT INTO lv_rent_income (SELECT REPLACE(UUID(),'-',''),CONCAT('k',getSerialNumber ()),cif.customer_num,cif.customername,lci.id,lci.contract_number,lri.ID,lri.HIRE_DATE ,lri.RENT ,lri.CORPUS,lri.INTEREST,0.00,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID FROM lc_rent_income lri LEFT JOIN lb_contract_info lci ON lci.id=lri.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif  ON cif.customerid=lul.customer_id WHERE lri.rent>0  AND lri.id NOT IN (SELECT income_id FROM lv_rent_income))";
 		// 未逾期及逾期未过月
-		String sql="INSERT INTO lv_rent_income (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ()),cif.customer_num,cif.customername,lci.id,lci.contract_number,lri.ID,lri.HIRE_DATE,lri.RENT,lri.CORPUS,lri.INTEREST,0.00,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id WHERE (lrp.collect_status NOT IN('手工收款','批量收款','提前结清') OR (lrp.collect_status IS NULL OR lrp.collect_status='')) AND lri.rent > 0 AND lri.id NOT IN (SELECT income_id FROM lv_rent_income) AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m'))";
+		String sql="INSERT INTO lv_rent_income (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ('凭证号')),cif.customer_num,cif.customername,lci.id,lci.contract_number,lri.ID,lri.HIRE_DATE,lri.RENT,lri.CORPUS,lri.INTEREST,0.00,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id WHERE (lrp.collect_status NOT IN('手工收款','批量收款','提前结清') OR (lrp.collect_status IS NULL OR lrp.collect_status='')) AND lri.rent > 0 AND lri.id NOT IN (SELECT income_id FROM lv_rent_income) AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m'))";
 		// 逾期过月
-		String sq1="INSERT INTO lv_rent_income2 (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ()),cif.customer_num,cif.customername,lci.id,lci.contract_number,lri.ID,lri.HIRE_DATE,lri.RENT,lri.CORPUS,lri.INTEREST,0.00,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id WHERE (lrp.collect_status NOT IN ('手工收款','批量收款','提前结清') OR (lrp.collect_status IS NULL OR lrp.collect_status = '' )) AND lri.rent > 0 AND lri.id NOT IN (SELECT income_id FROM lv_rent_income2) AND DATE_FORMAT(NOW(), '%Y-%m') > DATE_FORMAT(lrp.plan_date, '%Y-%m')) ";
-		String sql1="INSERT INTO lv_penalty_income (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ()),cif.customer_num,cif.customername,lci.id,lci.contract_number,lri.ID,lri.HIRE_DATE,0.00,0.00,0.00,lri.PENALTY,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id WHERE (lrp.collect_status NOT IN ('手工收款','批量收款','提前结清') OR (lrp.collect_status IS NULL OR lrp.collect_status = '')) AND lri.penalty > 0 AND lri.id NOT IN (SELECT income_id FROM lv_penalty_income)) ";
+		String sq1="INSERT INTO lv_rent_income2 (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ('凭证号')),cif.customer_num,cif.customername,lci.id,lci.contract_number,lri.ID,lri.HIRE_DATE,lri.RENT,lri.CORPUS,lri.INTEREST,0.00,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id WHERE (lrp.collect_status NOT IN ('手工收款','批量收款','提前结清') OR (lrp.collect_status IS NULL OR lrp.collect_status = '' )) AND lri.rent > 0 AND lri.id NOT IN (SELECT income_id FROM lv_rent_income2) AND DATE_FORMAT(NOW(), '%Y-%m') > DATE_FORMAT(lrp.plan_date, '%Y-%m')) ";
+		String sql1="INSERT INTO lv_penalty_income (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ('凭证号')),cif.customer_num,cif.customername,lci.id,lci.contract_number,lri.ID,lri.HIRE_DATE,0.00,0.00,0.00,lri.PENALTY,lri.OWN_BANK,lri.OWN_ACCOUNT,lri.OWN_NUMBER,lri.EBANK_NUMBER,lri.CARDDEDUCT_ID,lri.ACCOUNTING_DATE FROM lc_rent_income lri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lri.contract_id AND lrp.plan_list = lri.plan_list LEFT JOIN lb_contract_info lci ON lci.id = lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id WHERE (lrp.collect_status NOT IN ('手工收款','批量收款','提前结清') OR (lrp.collect_status IS NULL OR lrp.collect_status = '')) AND lri.penalty > 0 AND lri.id NOT IN (SELECT income_id FROM lv_penalty_income)) ";
 		// String sql2="INSERT INTO lv_discount_income (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ()),cif.customer_num,cif.customername,lci.id,lci.contract_number,ld.ID,DATE_FORMAT(ld.inputtime, '%Y/%m/%d'),ld.discount_money,0.00,0.00,0.00,oac.acc_bank,oac.acc_name,oac.acc_number FROM lb_discount ld LEFT JOIN lb_contract_info lci ON lci.contract_no = ld.contract_no LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN (SELECT acc_bank,acc_name,acc_number FROM OWN_ACCOUNT WHERE account_type = 'in_account' AND state_ = '0010' LIMIT 0, 1) oac ON 1 = 1 WHERE ld.discount_money > 0 AND ld.id NOT IN (SELECT income_id FROM lv_discount_income)) ";
 		SqlObject as1 = new SqlObject(sq1);		
 		SqlObject asql = new SqlObject(sql);		
diff --git a/src_tenwa/com/tenwa/flow/fund/copyebank/LCEbankInfoHandler.java b/src_tenwa/com/tenwa/flow/fund/copyebank/LCEbankInfoHandler.java
index 7b7e7af4a..e430ba2e4 100644
--- a/src_tenwa/com/tenwa/flow/fund/copyebank/LCEbankInfoHandler.java
+++ b/src_tenwa/com/tenwa/flow/fund/copyebank/LCEbankInfoHandler.java
@@ -34,7 +34,8 @@ public class LCEbankInfoHandler extends CommonHandler {
 	}
 	protected void afterInsert(JBOTransaction tx, BizObject bo) throws Exception {
 		super.afterInsert(tx, bo);
+		String  userId= curUser.getUserID();
 		EbankUse bu = new EbankUse();
-		bu.createEbankVoucher(tx);
+		bu.createEbankVoucher(tx,userId);
 	}
 }
diff --git a/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java b/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java
index 5bc374ded..6b6381a97 100644
--- a/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java
+++ b/src_tenwa/com/tenwa/lease/app/ebank/EbankUse.java
@@ -30,6 +30,7 @@ public class EbankUse {
 	private String ebdataid;
 	private String VOUCHERNO;
 	private String SUMMARY;
+	private String userId;
 
 	public String getVOUCHERNO() {
 		return VOUCHERNO;
@@ -51,6 +52,12 @@ public class EbankUse {
 	public void setEbdataid(String ebdataid) {
 		this.ebdataid = ebdataid;
 	}
+	public String getUserId() {
+		return userId;
+	}
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
 
 	/**
 	 * 判断网银是否在使用
@@ -79,7 +86,7 @@ public class EbankUse {
 		return "success";
 	}
 
-	public String createEbankVoucher(JBOTransaction tx){
+	public String createEbankVoucher(JBOTransaction tx,String userId){
 		Transaction Sqlca = null;
 		String returns="true";
 		try {
@@ -108,7 +115,10 @@ public class EbankUse {
 			List<BizObject> bolist = ebankbom.createQuery("DEBIT_MONEY IS NULL or DEBIT_MONEY=0.00").getResultList(true);
 			CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl();
 			String VOUCHER_TYPE = "1";// 凭证分类 金蝶
-			String userid = "admin";
+			String userid =userId;
+			if(userid == null || "".equals(userid)) {
+				userid="admin";
+			}
 			for (BizObject bo : bolist) {
 				
 				fact_money = bo.getAttribute("fact_money").getString();
@@ -188,6 +198,119 @@ public class EbankUse {
 		}
 		return returns;
 	}
+	
+	public String createEbankVoucher2(JBOTransaction tx){
+		Transaction Sqlca = null;
+		String returns="true";
+		try {
+			Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource());
+			String voucherNo = "PZ2018081600000120";
+			Map<String, String> param = new HashMap<String, String>();
+			BizObjectManager ebankbom = JBOFactory.getBizObjectManager(LC_EBANK.CLASS_NAME);
+			tx.join(ebankbom);
+			// 金额
+			String fact_money = "";
+			// 日期
+			String fact_date = "";
+			// 银行账号
+			String ownnumber = "";
+			// 银行名称
+			String OWN_BANK = "";
+			// 科目编码
+			String EBANK_SUBJECTS = "";
+			// 流水号
+			String EBANK_SN="";
+			// 业务类型
+			String BUSINESS_TYPE="";
+			// 客商类型
+			String CUSTOMER_TYPE="";
+			// 查询新增或者导入的网银
+			List<BizObject> bolist = ebankbom.createQuery("DEBIT_MONEY IS NULL or DEBIT_MONEY=0.00").getResultList(true);
+			CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl();
+			String VOUCHER_TYPE = "1";// 凭证分类 金蝶
+			String userid =userId;
+			if(userid == null || "".equals(userid)) {
+				userid="admin";
+			}
+			for (BizObject bo : bolist) {
+				
+				fact_money = bo.getAttribute("fact_money").getString();
+				// 银行名称
+				OWN_BANK = bo.getAttribute("OWN_BANK").getString();
+				// 日期
+				fact_date = bo.getAttribute("fact_date").getString();
+				// 银行账号
+				ownnumber = bo.getAttribute("ownacc_number").getString();
+				// 网银流水号
+				EBANK_SN=bo.getAttribute("EBANK_SN").getString();
+				// 根据银行名称获取银行科目
+				BizObject lsc=JBOFactory.createBizObjectQuery(LV_STACTS_CONFIG.CLASS_NAME, "SUBJECTS_NAME='"+OWN_BANK+"'").getSingleResult(false);
+				EBANK_SUBJECTS=lsc.getAttribute("SUBJECTS_CODE").getString();
+				// 业务类型
+				BUSINESS_TYPE=bo.getAttribute("BUSINESS_TYPE").getString();;
+				// 客商类型
+				CUSTOMER_TYPE=bo.getAttribute("CUSTOMER_TYPE").getString();;
+				
+				// BizObject RESULT = JBOFactory.createBizObjectQuery(LB_CONTRACT_INFO.CLASS_NAME,"CONTRACT_NO=:CONTRACT_NO").setParameter("CONTRACT_NO", CONTRACT_NUMBER).getSingleResult(false);
+				// String  BUSINESSTYPE= RESULT.getAttribute("BUSINESSTYPE").getString();
+				
+				// 判断是汽车类还是传统类, 如果是传统, 则生成传统的分录
+				if("传统".equals(BUSINESS_TYPE)) {
+					voucherNo="PZ2018092500000155";
+				}else if("汽车类传统".equals(BUSINESS_TYPE)) {
+					voucherNo="PZ2018092500000155";
+				}
+				
+				// 如果金额小于0, 则为反冲凭证
+				Map<String, String> map = new HashMap<String, String>();
+				if(Double.parseDouble(fact_money)<0) {
+					voucherNo="PZ2018121800000005";
+				}
+				
+				param.put("FACT_MONEY", fact_money);
+				param.put("ACCOUNT_DATE", fact_date);
+				param.put("FACT_DATE", fact_date);
+				param.put("ACC_NUMBER", ownnumber);
+				param.put("EBANK_SN", EBANK_SN);
+				param.put("EBANK_SUBJECTS", EBANK_SUBJECTS);
+				
+				// 根据客商类型判断现金流编码
+				if("内部客商".equals(CUSTOMER_TYPE)) {
+					param.put("CASHFLOW", "11112");
+				}else if("外部客商".equals(CUSTOMER_TYPE)) {
+					param.put("CASHFLOW", "11113");
+				}
+				param.put("VOUCHERNO",voucherNo);
+				
+				map.put("PROJ_TYPE", "02");
+				map.put("VOUCHER_NO", voucherNo);
+				BizObject vouch = DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca);
+				if (vouch != null) {
+					vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(),vouch.getAttribute("OWNED_COMPANY").getString(), "02", VOUCHER_TYPE, userid, param, Sqlca);
+				}
+				bo.setAttributeValue("DEBIT_MONEY", fact_money);
+				ebankbom.saveObject(bo);
+			}
+			Sqlca.commit();
+		} catch (Exception e) {
+			returns="false";
+			try {
+				Sqlca.rollback();
+			} catch (JBOException e1) {
+				e1.printStackTrace();
+			}
+			e.printStackTrace();
+		}finally {
+			if(Sqlca!=null) {
+				try {
+					Sqlca.disConnect();
+				} catch (JBOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+		return returns;
+	}
 
 	/**
 	 * 合同到期申请-将多余还款确认为收入/将多余还款退回
@@ -216,7 +339,10 @@ public class EbankUse {
 		
 			// 获取所需数据
 			String VOUCHER_TYPE = "1";// 凭证分类 金蝶
-			String userid = "admin";
+			String userid = userId;
+			if(userid == null || "".equals(userid)) {
+				userid="admin";
+			}
 	
 			for (Map<String, String> jbo : dataList) {
 				String MONEY = jbo.get("MONEY").toString();