From 76f070ed9e47a557ebab690606d8ff22b7d60cb7 Mon Sep 17 00:00:00 2001 From: XZW Date: Tue, 18 Feb 2020 09:43:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E6=89=A3=E6=AC=BE=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E7=94=9F=E6=88=90=E5=87=AD=E8=AF=81=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InsertVoucherRentIncome.java | 60 +++++++++---------- src_sql/鎶曚骇SQL/V20200206/xiezw20200206.sql | 5 -- 2 files changed, 30 insertions(+), 35 deletions(-) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java index 95fa7c4a6..43d2afb16 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/InsertVoucherRentIncome.java @@ -16,7 +16,7 @@ import com.tenwa.comm.util.jboutil.DataOperatorUtil; public class InsertVoucherRentIncome { /** * 定时任务触发 - * @throws Exception + * @throws Exception */ public void execute() throws Exception{ // 将需要生成凭证的数据存入中间 @@ -24,11 +24,11 @@ public class InsertVoucherRentIncome { // 插数据入v8表生成凭证 CreateVoucher(); } - - /** - * 查询租金实收表, 将需要生成凭证的数据存入中间表 - * @throws Exception - */ + + /** + * 查询租金实收表, 将需要生成凭证的数据存入中间表 + * @throws Exception + */ public void initLVRentIncome() throws Exception{ Transaction Sqlca =null; Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); @@ -44,18 +44,18 @@ public class InsertVoucherRentIncome { String sqls2="SELECT lri.RENT 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 LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income GROUP BY INCOME_ID,LRI_ID) LV1 ON LV1.INCOME_ID = LRI.PLAN_ID AND LV1.LRI_ID=LRI.ID LEFT JOIN (SELECT income_id,LRI_ID FROM lv_rent_income2 GROUP BY INCOME_ID,LRI_ID) LV2 ON LV2.INCOME_ID = LRI.PLAN_ID AND LV2.LRI_ID=LRI.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID) LV3 ON LV3.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID) LV4 ON LV4.INCOME_ID = LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款') OR lrp.collect_msg IN ('WXPay', 'WXUnionPay')) AND lri.rent > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND lul.is_main = 'Y' AND DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/13', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') <> DATE_FORMAT(lrp.plan_date, '%Y-%m') "; // 查询当前数据是否有逾期利息(卡扣) String sqls3="SELECT lri.PENALTY 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 LEFT JOIN (SELECT income_id,LRI_ID FROM lv_penalty_income GROUP BY INCOME_ID,LRI_ID) LV1 ON LV1.INCOME_ID = LRI.PLAN_ID AND LV1.LRI_ID=LRI.ID LEFT JOIN (SELECT INCOME_ID FROM LV_PENALTY_PLAN GROUP BY INCOME_ID) LV2 ON LV2.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID) LV3 ON LV3.INCOME_ID = LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID) LV4 ON LV4.INCOME_ID = LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款') OR lrp.collect_msg IN ('WXPay', 'WXUnionPay')) AND lri.penalty > 0 AND (LV1.INCOME_ID IS NULL AND LV2.INCOME_ID IS NULL AND LV3.INCOME_ID IS NULL AND LV4.INCOME_ID IS NULL) AND lul.is_main = 'Y' AND DATE_FORMAT(LRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/13', '%Y/%m/%d') "; - + // 代偿反冲租金 //String sqls4="SELECT lri.RENT,LRP.ID AS F58 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 LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID)LV1 ON LV1.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID)LV2 ON LV2.INCOME_ID=LRP.ID LEFT JOIN (SELECT F58 FROM VOUCHER_V8 WHERE F59 = 1 AND MODULE_NAME LIKE '%代偿反冲-收到代偿的租金%' GROUP BY F58)V8 ON V8.F58=LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款') OR lrp.collect_msg IN ('WXPay', 'WXUnionPay')) AND lri.rent > 0 AND (LV1.INCOME_ID IS NOT NULL OR LV2.INCOME_ID IS NOT NULL) AND V8.F58 IS NULL AND lul.is_main = 'Y' "; // 代偿反冲逾期利息 //String slqs5="SELECT lri.PENALTY,LRP.ID AS F58 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 LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN GROUP BY INCOME_ID)LV1 ON LV1.INCOME_ID=LRP.ID LEFT JOIN (SELECT INCOME_ID FROM LV_RENT_PLAN2 GROUP BY INCOME_ID)LV2 ON LV2.INCOME_ID=LRP.ID LEFT JOIN (SELECT F58 FROM VOUCHER_V8 WHERE F59 = 1 AND MODULE_NAME LIKE '%代偿反冲-代偿逾期利息%' GROUP BY F58)V8 ON V8.F58=LRP.ID WHERE (lrp.collect_status IN ('手工收款', '批量收款') OR lrp.collect_msg IN ('WXPay', 'WXUnionPay')) AND lri.PENALTY > 0 AND (LV1.INCOME_ID IS NOT NULL OR LV2.INCOME_ID IS NOT NULL) AND V8.F58 IS NULL AND lul.is_main = 'Y' "; - + List> dataList1=DataOperatorUtil.getDataBySql(Sqlca, sqls1, null); List> dataList2=DataOperatorUtil.getDataBySql(Sqlca, sqls2, null); List> dataList3=DataOperatorUtil.getDataBySql(Sqlca, sqls3, null); //List> dataList4=DataOperatorUtil.getDataBySql(Sqlca, sqls4, null); //List> dataList5=DataOperatorUtil.getDataBySql(Sqlca, slqs5, null); - + /** * 将数据插入中间表的SQL */ @@ -84,23 +84,23 @@ public class InsertVoucherRentIncome { System.out.println("本次需生成卡扣逾期利息凭证数据："+c+"条 ！"); } Sqlca.commit(); - + /** - * 收取租金时, 如果已经经销商代偿, 生成反冲代偿凭证; 将租金id存入集合, 遍历结合, 通过id生成凭证 - */ + * 收取租金时, 如果已经经销商代偿, 生成反冲代偿凭证; 将租金id存入集合, 遍历结合, 通过id生成凭证 + */ /*CreateVoucherRedCompensatory cvrc = new CreateVoucherRedCompensatory(); List list = new ArrayList(); for (Map map1 : dataList4) { - if(!list.contains(map1.get("F58"))){ - list.add(map1.get("F58")); - } + if(!list.contains(map1.get("F58"))){ + list.add(map1.get("F58")); + } } for (Map map2 : dataList5) { - if(!list.contains(map2.get("F58"))){ - list.add(map2.get("F58")); - } + if(!list.contains(map2.get("F58"))){ + list.add(map2.get("F58")); + } } - + for (String F58 : list) { // 判断当期是否已生成经销商代偿凭证, 如已生成, 反冲 cvrc.CreateVoucher("PZ2019071500000030", "admin",F58);// 代偿反冲-收到的租金 @@ -109,12 +109,12 @@ public class InsertVoucherRentIncome { System.out.println("**********************代偿反冲凭证收成**************************"); System.out.println("***********************************************************"); }*/ - + if(Sqlca!=null){ Sqlca.disConnect(); } } - + /*** * 将数据插入v8表 * @param VOUCHERNO @@ -162,7 +162,7 @@ public class InsertVoucherRentIncome { String sqlWYh2="SELECT lvri.RENT,lvri.income_id AS F58 FROM lv_rent_income2 lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(微信银联)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status ='WXUnionPay' AND lvri.rent > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '02' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/13', '%Y/%m/%d') AND DATE_FORMAT(NOW(), '%Y-%m') <> DATE_FORMAT(lrp.plan_date, '%Y-%m') "; // 逾期利息(微信)-(汽车直租) String sqlWYh3="SELECT lvri.PENALTY,lvri.income_id AS F58 FROM lv_penalty_income lvri LEFT JOIN lc_rent_plan lrp ON lrp.contract_id = lvri.contract_id AND lrp.id = lvri.income_id LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(微信银联)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56) V8 ON V8.F58 = LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE lvri.collect_status ='WXUnionPay' AND lvri.PENALTY > 0 AND LVRI.BUSINESSTYPE = '1' AND LVRI.LEAS_FORM = '02' AND V8.F58 IS NULL AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/13', '%Y/%m/%d')"; - + /** * 汽车回租-卡扣 */ @@ -175,7 +175,7 @@ public class InsertVoucherRentIncome { List> dataListqz1= DataOperatorUtil.getDataBySql(Sqlca, sqlqz1, null); List> dataListqz2= DataOperatorUtil.getDataBySql(Sqlca, sqlqz2, null); List> dataListqz3= DataOperatorUtil.getDataBySql(Sqlca, sqlqz3, null); - + /** * 汽车回租-微信 */ @@ -188,7 +188,7 @@ public class InsertVoucherRentIncome { List> dataListWYh1= DataOperatorUtil.getDataBySql(Sqlca, sqlWYh1, null); List> dataListWYh2= DataOperatorUtil.getDataBySql(Sqlca, sqlWYh2, null); List> dataListWYh3= DataOperatorUtil.getDataBySql(Sqlca, sqlWYh3, null); - + /** * 汽车类-回租-卡扣 */ @@ -225,7 +225,7 @@ public class InsertVoucherRentIncome { String sql_whereWYh2 = "INSERT INTO voucher_v8 (id,evidence_message,periodyear,f15,F2,f3,f5,f6,f7,f8,f12,f1,f49,f50,f51,f52,F56,f59,f60,f61,f62,f65,f73,f74,f75,f76,v8_status,generate_date,v8_flag,module_name,entrydc,inputuserid,f58,f67,F47,F48) SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE='') THEN DATE_FORMAT(NOW(),'%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的租金-微信银联-',LVRI.PLAN_LIST) ELSE '收到的租金-微信银联' END AS f5,lv.LOAN_SUBJECT AS f6,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,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '1' THEN '' ELSE lci.contract_number END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' ELSE lvri.cust_id END AS f65,'' AS f73,'' AS f74,'' AS f75,'' AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER 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 OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME 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 ('PZ2019120500000154')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%-收到的租金(微信银联)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '02' AND V8.F58 IS NULL AND lvri.rent > 0 AND lvri.collect_status ='WXUnionPay' AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/13', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; //收到的逾期利息--卡扣-(汽车回租) String sql_whereWYh3 = "INSERT INTO voucher_v8 ( id, evidence_message, periodyear, f15, f2, f3, f5, f6, f7, f8, f12, f1, f49, f50, f51, f52,F56, f59, f60, f61, f62, f65, f73, f74, f75,f76, v8_status, generate_date, v8_flag, module_name, entrydc, inputuserid, f58, f67,F47,F48)SELECT REPLACE (UUID(), '-', '') id,'凭证输出' evidence_message,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) periodyear,lvri.HIRE_DATE AS f15,lv.SUBJECTS_CODE AS f2,lvri.voucher_f3 AS f3,CASE WHEN LVRI.PLAN_LIST IS NOT NULL THEN CONCAT('收到的逾期利息-微信银联-',LVRI.PLAN_LIST) ELSE '收到的逾期利息-微信银联' END AS f5,lv.LOAN_SUBJECT AS f6,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,'定时任务-每天生成租金实收凭证' AS f12,CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END AS f1,LCI.SUBJECTID AS f49,LCI.SUBJECTNAME AS f50,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,1,4) AS f51,SUBSTR(CASE WHEN (lvri.ACCOUNTING_DATE IS NULL OR lvri.ACCOUNTING_DATE = '') THEN DATE_FORMAT(NOW(), '%Y/%m/%d') ELSE DATE_FORMAT(lvri.ACCOUNTING_DATE,'%Y/%m/%d') END,6,2) AS f52,LVRI.LRI_ID AS F56,lv.sort_number AS f59,CASE WHEN lv.sort_number = '2' THEN lci.contract_number ELSE '' END AS f60,CASE WHEN lv.sort_number = '1' THEN '汽车C端待查客户' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_name END AS f61,lv.LOAN_SUBJECT AS f62,CASE WHEN lv.sort_number = '1' THEN 'APZL00000000DC' WHEN lv.sort_number = '3' THEN '' ELSE lvri.cust_id END AS f65,CASE WHEN lv.sort_number = '2' THEN '0603' ELSE '' END AS f73,'' AS f74,'' AS f75,CASE WHEN lv.sort_number = '3' THEN (SELECT TAX_CODES FROM tax_code WHERE TAX_NUMBER = ROUND((getTax (lci.LEAS_FORM,'逾期利息',LCCT.START_DATE) - 1) * 100,0)) ELSE '' END AS f76,'已完整' AS v8_status,DATE_FORMAT(NOW(), '%Y/%m/%d %H:%i:%s') AS generate_date,'0' AS v8_flag,lv.modular_number AS module_name,CASE WHEN lv.loan_direction = '1' THEN '1' ELSE '-1' END AS entrydc,'admin' AS inputuserid,lvri.income_id AS f58,lci.leas_form AS f67,LCI.CONTRACT_NUMBER,OI.OWN_NUMBER 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 OWN_NUMBER,MAX(OWN_NAME) AS OWN_NAME FROM OWN_INFO GROUP BY OWN_NUMBER) OI ON OI.OWN_NAME=LCI.SUBJECTNAME 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 ('PZ2019120500000155')) lv ON lv.proj_type = lci.leas_form LEFT JOIN (SELECT f58,F56 FROM voucher_v8 WHERE module_name LIKE '%收到的逾期利息(微信银联)%' AND f58 IS NOT NULL AND F56 IS NOT NULL GROUP BY F58,F56)V8 ON V8.F58=LVRI.INCOME_ID AND V8.F56=LVRI.LRI_ID WHERE LCI.BUSINESSTYPE = '1' AND LCI.LEAS_FORM = '02' AND V8.F58 IS NULL AND lvri.penalty > 0 AND lvri.collect_status ='WXUnionPay' AND DATE_FORMAT(LVRI.HIRE_DATE, '%Y/%m/%d') >= DATE_FORMAT('2020/02/13', '%Y/%m/%d') ORDER BY lvri.voucher_f3 "; - + /** * 根据查询语句判断, 有值才执行插入SQL */ @@ -244,7 +244,7 @@ public class InsertVoucherRentIncome { SqlObject sqlsqh3 = new SqlObject(sql_whereqh3); Sqlca.executeSQL(sqlsqh3); } - + /** * 汽车直租-卡扣 */ @@ -275,7 +275,7 @@ public class InsertVoucherRentIncome { SqlObject sqlsWh3 = new SqlObject(sql_whereWh3); Sqlca.executeSQL(sqlsWh3); } - + /** * 汽车回租-微信银联 */ @@ -291,13 +291,13 @@ public class InsertVoucherRentIncome { SqlObject sqlsWYh3 = new SqlObject(sql_whereWYh3); Sqlca.executeSQL(sqlsWYh3); } - + Sqlca.commit(); if(Sqlca!=null){ Sqlca.disConnect(); } System.out.println("***********************************************************"); - System.out.println("**********************租金回笼定时任务执行完成*********************"); - System.out.println("***********************************************************"); + System.out.println("**********************租金回笼定时任务执行完成*********************"); + System.out.println("***********************************************************"); } } diff --git a/src_sql/鎶曚骇SQL/V20200206/xiezw20200206.sql b/src_sql/鎶曚骇SQL/V20200206/xiezw20200206.sql index b7ab60d70..83905a4bd 100644 --- a/src_sql/鎶曚骇SQL/V20200206/xiezw20200206.sql +++ b/src_sql/鎶曚骇SQL/V20200206/xiezw20200206.sql @@ -1,8 +1,3 @@ -- 起租后合同变更汽车流程结束增加发起脚本(需手动配置) DELETE FROM CLASS_METHOD WHERE METHODCODE='com.tenwa.voucher.CreateVoucherProcess.CreateVoucherMethodSettle.ContractOnhireChange'; INSERT INTO `CLASS_METHOD` (`classname`, `methodname`, `methodtype`, `methoddescribe`, `returntype`, `methodargs`, `methodcode`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`) VALUES('审批流程','凭证输出--起租后合同变更汽车流程结束后生成凭证','Bizlet','用于起租后合同变更流程结束输出凭证','String','String ObjectNo','com.tenwa.voucher.CreateVoucherProcess.CreateVoucherMethodSettle.ContractOnhireChange','','','','','',''); - --- 多次扣款无法生成凭证优化 -ALTER TABLE LV_RENT_INCOME ADD LRI_ID VARCHAR(32) COMMENT '实收表ID'; -ALTER TABLE LV_RENT_INCOME2 ADD LRI_ID VARCHAR(32) COMMENT '实收表ID'; -ALTER TABLE lv_penalty_income ADD LRI_ID VARCHAR(32) COMMENT '实收表ID'; \ No newline at end of file