From 4a3e4738de47766ce3717a4d3a01b650570bb9ee Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Wed, 19 May 2021 14:34:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=91=E7=9C=A0=E5=87=AD=E8=AF=81=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateVoucherProcess/CreateVoucherRentDormant.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentDormant.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentDormant.java index d32bd6d4f..06c2c7cb5 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentDormant.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentDormant.java @@ -41,10 +41,10 @@ public class CreateVoucherRentDormant { // 休眠-调整未实现利息收入(减少) if("PZ2021051400000007".equals(VOUCHERNO)){ - sql = "SELECT IFNULL(LRPT.INTEREST, 0) AS MONEY, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE, LCI.ID AS CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM (SELECT FLOWUNID, SUM(IFNULL(LCRPT.INTEREST, 0))-SUM(IFNULL(LRP.INTEREST, 0)) AS INTEREST, MAX(PAYMENT_NUMBER) AS PAYMENT_NUMBER FROM LC_RENT_PLAN_TEMP LCRPT LEFT JOIN LC_RENT_PLAN LRP ON LRP.PAYMENT_NUMBER=LCRPT.PAYMENT_NUMBER WHERE FLOWUNID = :FLOWUNID GROUP BY FLOWUNID) LRPT LEFT JOIN (SELECT PAYMENT_NUMBER, SUM(IFNULL(INTEREST, 0)) AS INTEREST FROM LC_RENT_PLAN WHERE GROUP BY PAYMENT_NUMBER) LRPH ON LRPH.FLOWUNID = LRPT.FLOWUNID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.PAYMENT_NUMBER = LRPT.PAYMENT_NUMBER LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_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 LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND NVL(LRPT.INTEREST,0) < 0"; + sql = "SELECT IFNULL(LRPT.INTEREST, 0) AS MONEY, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE, LCI.ID AS CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM (SELECT LCRPT.FLOWUNID, SUM(IFNULL(LCRPT.INTEREST, 0)) - SUM(IFNULL(LRP.INTEREST, 0)) AS INTEREST, MAX(LCRPT.PAYMENT_NUMBER) AS PAYMENT_NUMBER FROM LC_RENT_PLAN_TEMP LCRPT LEFT JOIN LC_RENT_PLAN LRP ON LRP.PAYMENT_NUMBER = LCRPT.PAYMENT_NUMBER WHERE LCRPT.FLOWUNID = :FLOWUNID GROUP BY FLOWUNID) LRPT LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.PAYMENT_NUMBER = LRPT.PAYMENT_NUMBER LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_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 LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND NVL (LRPT.INTEREST, 0) < 0"; // 休眠-调整未实现利息收入(增加) }else if("PZ2021051400000008".equals(VOUCHERNO)){ - sql = "SELECT IFNULL(LRPT.INTEREST, 0) AS MONEY, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE, LCI.ID AS CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM (SELECT FLOWUNID, SUM(IFNULL(LCRPT.INTEREST, 0))-SUM(IFNULL(LRP.INTEREST, 0)) AS INTEREST, MAX(PAYMENT_NUMBER) AS PAYMENT_NUMBER FROM LC_RENT_PLAN_TEMP LCRPT LEFT JOIN LC_RENT_PLAN LRP ON LRP.PAYMENT_NUMBER=LCRPT.PAYMENT_NUMBER WHERE FLOWUNID = :FLOWUNID GROUP BY FLOWUNID) LRPT LEFT JOIN (SELECT PAYMENT_NUMBER, SUM(IFNULL(INTEREST, 0)) AS INTEREST FROM LC_RENT_PLAN WHERE GROUP BY PAYMENT_NUMBER) LRPH ON LRPH.FLOWUNID = LRPT.FLOWUNID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.PAYMENT_NUMBER = LRPT.PAYMENT_NUMBER LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_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 LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND NVL(LRPT.INTEREST,0) > 0"; + sql = "SELECT IFNULL(LRPT.INTEREST, 0) AS MONEY, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE, LCI.ID AS CONTRACT_ID, LCI.CONTRACT_NUMBER, LCI.PROJECT_NAME, LCI.LEAS_FORM, DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID, DI.DISTRIBUTOR_NAME, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM (SELECT LCRPT.FLOWUNID, SUM(IFNULL(LCRPT.INTEREST, 0)) - SUM(IFNULL(LRP.INTEREST, 0)) AS INTEREST, MAX(LCRPT.PAYMENT_NUMBER) AS PAYMENT_NUMBER FROM LC_RENT_PLAN_TEMP LCRPT LEFT JOIN LC_RENT_PLAN LRP ON LRP.PAYMENT_NUMBER = LCRPT.PAYMENT_NUMBER WHERE LCRPT.FLOWUNID = :FLOWUNID GROUP BY FLOWUNID) LRPT LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.PAYMENT_NUMBER = LRPT.PAYMENT_NUMBER LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_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 LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND NVL (LRPT.INTEREST, 0) > 0"; } List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl();