diff --git a/WebContent/Tenwa/Lease/Flow/CollectionAudit/VI_SNAP_JOINT_VOUCHER.jsp b/WebContent/Tenwa/Lease/Flow/CollectionAudit/VI_SNAP_JOINT_VOUCHER.jsp
index 232ea9a8f..f8b85c38b 100644
--- a/WebContent/Tenwa/Lease/Flow/CollectionAudit/VI_SNAP_JOINT_VOUCHER.jsp
+++ b/WebContent/Tenwa/Lease/Flow/CollectionAudit/VI_SNAP_JOINT_VOUCHER.jsp
@@ -21,6 +21,7 @@
 
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+
 <script type="text/javascript">
 	function Manage(){
 		var sParm = getItemValueArray(0, "id");
@@ -40,7 +41,7 @@
 		var income_IDs = getItemValueArray(0,'income_ID')+","+TablePage.getCheckedItemValueArrayWithOtherPage("income_ID",s_c_p[0]);
 		var Return1 = RunJavaMethodTrans("com.tenwa.lease.flow.contract.commbusiness.VOUCHERINFO","JiaoYanTwo","income_IDs="+income_IDs);
 		if(Return1=="true"){
-			var res = RunJavaMethodTrans("com.tenwa.lease.app.quartzmession.Checkfordeduction", "execute", "id="+ids);
+			var res = RunJavaMethodTrans("com.tenwa.lease.app.quartzmession.Checkfordeduction", "execute", "id="+ids+",userId="+"<%=CurUser.getUserID()%>");
 			if (res== "true") {
 				alert("执行成功！");
 				location.reload();
@@ -57,6 +58,7 @@
 	}
 	
 	function viewAndEdit(){
+		
 		var sUrl = "/Tenwa/Lease/Flow/CollectionAudit/VI_SNAP_JOINT_VOUCHERInfo.jsp";
 		var income_IDs = getItemValueArray(0,'income_ID')+","+TablePage.getCheckedItemValueArrayWithOtherPage("income_ID",s_c_p[0]);
 		if(typeof(income_IDs) == "undefined" || income_IDs.length == 1 ){alert("请选择一条信息！");return ;}
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBTelOnline/LbTelOnlinList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBTelOnline/LbTelOnlinList.jsp
index 2a3f5a56d..c4286f4fe 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBTelOnline/LbTelOnlinList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBTelOnline/LbTelOnlinList.jsp
@@ -39,7 +39,6 @@
 		}
 	}
 	function retry(){
-		debugger;
 // 		var onLineId = getItemValue(0,getRow(0),'online_id');
 // 		var certids=getItemValueArray(0,"certid");
 		var online_ids=getItemValueArray(0,"online_id");
diff --git a/WebContent/com/tenwa/apzl/discount/LbDiscountList.jsp b/WebContent/com/tenwa/apzl/discount/LbDiscountList.jsp
index 9464ad830..63ef3b965 100644
--- a/WebContent/com/tenwa/apzl/discount/LbDiscountList.jsp
+++ b/WebContent/com/tenwa/apzl/discount/LbDiscountList.jsp
@@ -76,7 +76,6 @@
 		AsControl.OpenView(sUrl,'SerialNo=' +sPara ,'_self','');
 	}
 	function do_delete(){
-		debugger;
 		var sPara = getItemValue(0,getRow(0),'ID');
 		if(confirm("是否删除？")){
 			// 删除生成反冲贴息凭证
diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/Checkfordeduction.java b/src_tenwa/com/tenwa/lease/app/quartzmession/Checkfordeduction.java
index 7de5e0e60..827d76301 100644
--- a/src_tenwa/com/tenwa/lease/app/quartzmession/Checkfordeduction.java
+++ b/src_tenwa/com/tenwa/lease/app/quartzmession/Checkfordeduction.java
@@ -5,9 +5,11 @@ import java.util.Map;
 
 import javax.swing.JOptionPane;
 
+import jbo.sys.USER_INFO;
 import jbo.voucher.LV_VOUCHER_CONFIG;
 
 import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.JBOFactory;
 import com.amarsoft.are.jbo.JBOTransaction;
 import com.amarsoft.awe.util.SqlObject;
 import com.amarsoft.awe.util.Transaction;
@@ -16,15 +18,22 @@ import com.tenwa.comm.util.jboutil.DataOperatorUtil;
 
 public class Checkfordeduction {
 	private String id;
-	private String[] voucher_nos = { "PZ2018082100000142", "PZ2018082100000143", "PZ2018082100000144","PZ2018121800000006","PZ2018121800000007","PZ2018121800000009" };
+	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;
+	}
+	
+	private String[] voucher_nos = { "PZ2018082100000142", "PZ2018082100000143", "PZ2018082100000144","PZ2018121800000006","PZ2018121800000007","PZ2018121800000009" };
 
 	String returns = "true";
 
@@ -42,6 +51,12 @@ public class Checkfordeduction {
 		String sql_where = "";
 		try {
 //			Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource());
+			String user_name="曹玉丽";
+			BizObject user=JBOFactory.createBizObjectQuery(USER_INFO.CLASS_NAME, "USERID='"+userId+"'").getSingleResult(false);
+			if(user !=null || !"".equals(user)) {
+				user_name=user.getAttribute("username").getString();
+			}
+			
 			Map<String, String> map = new HashMap<String, String>();
 			map.put("VOUCHER_NO", VOUCHERNO);
 			BizObject vouch = DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca);
@@ -50,28 +65,28 @@ public class Checkfordeduction {
 				for (String str : ids) {	
 					// 收到的租金--卡扣-未逾期及逾期未过月的(汽车)
 					if ("PZ2018082100000142".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,f74,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,lvri.ACCOUNTING_DATE f15,CASE WHEN lv.sort_number = '1' THEN (SELECT lsc.subjects_code FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank) ELSE lv.SUBJECTS_CODE END AS f2,lvri.voucher_f3,'收到的租金',CASE WHEN lv.sort_number = '1' THEN (SELECT lsc.id FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank) ELSE lv.LOAN_SUBJECT END AS 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管理员',lvri.ACCOUNTING_DATE,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' OR lv.sort_number = '6' THEN '' ELSE lvri.cust_name END AS cust_name,CASE WHEN lv.sort_number = '1' THEN (SELECT lsc.id FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank) ELSE lv.LOAN_SUBJECT END AS LOAN_SUBJECT,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '6' THEN '' ELSE lvri.cust_id END AS cust_id,CASE WHEN lv.sort_number = '5' THEN '0604' ELSE '' END,CASE WHEN lv.sort_number = '1' THEN '11113' ELSE '' END AS f74,CASE WHEN lv.sort_number = '1' THEN lvri.own_number 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 ('PZ2018082100000142')) 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 NULL OR lvri.EBANK_NUMBER = '') and lvri.income_id='"+str+"' 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,f74,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,lvri.ACCOUNTING_DATE f15,CASE WHEN lv.sort_number = '1' THEN (SELECT lsc.subjects_code FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank) ELSE lv.SUBJECTS_CODE END AS f2,lvri.voucher_f3,'收到的租金',CASE WHEN lv.sort_number = '1' THEN (SELECT lsc.id FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank) ELSE lv.LOAN_SUBJECT END AS 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,'"+user_name+"',lvri.ACCOUNTING_DATE,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' OR lv.sort_number = '6' THEN '' ELSE lvri.cust_name END AS cust_name,CASE WHEN lv.sort_number = '1' THEN (SELECT lsc.id FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank) ELSE lv.LOAN_SUBJECT END AS LOAN_SUBJECT,CASE WHEN lv.sort_number = '1' OR lv.sort_number = '6' THEN '' ELSE lvri.cust_id END AS cust_id,CASE WHEN lv.sort_number = '5' THEN '0604' ELSE '' END,CASE WHEN lv.sort_number = '1' THEN '11113' ELSE '' END AS f74,CASE WHEN lv.sort_number = '1' THEN lvri.own_number 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 ('PZ2018082100000142')) 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 NULL OR lvri.EBANK_NUMBER = '') and lvri.income_id='"+str+"' ORDER BY lvri.voucher_f3  ";
 					}
 					// 收到的租金--卡扣-逾期过月的(汽车)
 					if ("PZ2018082100000143".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,f74,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,lvri.ACCOUNTING_DATE f15,CASE WHEN lv.sort_number = '1' THEN (SELECT lsc.subjects_code FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank) ELSE lv.SUBJECTS_CODE END AS f2,lvri.voucher_f3,'收到的租金',CASE WHEN lv.sort_number = '1' THEN (SELECT lsc.id FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank) ELSE lv.LOAN_SUBJECT END AS 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管理员',lvri.ACCOUNTING_DATE,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 '' ELSE lvri.cust_name END AS cust_name,CASE WHEN lv.sort_number = '1' THEN (SELECT lsc.id FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank) ELSE lv.LOAN_SUBJECT END AS LOAN_SUBJECT,CASE WHEN lv.sort_number = '1' THEN '' ELSE lvri.cust_id END AS cust_id,'',CASE WHEN lv.sort_number = '1' THEN '11113' ELSE '' END AS f74,CASE WHEN lv.sort_number = '1' THEN lvri.OWN_NUMBER 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_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 ('PZ2018082100000143')) 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 NULL OR lvri.EBANK_NUMBER = '') AND lvri.income_id='"+str+"' 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,f74,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,lvri.ACCOUNTING_DATE f15,CASE WHEN lv.sort_number = '1' THEN (SELECT lsc.subjects_code FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank) ELSE lv.SUBJECTS_CODE END AS f2,lvri.voucher_f3,'收到的租金',CASE WHEN lv.sort_number = '1' THEN (SELECT lsc.id FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank) ELSE lv.LOAN_SUBJECT END AS 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,'"+user_name+"',lvri.ACCOUNTING_DATE,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 '' ELSE lvri.cust_name END AS cust_name,CASE WHEN lv.sort_number = '1' THEN (SELECT lsc.id FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank) ELSE lv.LOAN_SUBJECT END AS LOAN_SUBJECT,CASE WHEN lv.sort_number = '1' THEN '' ELSE lvri.cust_id END AS cust_id,'',CASE WHEN lv.sort_number = '1' THEN '11113' ELSE '' END AS f74,CASE WHEN lv.sort_number = '1' THEN lvri.OWN_NUMBER 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_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 ('PZ2018082100000143')) 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 NULL OR lvri.EBANK_NUMBER = '') AND lvri.income_id='"+str+"' ORDER BY lvri.voucher_f3 ";
 					}
 					
 					// 卡扣回款反冲-收到的租金--卡扣-未逾期及逾期未过月的(汽车)
 					if ("PZ2018121800000009".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, f74, 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, lvri.ACCOUNTING_DATE f15, CASE WHEN lv.sort_number = '1' THEN ( SELECT lsc.subjects_code FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank ) ELSE lv.SUBJECTS_CODE END AS f2, lvri.voucher_f3, '收到的租金', CASE WHEN lv.sort_number = '1' THEN ( SELECT lsc.id FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank ) ELSE lv.LOAN_SUBJECT END AS 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管理员', lvri.ACCOUNTING_DATE, 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' OR lv.sort_number = '6' THEN '' ELSE lvri.cust_name END AS cust_name, CASE WHEN lv.sort_number = '1' THEN ( SELECT lsc.id FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank ) ELSE lv.LOAN_SUBJECT END AS LOAN_SUBJECT, CASE WHEN lv.sort_number = '1' OR lv.sort_number = '6' THEN '' ELSE lvri.cust_id END AS cust_id, CASE WHEN lv.sort_number = '5' THEN '0604' ELSE '' END, CASE WHEN lv.sort_number = '1' THEN '11113' ELSE '' END AS f74, CASE WHEN lv.sort_number = '1' THEN lvri.own_number 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 ('PZ2018121800000009')) 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 NULL OR lvri.EBANK_NUMBER = '' )  and lvri.income_id='"+str+"' 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, f74, 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, lvri.ACCOUNTING_DATE f15, CASE WHEN lv.sort_number = '1' THEN ( SELECT lsc.subjects_code FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank ) ELSE lv.SUBJECTS_CODE END AS f2, lvri.voucher_f3, '收到的租金', CASE WHEN lv.sort_number = '1' THEN ( SELECT lsc.id FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank ) ELSE lv.LOAN_SUBJECT END AS 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, '"+user_name+"', lvri.ACCOUNTING_DATE, 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' OR lv.sort_number = '6' THEN '' ELSE lvri.cust_name END AS cust_name, CASE WHEN lv.sort_number = '1' THEN ( SELECT lsc.id FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank ) ELSE lv.LOAN_SUBJECT END AS LOAN_SUBJECT, CASE WHEN lv.sort_number = '1' OR lv.sort_number = '6' THEN '' ELSE lvri.cust_id END AS cust_id, CASE WHEN lv.sort_number = '5' THEN '0604' ELSE '' END, CASE WHEN lv.sort_number = '1' THEN '11113' ELSE '' END AS f74, CASE WHEN lv.sort_number = '1' THEN lvri.own_number 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 ('PZ2018121800000009')) 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 NULL OR lvri.EBANK_NUMBER = '' )  and lvri.income_id='"+str+"' ORDER BY lvri.voucher_f3 ";
 					}
 					// 卡扣回款反冲-收到的租金--卡扣-逾期过月的(汽车)
 					if ("PZ2018121800000007".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, f74, 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, lvri.ACCOUNTING_DATE f15, CASE WHEN lv.sort_number = '1' THEN ( SELECT lsc.subjects_code FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank ) ELSE lv.SUBJECTS_CODE END AS f2, lvri.voucher_f3, '收到的租金', CASE WHEN lv.sort_number = '1' THEN ( SELECT lsc.id FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank ) ELSE lv.LOAN_SUBJECT END AS 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管理员', lvri.ACCOUNTING_DATE, 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 '' ELSE lvri.cust_name END AS cust_name, CASE WHEN lv.sort_number = '1' THEN ( SELECT lsc.id FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank ) ELSE lv.LOAN_SUBJECT END AS LOAN_SUBJECT, CASE WHEN lv.sort_number = '1' THEN '' ELSE lvri.cust_id END AS cust_id, '', CASE WHEN lv.sort_number = '1' THEN '11113' ELSE '' END AS f74, CASE WHEN lv.sort_number = '1' THEN lvri.OWN_NUMBER 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_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 ('PZ2018121800000007')) 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 NULL OR lvri.EBANK_NUMBER = '' )  and lvri.income_id='"+str+"' 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, f74, 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, lvri.ACCOUNTING_DATE f15, CASE WHEN lv.sort_number = '1' THEN ( SELECT lsc.subjects_code FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank ) ELSE lv.SUBJECTS_CODE END AS f2, lvri.voucher_f3, '收到的租金', CASE WHEN lv.sort_number = '1' THEN ( SELECT lsc.id FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank ) ELSE lv.LOAN_SUBJECT END AS 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, '"+user_name+"', lvri.ACCOUNTING_DATE, 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 '' ELSE lvri.cust_name END AS cust_name, CASE WHEN lv.sort_number = '1' THEN ( SELECT lsc.id FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank ) ELSE lv.LOAN_SUBJECT END AS LOAN_SUBJECT, CASE WHEN lv.sort_number = '1' THEN '' ELSE lvri.cust_id END AS cust_id, '', CASE WHEN lv.sort_number = '1' THEN '11113' ELSE '' END AS f74, CASE WHEN lv.sort_number = '1' THEN lvri.OWN_NUMBER 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_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 ('PZ2018121800000007')) 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 NULL OR lvri.EBANK_NUMBER = '' )  and lvri.income_id='"+str+"' ORDER BY lvri.voucher_f3 ";
 					}
 					// 收到的逾期利息--卡扣
 					if ("PZ2018082100000144".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, f74, 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, lvri.ACCOUNTING_DATE f15, CASE WHEN lv.sort_number = '1' THEN ( SELECT lsc.subjects_code FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank ) ELSE lv.SUBJECTS_CODE END AS f2, lvri.voucher_f3, '收到的逾期利息', CASE WHEN lv.sort_number = '1' THEN ( SELECT lsc.id FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank ) ELSE lv.LOAN_SUBJECT END AS 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管理员', lvri.ACCOUNTING_DATE, 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' OR lv.sort_number = '3' THEN '' ELSE lvri.cust_name END AS cust_name, CASE WHEN lv.sort_number = '1' THEN ( SELECT lsc.id FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank ) ELSE lv.LOAN_SUBJECT END AS LOAN_SUBJECT, CASE WHEN lv.sort_number = '1' OR lv.sort_number = '3' THEN '' ELSE lvri.cust_id END AS cust_id, CASE WHEN lv.sort_number = '2' THEN '0603' ELSE '' END, CASE WHEN lv.sort_number = '1' THEN '11113' ELSE '' END AS f74, CASE WHEN lv.sort_number = '1' THEN lvri.own_number 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 ('PZ2018082100000144')) 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 NULL OR lvri.EBANK_NUMBER = '' )  and lvri.income_id='"+str+"' 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, f74, 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, lvri.ACCOUNTING_DATE f15, CASE WHEN lv.sort_number = '1' THEN ( SELECT lsc.subjects_code FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank ) ELSE lv.SUBJECTS_CODE END AS f2, lvri.voucher_f3, '收到的逾期利息', CASE WHEN lv.sort_number = '1' THEN ( SELECT lsc.id FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank ) ELSE lv.LOAN_SUBJECT END AS 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, '"+user_name+"', lvri.ACCOUNTING_DATE, 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' OR lv.sort_number = '3' THEN '' ELSE lvri.cust_name END AS cust_name, CASE WHEN lv.sort_number = '1' THEN ( SELECT lsc.id FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank ) ELSE lv.LOAN_SUBJECT END AS LOAN_SUBJECT, CASE WHEN lv.sort_number = '1' OR lv.sort_number = '3' THEN '' ELSE lvri.cust_id END AS cust_id, CASE WHEN lv.sort_number = '2' THEN '0603' ELSE '' END, CASE WHEN lv.sort_number = '1' THEN '11113' ELSE '' END AS f74, CASE WHEN lv.sort_number = '1' THEN lvri.own_number 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 ('PZ2018082100000144')) 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 NULL OR lvri.EBANK_NUMBER = '' )  and lvri.income_id='"+str+"' ORDER BY lvri.voucher_f3 ";
 					}
 					// 卡扣回款反冲--逾期利息
 					if ("PZ2018121800000006".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, f74, 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, lvri.ACCOUNTING_DATE f15, CASE WHEN lv.sort_number = '1' THEN ( SELECT lsc.subjects_code FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank ) ELSE lv.SUBJECTS_CODE END AS f2, lvri.voucher_f3, '收到的逾期利息', CASE WHEN lv.sort_number = '1' THEN ( SELECT lsc.id FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank ) ELSE lv.LOAN_SUBJECT END AS 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管理员', lvri.ACCOUNTING_DATE, 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' OR lv.sort_number = '3' THEN '' ELSE lvri.cust_name END AS cust_name, CASE WHEN lv.sort_number = '1' THEN ( SELECT lsc.id FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank ) ELSE lv.LOAN_SUBJECT END AS LOAN_SUBJECT, CASE WHEN lv.sort_number = '1' OR lv.sort_number = '3' THEN '' ELSE lvri.cust_id END AS cust_id, CASE WHEN lv.sort_number = '2' THEN '0603' ELSE '' END, CASE WHEN lv.sort_number = '1' THEN '11113' ELSE '' END AS f74, CASE WHEN lv.sort_number = '1' THEN lvri.own_number 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 ('PZ2018121800000006')) 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 NULL OR lvri.EBANK_NUMBER = '' )  and lvri.income_id='"+str+"' 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, f74, 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, lvri.ACCOUNTING_DATE f15, CASE WHEN lv.sort_number = '1' THEN ( SELECT lsc.subjects_code FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank ) ELSE lv.SUBJECTS_CODE END AS f2, lvri.voucher_f3, '收到的逾期利息', CASE WHEN lv.sort_number = '1' THEN ( SELECT lsc.id FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank ) ELSE lv.LOAN_SUBJECT END AS 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, '"+user_name+"', lvri.ACCOUNTING_DATE, 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' OR lv.sort_number = '3' THEN '' ELSE lvri.cust_name END AS cust_name, CASE WHEN lv.sort_number = '1' THEN ( SELECT lsc.id FROM lv_stacts_config lsc WHERE lsc.subjects_name = lvri.own_bank ) ELSE lv.LOAN_SUBJECT END AS LOAN_SUBJECT, CASE WHEN lv.sort_number = '1' OR lv.sort_number = '3' THEN '' ELSE lvri.cust_id END AS cust_id, CASE WHEN lv.sort_number = '2' THEN '0603' ELSE '' END, CASE WHEN lv.sort_number = '1' THEN '11113' ELSE '' END AS f74, CASE WHEN lv.sort_number = '1' THEN lvri.own_number 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 ('PZ2018121800000006')) 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 NULL OR lvri.EBANK_NUMBER = '' )  and lvri.income_id='"+str+"' ORDER BY lvri.voucher_f3 ";
 					}
 				
 					SqlObject asql = new SqlObject(sql_where);
@@ -110,13 +125,14 @@ public class Checkfordeduction {
 			// 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[] ids = id.split("@");
 			for (String str : ids) {
-				String sql = "INSERT INTO lv_rent_income (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ('凭证号')),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.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 lb_contract_info lci ON lci.id = lri.contract_id LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lci.id AND lrp.plan_list=lri.plan_list 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.id in('"+ str + "') AND lrp.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,lrp.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 lb_contract_info lci ON lci.id = lri.contract_id LEFT JOIN lc_rent_plan lrp ON lrp.contract_id=lci.id AND lrp.plan_list=lri.plan_list 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.id in('"+ str + "') AND lrp.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,lrp.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 lri.contract_id=lrp.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.id in('"+ str + "') AND lrp.id NOT IN(SELECT INCOME_ID FROM lv_penalty_income) )";
+				// 未逾期及逾期未过月的租金
+				String sql = "INSERT INTO lv_rent_income (SELECT REPLACE(UUID(), '-', ''),CONCAT('k', getSerialNumber ('凭证号')),cif.customer_num,cif.customername,lci.id,lci.contract_number,lrp.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.id = '"+ str + "' AND lrp.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,lrp.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.id = '"+ str + "' AND lrp.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,lrp.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 lri.contract_id = lrp.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.id ='"+ str + "' AND lrp.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.id NOT IN (SELECT income_id FROM lv_discount_income)) ";
 				SqlObject as1 = new SqlObject(sq1);
 				SqlObject asql = new SqlObject(sql);