From 6900337194606b5634756176d4d70e38ef557699 Mon Sep 17 00:00:00 2001 From: amarsoft Date: Sun, 29 Jul 2018 16:48:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=AD=E8=AF=81=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateVoucherContractOnhireChange.java | 2 +- .../CreateVoucherContractTerminate.java | 7 +++++-- .../CommLoanFactMoneyToMoney.java | 2 ++ .../CreateVoucherLoan/ContractInterest.java | 1 + .../ContractInterestTax.java | 1 + .../CreateVoucherLoan/OtherFee.java | 1 + .../CreateVoucherMonthSettlement.java | 2 +- ...anList.java => auxiliaryBusinessType.java} | 2 +- .../auxiliaryInfo/auxiliaryContractCar.java | 7 +++---- .../auxiliaryInfo/auxiliaryFundType.java | 20 +++++++++++++++++++ .../auxiliaryLeasIncomeForm.java | 20 +++++++++++++++++++ .../voucher/serviceImp/VoucherToV8Impl.java | 3 +++ 12 files changed, 59 insertions(+), 9 deletions(-) rename src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/{auxiliaryContractPlanList.java => auxiliaryBusinessType.java} (85%) create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryFundType.java create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryLeasIncomeForm.java diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractOnhireChange.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractOnhireChange.java index 1c9bf9c2b..72f1f8243 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractOnhireChange.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractOnhireChange.java @@ -101,7 +101,7 @@ public class CreateVoucherContractOnhireChange { param.put("LEASINCOMEFORM", "01"); // B端 } } - //param.put("FUNDTYPE", ""); // 主营类型 + param.put("FUNDTYPE", "01"); // 主营类型 param.put("BUSINESSTYPE", "06"); param.put("FlowUnid", FlowUnid); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java index 5fc1d8bf5..d5c0f0ffa 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java @@ -38,16 +38,19 @@ public class CreateVoucherContractTerminate { String sql=""; param.clear(); map.put("FlowUnid", FlowUnid); + //回款--收到违约金 if("PZ2018072100000026".equals(VOUCHERNO)){ sql= "SELECT IFNULL(HANDLING_CHARGE,0) AS MONEY ,ROUND(IFNULL(HANDLING_CHARGE,0)/1.06,2) AS MONEYNOTAX,(IFNULL(HANDLING_CHARGE,0)-ROUND(IFNULL(HANDLING_CHARGE,0)/1.06,2)) AS MONEYTAX,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LCI.ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_FUND_RENT_ADJUST_TEMP LFRA INNER JOIN LC_CALC_CONDITION LCC ON LCC.PAYMENT_NUMBER=LFRA.PAYMENT_NUMBER INNER JOIN LB_CONTRACT_INFO LCI ON LCC.CONTRACT_ID=LCI.ID INNER 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 LFRA.FLOWUNID=:FLOWUNID"; } + //收到的提前还款 if("PZ2018072100000027".equals(VOUCHERNO)){ sql= "SELECT IFNULL(CORPUS_OVERAGE,0) AS MONEY ,0 AS MONEYNOTAX,0 AS MONEYTAX,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LCI.ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_FUND_RENT_ADJUST_TEMP LFRA INNER JOIN LC_CALC_CONDITION LCC ON LCC.PAYMENT_NUMBER=LFRA.PAYMENT_NUMBER INNER JOIN LB_CONTRACT_INFO LCI ON LCC.CONTRACT_ID=LCI.ID INNER 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 LFRA.FLOWUNID=:FLOWUNID"; } - + //提前还款-调整未实现利息收入 if("PZ2018072100000045".equals(VOUCHERNO)){ sql="SELECT ROUND(IFNULL(AGREED_INTEREST,0)/1.06,2) AS MONEY ,0 AS MONEYNOTAX,0 AS MONEYTAX,DATE_FORMAT(SYSDATE(),'%Y/%M/%D') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%M/%D') AS FACT_DATE,LCI.ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_FUND_RENT_ADJUST_TEMP LFRA INNER JOIN LC_CALC_CONDITION LCC ON LCC.PAYMENT_NUMBER=LFRA.PAYMENT_NUMBER INNER JOIN LB_CONTRACT_INFO LCI ON LCC.CONTRACT_ID=LCI.ID INNER 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 LFRA.FLOWUNID=:FLOWUNID"; } + //提前还款-调整未实现利息收入税金 if("PZ2018072100000046".equals(VOUCHERNO)){ sql="SELECT IFNULL(AGREED_INTEREST,0)-ROUND(IFNULL(AGREED_INTEREST,0)/1.06,2) AS MONEY ,0 AS MONEYNOTAX,0 AS MONEYTAX,DATE_FORMAT(SYSDATE(),'%Y/%M/%D') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%M/%D') AS FACT_DATE,LCI.ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_FUND_RENT_ADJUST_TEMP LFRA INNER JOIN LC_CALC_CONDITION LCC ON LCC.PAYMENT_NUMBER=LFRA.PAYMENT_NUMBER INNER JOIN LB_CONTRACT_INFO LCI ON LCC.CONTRACT_ID=LCI.ID INNER 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 LFRA.FLOWUNID=:FLOWUNID"; } @@ -103,7 +106,7 @@ public class CreateVoucherContractTerminate { param.put("LEASINCOMEFORM", "01"); // B端 } } - //param.put("FUNDTYPE", ""); // 主营类型 + param.put("FUNDTYPE", ""); // 主营类型 param.put("BUSINESSTYPE", "06"); param.put("FlowUnid", FlowUnid); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFactMoneyToMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFactMoneyToMoney.java index 30a4a50d9..ce32f7307 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFactMoneyToMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFactMoneyToMoney.java @@ -14,6 +14,8 @@ public class CommLoanFactMoneyToMoney implements VoucherJavaParamService{ Map param) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); + + returnValue.put("FUNDTYPE","01"); returnValue.put("MONEY",param.get("FACT_MONEY")); return returnValue; } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterest.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterest.java index fcc1ddcd5..1c09f35bc 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterest.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterest.java @@ -15,6 +15,7 @@ public class ContractInterest implements VoucherJavaParamService{ Map param) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); + returnValue.put("FUNDTYPE","02"); returnValue.put("MONEY",param.get("INTEREST")); return returnValue; } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterestTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterestTax.java index 7c10f305e..edec4c1ab 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterestTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterestTax.java @@ -14,6 +14,7 @@ public class ContractInterestTax implements VoucherJavaParamService{ Map param) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); + returnValue.put("FUNDTYPE","02"); returnValue.put("MONEY",param.get("TAX")); return returnValue; } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFee.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFee.java index 9d15f2cd6..ec856933f 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFee.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFee.java @@ -25,6 +25,7 @@ public class OtherFee implements VoucherJavaParamService{ .add(new BigDecimal(GPS_FEE_FINANCE)); returnValue.putAll(param); + returnValue.put("FUNDTYPE","01"); returnValue.put("MONEY",factmoney.toString()); return returnValue; } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java index 0410d5c71..cca7fbbe4 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java @@ -106,7 +106,7 @@ public class CreateVoucherMonthSettlement{ param.put("LEASINCOMEFORM", "01"); // B端 } } - //param.put("FUNDTYPE", ""); // 主营类型 + param.put("FUNDTYPE", "02"); // 主营类型 param.put("BUSINESSTYPE", "06"); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractPlanList.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryBusinessType.java similarity index 85% rename from src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractPlanList.java rename to src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryBusinessType.java index cf91e2c63..f55ed66b0 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractPlanList.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryBusinessType.java @@ -7,7 +7,7 @@ import com.amarsoft.are.jbo.JBOTransaction; import com.tenwa.comm.exception.BusinessException; import com.tenwa.voucher.service.VoucherJavaParamService; -public class auxiliaryContractPlanList implements VoucherJavaParamService { +public class auxiliaryBusinessType implements VoucherJavaParamService { @Override public Map getJavaParam(JBOTransaction tx, diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractCar.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractCar.java index 19225a94e..7fe12a086 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractCar.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractCar.java @@ -13,10 +13,9 @@ public class auxiliaryContractCar implements VoucherJavaParamService { public Map getJavaParam(JBOTransaction tx, Map param) throws BusinessException { MapreturnValue=new HashMap(); - String CARID=param.get("CARID"); - String CARMODEL=param.get("CARMODEL"); - returnValue.put("CARID",CARID); - returnValue.put("CARMODEL",CARMODEL); + + String LEASFORMASSET=param.get("LEASFORMASSET"); + returnValue.put("LEASFORMASSET",LEASFORMASSET); return returnValue; } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryFundType.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryFundType.java new file mode 100644 index 000000000..a978359bd --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryFundType.java @@ -0,0 +1,20 @@ +package com.tenwa.voucher.CreateVoucherProcess.auxiliaryInfo; + +import java.util.HashMap; +import java.util.Map; + +import com.amarsoft.are.jbo.JBOTransaction; +import com.tenwa.comm.exception.BusinessException; +import com.tenwa.voucher.service.VoucherJavaParamService; + +public class auxiliaryFundType implements VoucherJavaParamService { + +@Override +public Map getJavaParam(JBOTransaction tx, + Map param) throws BusinessException { + MapreturnValue=new HashMap(); + String FUNDTYPE=param.get("FUNDTYPE"); + returnValue.put("FUNDTYPE",FUNDTYPE); + return returnValue; +} +} diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryLeasIncomeForm.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryLeasIncomeForm.java new file mode 100644 index 000000000..6cdfabeb6 --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryLeasIncomeForm.java @@ -0,0 +1,20 @@ +package com.tenwa.voucher.CreateVoucherProcess.auxiliaryInfo; + +import java.util.HashMap; +import java.util.Map; + +import com.amarsoft.are.jbo.JBOTransaction; +import com.tenwa.comm.exception.BusinessException; +import com.tenwa.voucher.service.VoucherJavaParamService; + +public class auxiliaryLeasIncomeForm implements VoucherJavaParamService { + +@Override +public Map getJavaParam(JBOTransaction tx, + Map param) throws BusinessException { + MapreturnValue=new HashMap(); + String LEASINCOMEFORM=param.get("LEASINCOMEFORM"); + returnValue.put("LEASINCOMEFORM",LEASINCOMEFORM); + return returnValue; +} +} diff --git a/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java b/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java index a4f70838b..4553a31b4 100644 --- a/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java +++ b/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java @@ -131,6 +131,9 @@ public class VoucherToV8Impl implements VoucherService { d.put("F66",list.get(i).get("DISTRIBUTOR_NAME")); d.put("F64","汽车"); d.put("F63","业务二部"); + d.put("F73",list.get(i).get("LEASINCOMEFORM")); + d.put("F75",list.get(i).get("FUNDTYPE")); + d.put("F75",list.get(i).get("BUSINESSTYPE")); d.put("inputuserid",user.getAttribute("userid").getString()); d.put("v8_status",status);