From 1eacf78d5e74bab7d9bef6b68c6a098116ee49f6 Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Wed, 17 Oct 2018 14:12:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=87=AD=E8=AF=81=E7=9B=B8=E5=85=B3--?= =?UTF-8?q?=E5=AE=9E=E9=99=85=E4=BB=98=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateVoucherActualPaymentCarTradition.java | 4 ++-- .../CreateVoucherActualPaymentTradition.java | 2 +- .../CreateVoucherProcess/CreateVoucherOnhireTradition.java | 4 ++-- src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java | 1 - 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentCarTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentCarTradition.java index 78eb524c0..7c07fd123 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentCarTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentCarTradition.java @@ -52,12 +52,12 @@ public class CreateVoucherActualPaymentCarTradition extends BaseBussiness{ String ACC_NUMBER=null; // 银行账号 String sql=""; - sql="SELECT IFNULL(LFIT1.EQUIP,0) AS EQUIP,IFNULL(ROUND(LFIT1.EQUIP / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS EQUIPNOTAX,IFNULL((LFIT1.EQUIP - ROUND(LFIT1.EQUIP / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)),0) AS EQUIPTAX,IFNULL((LFIT4.INSURANCE_PREMIUM + LFIT2.OTHER_MONEY),0) AS INSURANCE_PREMIUM_OTHER,IFNULL(ROUND((LFIT4.INSURANCE_PREMIUM + LFIT2.OTHER_MONEY) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS INSURANCE_PREMIUM_OTHER_NOTAX,IFNULL(((LFIT4.INSURANCE_PREMIUM + LFIT2.OTHER_MONEY) - ROUND((LFIT4.INSURANCE_PREMIUM + LFIT2.OTHER_MONEY) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)),0) AS INSURANCE_PREMIUM_OTHER_TAX,IFNULL((LFIT1.EQUIP + LFIT4.INSURANCE_PREMIUM + LFIT2.OTHER_MONEY),0) AS EQUIP_INSURACE_PREMIUM_OTHER,IFNULL(LFIT3.FIRST_PAYMENT,0) AS FIRST_PAYMENT,IFNULL(ROUND(LFIT3.FIRST_PAYMENT / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS FIRST_PAYMENT_NOTAX,IFNULL((LFIT3.FIRST_PAYMENT - ROUND(LFIT3.FIRST_PAYMENT / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)),0) AS FIRST_PAYMENT_TAX,IFNULL((LFIT1.EQUIP + LFIT4.INSURANCE_PREMIUM + LFIT2.OTHER_MONEY - LFIT3.FIRST_PAYMENT),0) AS EQUIP_PREMIUM_OTHER_SUBFIRST,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LFIT1.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,LFIT1.ACC_NUMBER FROM LC_CALC_CONDITION LCCT LEFT JOIN LB_CONTRACT_INFO LCI ON LCCT.CONTRACT_ID = LCI.`ID` LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,MAX(ACC_NUMBER) AS ACC_NUMBER,SUM(FACT_MONEY) AS EQUIP FROM LC_FUND_INCOME WHERE FEE_TYPE='feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT1 ON LFIT1.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,FACT_MONEY AS OTHER_MONEY FROM LC_FUND_INCOME WHERE FEE_TYPE = 'feetype29') LFIT2 ON LFIT2.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,FACT_MONEY AS FIRST_PAYMENT,SETTLE_METHOD FROM LC_FUND_INCOME WHERE FEE_TYPE = 'feetype5') LFIT3 ON LFIT3.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,FACT_MONEY AS INSURANCE_PREMIUM,SETTLE_METHOD FROM LC_FUND_INCOME WHERE FEE_TYPE = 'feetype21') LFIT4 ON LFIT4.CONTRACT_ID = LCI.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 = '3' AND LCCT.FLOWUNID = :FLOWUNID "; + sql="SELECT IFNULL(LFIT1.EQUIP, 0) AS EQUIP,IFNULL(ROUND(LFIT1.EQUIP / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS EQUIPNOTAX,IFNULL((LFIT1.EQUIP - ROUND(LFIT1.EQUIP / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)),0) AS EQUIPTAX,IFNULL((LFIT4.INSURANCE_PREMIUM + LFIT2.OTHER_MONEY),0) AS INSURANCE_PREMIUM_OTHER,IFNULL(ROUND((LFIT4.INSURANCE_PREMIUM + LFIT2.OTHER_MONEY) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS INSURANCE_PREMIUM_OTHER_NOTAX,IFNULL(((LFIT4.INSURANCE_PREMIUM + LFIT2.OTHER_MONEY) - ROUND((LFIT4.INSURANCE_PREMIUM + LFIT2.OTHER_MONEY) / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)),0) AS INSURANCE_PREMIUM_OTHER_TAX,IFNULL((LFIT1.EQUIP + LFIT4.INSURANCE_PREMIUM + LFIT2.OTHER_MONEY),0) AS EQUIP_INSURACE_PREMIUM_OTHER,IFNULL(LFIT3.FIRST_PAYMENT, 0) AS FIRST_PAYMENT,IFNULL(ROUND(LFIT3.FIRST_PAYMENT / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS FIRST_PAYMENT_NOTAX,IFNULL((LFIT3.FIRST_PAYMENT - ROUND(LFIT3.FIRST_PAYMENT / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)),0) AS FIRST_PAYMENT_TAX,IFNULL((LFIT1.EQUIP + LFIT4.INSURANCE_PREMIUM + LFIT2.OTHER_MONEY - LFIT3.FIRST_PAYMENT),0) AS EQUIP_PREMIUM_OTHER_SUBFIRST,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LFIT1.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,LFIT1.ACC_NUMBER FROM LC_CALC_CONDITION_TEMP LCCT LEFT JOIN (SELECT FLOWUNID,MAX(CONTRACT_ID) AS CONTRACT_ID,MAX(ACC_NUMBER) AS ACC_NUMBER,SUM(FACT_MONEY) AS EQUIP FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY FLOWUNID) LFIT1 ON LFIT1.FLOWUNID = LCCT.FLOWUNID LEFT JOIN (SELECT FLOWUNID,FACT_MONEY AS OTHER_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype29') LFIT2 ON LFIT2.FLOWUNID = LFIT1.FLOWUNID LEFT JOIN (SELECT FLOWUNID,FACT_MONEY AS FIRST_PAYMENT,SETTLE_METHOD FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype5') LFIT3 ON LFIT3.FLOWUNID = LFIT1.FLOWUNID LEFT JOIN (SELECT FLOWUNID,FACT_MONEY AS INSURANCE_PREMIUM,SETTLE_METHOD FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype21') LFIT4 ON LFIT4.FLOWUNID = LFIT1.FLOWUNID LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT1.CONTRACT_ID = LCI.`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 = '3' AND LCCT.FLOWUNID = :FLOWUNID "; // 非差额放款部分 if("PZ2018092500000198".equals(VOUCHERNO) || "PZ2018092600000236".equals(VOUCHERNO)){ sql+=" AND (LFIT3.SETTLE_METHOD !='settlemethod11' OR LFIT3.SETTLE_METHOD IS NULL) "; - }else{// 差额部分 + }else if("PZ2018092500000200".equals(VOUCHERNO) || "PZ2018092600000237".equals(VOUCHERNO) || "PZ2018092500000201".equals(VOUCHERNO) || "PZ2018092600000238".equals(VOUCHERNO) || "PZ2018092500000199".equals(VOUCHERNO) || "PZ2018092600000239".equals(VOUCHERNO)){// 差额部分 sql+=" AND LFIT3.SETTLE_METHOD = 'settlemethod11' "; } param.clear(); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java index 528d68e26..4a963a2c0 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherActualPaymentTradition.java @@ -54,7 +54,7 @@ public class CreateVoucherActualPaymentTradition extends BaseBussiness{ String ACC_NUMBER=null; // 银行账号 String sql=""; - sql="SELECT IFNULL(LFIT1.EQUIP,0) AS EQUIP,IFNULL(ROUND(LFIT1.EQUIP / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS EQUIPNOTAX,IFNULL((LFIT1.EQUIP - ROUND(LFIT1.EQUIP / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)),0) AS EQUIPTAX,IFNULL(LFIT2.OTHER_MONEY,0) AS OTHER_MONEY,IFNULL(ROUND(LFIT2.OTHER_MONEY / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS OTHERNOTAX,IFNULL((LFIT2.OTHER_MONEY - ROUND(LFIT2.OTHER_MONEY / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)),0) AS OTHERTAX,IFNULL((LFIT1.EQUIP + LFIT2.OTHER_MONEY),0) AS EQUIP_OTHER,IFNULL(LFIT3.FIRST_PAYMENT,0) AS FIRST_PAYMENT,IFNULL(LFIT4.GUARANTY,0) AS GUARANTY,IFNULL(LFIT5.HANDLING_CHARGE_MONEY,0) AS HANDLING_CHARGE_MONEY,IFNULL(ROUND(LFIT5.HANDLING_CHARGE_MONEY / getTax(LCI.LEAS_FORM,'手续费',LCCT.START_DATE),2),0) AS HANDLING_CHARGE_MONEY_NOTAX,IFNULL((LFIT5.HANDLING_CHARGE_MONEY - ROUND(LFIT5.HANDLING_CHARGE_MONEY / getTax(LCI.LEAS_FORM,'手续费',LCCT.START_DATE),2)),0) AS HANDLING_CHARGE_MONEY_TAX,IFNULL((LFIT1.EQUIP + LFIT2.OTHER_MONEY - LFIT3.FIRST_PAYMENT - LFIT4.GUARANTY - LFIT5.HANDLING_CHARGE_MONEY),0) AS OTHERS_MATH,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LFIT1.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,LFIT1.ACC_NUMBER FROM LC_CALC_CONDITION LCCT LEFT JOIN LB_CONTRACT_INFO LCI ON LCCT.CONTRACT_ID = LCI.`ID` LEFT JOIN (SELECT FLOWUNID,CONTRACT_ID,MAX(ACC_NUMBER) AS ACC_NUMBER,SUM(FACT_MONEY) AS EQUIP FROM LC_FUND_INCOME WHERE FEE_TYPE = 'feetype10' GROUP BY CONTRACT_ID,FLOWUNID) LFIT1 ON LFIT1.CONTRACT_ID = LCI.ID AND LFIT1.FLOWUNID=LCCT.FLOWUNID LEFT JOIN (SELECT CONTRACT_ID,FACT_MONEY AS OTHER_MONEY FROM LC_FUND_INCOME WHERE FEE_TYPE = 'feetype29') LFIT2 ON LFIT2.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,FACT_MONEY AS FIRST_PAYMENT,SETTLE_METHOD FROM LC_FUND_INCOME WHERE FEE_TYPE = 'feetype5') LFIT3 ON LFIT3.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,FACT_MONEY AS GUARANTY,SETTLE_METHOD FROM LC_FUND_INCOME WHERE FEE_TYPE = 'feetype2') LFIT4 ON LFIT4.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,FACT_MONEY AS HANDLING_CHARGE_MONEY,SETTLE_METHOD FROM LC_FUND_INCOME WHERE FEE_TYPE = 'feetype1') LFIT5 ON LFIT5.CONTRACT_ID = LCI.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 = '2' AND LCCT.FLOWUNID = :FLOWUNID "; + sql="SELECT IFNULL(LFIT1.EQUIP,0) AS EQUIP,IFNULL(ROUND(LFIT1.EQUIP / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS EQUIPNOTAX,IFNULL(LFIT1.EQUIP - ROUND(LFIT1.EQUIP / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS EQUIPTAX,IFNULL(LFIT2.OTHER_MONEY,0) AS OTHER_MONEY,IFNULL(ROUND(LFIT2.OTHER_MONEY / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS OTHERNOTAX,IFNULL(LFIT2.OTHER_MONEY - ROUND(LFIT2.OTHER_MONEY / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS OTHERTAX,IFNULL((LFIT1.EQUIP + LFIT2.OTHER_MONEY),0) AS EQUIP_OTHER,IFNULL(LFIT3.FIRST_PAYMENT,0) AS FIRST_PAYMENT,IFNULL(LFIT4.GUARANTY,0) AS GUARANTY,IFNULL(LFIT5.HANDLING_CHARGE_MONEY,0) AS HANDLING_CHARGE_MONEY,IFNULL(ROUND(LFIT5.HANDLING_CHARGE_MONEY / getTax (LCI.LEAS_FORM,'手续费',LCCT.START_DATE),2),0) AS HANDLING_CHARGE_MONEY_NOTAX,IFNULL((LFIT5.HANDLING_CHARGE_MONEY - ROUND(LFIT5.HANDLING_CHARGE_MONEY / getTax (LCI.LEAS_FORM,'手续费',LCCT.START_DATE),2)),0) AS HANDLING_CHARGE_MONEY_TAX,IFNULL((LFIT1.EQUIP + LFIT2.OTHER_MONEY - LFIT3.FIRST_PAYMENT - LFIT4.GUARANTY - LFIT5.HANDLING_CHARGE_MONEY),0) AS OTHERS_MATH,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LFIT1.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,LFIT1.ACC_NUMBER FROM LC_CALC_CONDITION_TEMP LCCT LEFT JOIN (SELECT FLOWUNID,MAX(CONTRACT_ID) AS CONTRACT_ID,MAX(ACC_NUMBER) AS ACC_NUMBER,SUM(FACT_MONEY) AS EQUIP FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype10' GROUP BY FLOWUNID) LFIT1 ON LFIT1.FLOWUNID=LCCT.FLOWUNID LEFT JOIN (SELECT FLOWUNID,FACT_MONEY AS OTHER_MONEY FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype29') LFIT2 ON LFIT2.FLOWUNID = LFIT1.FLOWUNID LEFT JOIN (SELECT FLOWUNID,FACT_MONEY AS FIRST_PAYMENT,SETTLE_METHOD FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype5') LFIT3 ON LFIT3.FLOWUNID = LFIT1.FLOWUNID LEFT JOIN (SELECT FLOWUNID,FACT_MONEY AS GUARANTY,SETTLE_METHOD FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype2') LFIT4 ON LFIT4.FLOWUNID = LFIT1.FLOWUNID LEFT JOIN (SELECT FLOWUNID,FACT_MONEY AS HANDLING_CHARGE_MONEY,SETTLE_METHOD FROM LC_FUND_INCOME_TEMP WHERE FEE_TYPE = 'feetype1') LFIT5 ON LFIT5.FLOWUNID = LFIT1.FLOWUNID LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT1.CONTRACT_ID = LCI.`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 = '2' AND LCCT.FLOWUNID = :FLOWUNID "; // 非差额放款部分 if("PZ2018092500000161".equals(VOUCHERNO) || "PZ2018092600000225".equals(VOUCHERNO)){ diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherOnhireTradition.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherOnhireTradition.java index 43822f25e..08832f040 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherOnhireTradition.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherOnhireTradition.java @@ -48,9 +48,9 @@ public class CreateVoucherOnhireTradition extends BaseBussiness{ String sql=""; if("PZ2018092500000170".equals(VOUCHERNO) || "PZ2018092800000247".equals(VOUCHERNO)) { - sql="SELECT (LCCT.EQUIP_AMT - LCCT.FIRST_PAYMENT + LCCT.INSURANCE_PREMIUM + LCCT.OTHER_MONEY) AS OTHERSMONEY,(LCCT.EQUIP_AMT - LCCT.FIRST_PAYMENT) AS EQUIP_SUBFIRST,(LCCT.INSURANCE_PREMIUM + LCCT.OTHER_MONEY) AS INSURANCE_OTHER,LRPT.INTEREST,ROUND(LRPT.INTEREST / getTax (LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2) AS INTERESTNOTAX,(LRPT.INTEREST - ROUND(LRPT.INTEREST / getTax (LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2)) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.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,LFIT.ACC_NUMBER FROM LC_CALC_CONDITION_TEMP LCCT LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,MIN(ACC_NUMBER) AS ACC_NUMBER FROM LC_FUND_INCOME_TEMP GROUP BY CONTRACT_ID) LFIT ON LFIT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,SUM(INTEREST) AS INTEREST FROM LC_RENT_PLAN GROUP BY CONTRACT_ID) LRPT ON LRPT.CONTRACT_ID = LCI.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 = '2' AND LCCT.FLOWUNID = :FLOWUNID "; + sql="SELECT IFNULL((LCCT.EQUIP_AMT - LCCT.FIRST_PAYMENT + LCCT.INSURANCE_PREMIUM + LCCT.OTHER_MONEY),0) AS OTHERSMONEY,IFNULL((LCCT.EQUIP_AMT - LCCT.FIRST_PAYMENT),0) AS EQUIP_SUBFIRST,IFNULL((LCCT.INSURANCE_PREMIUM + LCCT.OTHER_MONEY),0) AS INSURANCE_OTHER,IFNULL(LRPT.INTEREST,0) AS INTEREST,IFNULL(ROUND(LRPT.INTEREST / getTax(LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2),0) AS INTERESTNOTAX,IFNULL((LRPT.INTEREST - ROUND(LRPT.INTEREST / getTax(LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2)),0) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.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 LC_CALC_CONDITION_TEMP LCCT LEFT JOIN (SELECT FLOWUNID,MAX(CONTRACT_ID) AS CONTRACT_ID,SUM(INTEREST) AS INTEREST FROM LC_RENT_PLAN_TEMP GROUP BY FLOWUNID) LRPT ON LRPT.FLOWUNID = LCCT.FLOWUNID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRPT.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 = '2' AND LCCT.FLOWUNID = :FLOWUNID "; }else { - sql="SELECT (LCCT.EQUIP_AMT - LCCT.FIRST_PAYMENT + LCCT.INSURANCE_PREMIUM + LCCT.OTHER_MONEY) AS OTHERSMONEY,(LCCT.EQUIP_AMT - LCCT.FIRST_PAYMENT) AS EQUIP_SUBFIRST,(LCCT.INSURANCE_PREMIUM + LCCT.OTHER_MONEY) AS INSURANCE_OTHER,LRPT.INTEREST,ROUND(LRPT.INTEREST / getTax (LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2) AS INTERESTNOTAX,(LRPT.INTEREST - ROUND(LRPT.INTEREST / getTax (LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2)) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.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,LFIT.ACC_NUMBER FROM LC_CALC_CONDITION_TEMP LCCT LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN (SELECT CONTRACT_ID,MIN(ACC_NUMBER) AS ACC_NUMBER FROM LC_FUND_INCOME_TEMP GROUP BY CONTRACT_ID) LFIT ON LFIT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT CONTRACT_ID,SUM(INTEREST) AS INTEREST FROM LC_RENT_PLAN GROUP BY CONTRACT_ID) LRPT ON LRPT.CONTRACT_ID = LCI.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 = '3' AND LCCT.FLOWUNID = :FLOWUNID "; + sql="SELECT IFNULL((LCCT.EQUIP_AMT - LCCT.FIRST_PAYMENT + LCCT.INSURANCE_PREMIUM + LCCT.OTHER_MONEY),0) AS OTHERSMONEY,IFNULL((LCCT.EQUIP_AMT - LCCT.FIRST_PAYMENT),0) AS EQUIP_SUBFIRST,IFNULL((LCCT.INSURANCE_PREMIUM + LCCT.OTHER_MONEY),0) AS INSURANCE_OTHER,IFNULL(LRPT.INTEREST,0) AS INTEREST,IFNULL(ROUND(LRPT.INTEREST / getTax(LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2),0) AS INTERESTNOTAX,IFNULL((LRPT.INTEREST - ROUND(LRPT.INTEREST / getTax(LCI.LEAS_FORM,'租息',LCI.INPUTTIME),2)),0) AS TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.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 LC_CALC_CONDITION_TEMP LCCT LEFT JOIN (SELECT FLOWUNID,MAX(CONTRACT_ID) AS CONTRACT_ID,SUM(INTEREST) AS INTEREST FROM LC_RENT_PLAN_TEMP GROUP BY FLOWUNID) LRPT ON LRPT.FLOWUNID = LCCT.FLOWUNID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRPT.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 = '3' AND LCCT.FLOWUNID = :FLOWUNID "; } param.clear(); diff --git a/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java b/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java index 1ab09a24d..655afba00 100644 --- a/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java +++ b/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java @@ -118,7 +118,6 @@ public class VoucherToV8Impl implements VoucherService { message = message + "财务记账日期获取失败!"; status = "未完整";//凭证状态 }else{ - d.put("periodyear", list.get(i).get("F1").substring(0,4));//会计期间 d.put("F51", list.get(i).get("F1").substring(0,4));//会计期间-年 d.put("F52", list.get(i).get("F1").substring(5,7));//会计期间-月 From beeee78bf6b286fa63debf4cedc87f36afe9a027 Mon Sep 17 00:00:00 2001 From: liuzhao Date: Wed, 17 Oct 2018 14:43:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=BE=E6=AC=BE=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=94=B3=E8=AF=B7=E8=BF=9B=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MortgageFile/LbFileArchivingInfoTemp.jsp | 2 +- .../commbusiness/LBContractLoanApply.java | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingInfoTemp.jsp b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingInfoTemp.jsp index 6b8765166..51af25012 100644 --- a/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingInfoTemp.jsp +++ b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchivingInfoTemp.jsp @@ -18,7 +18,7 @@ doTemp.setColTips("", ""); ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "2";//freeform - //dwTemp.ReadOnly = "-2";//只读模式 + dwTemp.ReadOnly = "0";//只读模式 dwTemp.genHTMLObjectWindow(flowunid); String sButtons[][] = { diff --git a/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/LBContractLoanApply.java b/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/LBContractLoanApply.java index fcce288d5..04e6d5f94 100644 --- a/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/LBContractLoanApply.java +++ b/src_tenwa/com/tenwa/lease/flow/contract/commbusiness/LBContractLoanApply.java @@ -1,8 +1,5 @@ package com.tenwa.lease.flow.contract.commbusiness; -import java.util.List; - -import jbo.app.tenwa.calc.LC_FUND_INCOME_TEMP; import jbo.com.tenwa.lease.carbrand.BUSINESS_STATUS; import com.amarsoft.are.jbo.BizObject; @@ -22,13 +19,14 @@ public class LBContractLoanApply extends BaseBussiness { this.initBussinessParam(Sqlca); ASUser asUser = new ASUser(this.getAttribute("CurUserID").toString()); String FlowUnid = this.getAttribute("ObjectNo").toString(); - this.saveBusinessStatus(Sqlca, asUser, FlowUnid); + String businessStatus = this.getAttribute("businessStatus").toString(); + this.saveBusinessStatus(Sqlca, asUser, FlowUnid,businessStatus); String sMessage = "true"; return sMessage; } private void saveBusinessStatus(Transaction Sqlca, ASUser asUser, - String FlowUnid) throws Exception { + String FlowUnid,String Status) throws Exception { JBOTransaction tx = null; tx = JBOFactory.createJBOTransaction(); String contractId=""; @@ -49,21 +47,21 @@ public class LBContractLoanApply extends BaseBussiness { while (rs.next()) { contractId = rs.getStringValue("contract_id"); contractNumber = rs.getStringValue("contract_number"); - if(contractId ==null || "".equals(contractId)){ + /*if(contractId ==null || "".equals(contractId)){*/ bsbo.setAttributeValue(BUSINESS_STATUS.contract_number,contractNumber); - bsbo.setAttributeValue(BUSINESS_STATUS.business_status, "26"); + bsbo.setAttributeValue(BUSINESS_STATUS.business_status, Status); bsbo.setAttributeValue(BUSINESS_STATUS.inputuserid,asUser.getUserID()); bsbo.setAttributeValue(BUSINESS_STATUS.inputtime,StringFunction.getTodayNow()); bsbo.setAttributeValue(BUSINESS_STATUS.inputorgid,asUser.getOrgID()); bsbom.saveObject(bsbo); - } else { + /*} else { BizObject businessStatus = JBOFactory.createBizObjectQuery(BUSINESS_STATUS.CLASS_NAME, "contract_number=:contract_number and business_status='25'").setParameter("contract_number", contractNumber).getSingleResult(false); if(businessStatus==null){ bsbo.setAttributeValue(BUSINESS_STATUS.contract_number,contractNumber); - bsbo.setAttributeValue(BUSINESS_STATUS.business_status, "25"); + bsbo.setAttributeValue(BUSINESS_STATUS.business_status, Status); bsbo.setAttributeValue(BUSINESS_STATUS.inputuserid,asUser.getUserID()); bsbo.setAttributeValue(BUSINESS_STATUS.inputtime,StringFunction.getTodayNow()); bsbo.setAttributeValue(BUSINESS_STATUS.inputorgid,asUser.getOrgID()); @@ -71,7 +69,7 @@ public class LBContractLoanApply extends BaseBussiness { }else{ bsbom.createQuery("update o set inputuserid='"+asUser.getUserID()+"',inputtime='"+StringFunction.getTodayNow()+"',inputorgid='"+asUser.getOrgID()+"' where contract_number='"+contractNumber+"' and business_status='25'").executeUpdate(); } - } + }*/ } tx.commit();