diff --git a/WebContent/META-INF/context.xml b/WebContent/META-INF/context.xml index 17151bd2c..6e3ccf45e 100644 --- a/WebContent/META-INF/context.xml +++ b/WebContent/META-INF/context.xml @@ -1,12 +1,20 @@ + + url="jdbc:mysql://47.94.109.18:3306/apzl?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=GBK&autoReconnectForPools=true&autoReconnect=true&useSSL=false" /> + diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java index 95eefb140..5517a9918 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java @@ -118,7 +118,6 @@ public class CreateVoucherCustCautionMoneyIncome extends BaseBussiness { param.put("BUSINESSTYPE", "0605");// 主营类型 } // param.put("FUNDTYPE", ""); // 主营类型 - param.put("BUSINESSTYPE", "06"); param.put("FlowUnid", FlowUnid); map.clear(); map.put("PROJ_TYPE", leas_form); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionToMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionToMoney.java index 39f2ef771..b181767df 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionToMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionToMoney.java @@ -43,7 +43,7 @@ public class CreateVoucherDepositDeductionToMoney extends BaseBussiness { String sql = ""; param.clear(); map.put("FlowUnid", FlowUnid); - sql = "SELECT IFNULL(LFIT.FACT_MONEY, 0) AS MONEY,IFNULL(ROUND(LRIT.PENALTY /getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL((LRIT.PENALTY - ROUND(LRIT.PENALTY /getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)),0) AS MONEYTAX,'0.00' AS DEDITMONEY_NOTAX,IFNULL(LRIT.CORPUS,0) AS CORPUS,IFNULL(LRIT.INTEREST,0) AS INTEREST,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 LCCT LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LCCT.CONTRACT_ID LEFT JOIN (SELECT LRIT.CORPUS,LRIT.INTEREST,LRIT.PENALTY,LRIT.FLOWUNID FROM LC_RENT_INCOME_TEMP LRIT WHERE LRIT.SETTLE_METHOD='settlemethod7')LRIT ON LRIT.CONTRACT_ID=LCI.ID LEFT JOIN (SELECT LFIT.FACT_MONEY FROM LC_FUND_INCOME_TEMP LFIT WHERE LFIT.FEE_TYPE = 'feetype16' AND LFIT.SETTLE_METHOD = 'settlemethod7' )LFIT ON LFIT.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 LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID WHERE LRIT.FLOWUNID = :FLOWUNID "; + sql = "SELECT IFNULL(LFIT.FACT_MONEY, 0) AS MONEY,IFNULL(ROUND(LRIT.PENALTY / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL((LRIT.PENALTY - ROUND(LRIT.PENALTY / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)),0) AS MONEYTAX,'0.00' AS DEDITMONEY_NOTAX,IFNULL(LRIT.CORPUS, 0) AS CORPUS,IFNULL(LRIT.INTEREST, 0) AS INTEREST,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 LCCT LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN (SELECT SUM(LRIT.CORPUS) CORPUS,SUM(LRIT.INTEREST) INTEREST,SUM(LRIT.PENALTY) PENALTY,LRIT.FLOWUNID,LRIT.CONTRACT_ID FROM LC_RENT_INCOME_TEMP LRIT WHERE LRIT.SETTLE_METHOD = 'settlemethod7' GROUP BY lrit.FLOWUNID,LRIT.CONTRACT_ID) LRIT ON LRIT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT SUM(LFIT.FACT_MONEY) FACT_MONEY,lfit.contract_id FROM LC_FUND_INCOME_TEMP LFIT WHERE LFIT.FEE_TYPE = 'feetype16' AND LFIT.SETTLE_METHOD = 'settlemethod7' GROUP BY lfit.contract_id) LFIT ON LFIT.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 LRIT.FLOWUNID = :FLOWUNID "; // 查询sql, 将结果集封装到list集合中 List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql, map); CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl(); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/AccountsPay.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/AccountsPay.java index d2ace7e52..c2f0fa50f 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/AccountsPay.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/AccountsPay.java @@ -10,7 +10,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; public class AccountsPay implements VoucherJavaParamService{ @Override public Map getJavaParam(JBOTransaction tx, - Map param) throws BusinessException { + Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); returnValue.put("MONEY",param.get("FACT_MONEY")); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/AccountsPayFirst.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/AccountsPayFirst.java index f43487327..82addd57b 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/AccountsPayFirst.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/AccountsPayFirst.java @@ -11,7 +11,7 @@ public class AccountsPayFirst implements VoucherJavaParamService{ @Override public Map getJavaParam(JBOTransaction tx, - Map param) throws BusinessException { + Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); returnValue.put("MONEY",param.get("FACT_MONEY")); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/AccountsPayable.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/AccountsPayable.java index b61b913d7..4e9ead875 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/AccountsPayable.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/AccountsPayable.java @@ -11,7 +11,7 @@ public class AccountsPayable implements VoucherJavaParamService{ @Override public Map getJavaParam(JBOTransaction tx, - Map param) throws BusinessException { + Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); returnValue.put("MONEY",param.get("FACT_MONEY")); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/BankOrCash.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/BankOrCash.java index ce0801933..8896e98f2 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/BankOrCash.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/BankOrCash.java @@ -12,7 +12,7 @@ public class BankOrCash implements VoucherJavaParamService{ @Override public Map getJavaParam(JBOTransaction tx, - Map param) throws BusinessException { + Map param,Map subData) throws BusinessException { //车款-首付款(f10)+购置税(f20)+保险(f21)+GPS(f24)+装饰装潢(f23) BigDecimal total = new BigDecimal(param.get("f10")); total=total.add(new BigDecimal(param.get("f20"))); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseEquipMoneySubFirstMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseEquipMoneySubFirstMoney.java index c849de539..87e8b0829 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseEquipMoneySubFirstMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseEquipMoneySubFirstMoney.java @@ -13,7 +13,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; */ public class CleanLeaseEquipMoneySubFirstMoney implements VoucherJavaParamService { public Map getJavaParam(JBOTransaction tx, - Map param) throws BusinessException { + Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); // 车款 String EQUIP_AMT=param.get("EQUIP_AMT")==null?"0.00":param.get("EQUIP_AMT"); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoney.java index 90972fb66..445f631a7 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoney.java @@ -13,7 +13,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; */ public class CleanLeaseMoney implements VoucherJavaParamService { public Map getJavaParam(JBOTransaction tx, - Map param) throws BusinessException { + Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); // 车款 String EQUIP_AMT=param.get("EQUIP_AMT")==null?"0.00":param.get("EQUIP_AMT"); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoneyAddOtherNoGps.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoneyAddOtherNoGps.java index bf24d840d..bad9c018e 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoneyAddOtherNoGps.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoneyAddOtherNoGps.java @@ -13,7 +13,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; */ public class CleanLeaseMoneyAddOtherNoGps implements VoucherJavaParamService { public Map getJavaParam(JBOTransaction tx, - Map param) throws BusinessException { + Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); BigDecimal factmoney=null; // 车款 diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoan.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoan.java index 2a5790e4e..c1e37a121 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoan.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoan.java @@ -11,7 +11,7 @@ public class CommLoan implements VoucherJavaParamService{ @Override public Map getJavaParam(JBOTransaction tx, - Map param) throws BusinessException { + Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); return returnValue; diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanCautionMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanCautionMoney.java index 9b216736f..e26b5e5ad 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanCautionMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanCautionMoney.java @@ -13,7 +13,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; public class CommLoanCautionMoney implements VoucherJavaParamService{ @Override - public Map getJavaParam(JBOTransaction tx,Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx,Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); returnValue.put("MONEY",param.get("CAUTION_MONEY")); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanEquipSubFirstNoTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanEquipSubFirstNoTax.java index bdc7cc863..1429b9967 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanEquipSubFirstNoTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanEquipSubFirstNoTax.java @@ -13,7 +13,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; public class CommLoanEquipSubFirstNoTax implements VoucherJavaParamService{ @Override - public Map getJavaParam(JBOTransaction tx,Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx,Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); returnValue.put("FUNDTYPE","01"); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFactMoneyToMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFactMoneyToMoney.java index 709574d4d..92879857c 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFactMoneyToMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFactMoneyToMoney.java @@ -10,7 +10,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; public class CommLoanFactMoneyToMoney implements VoucherJavaParamService{ @Override - public Map getJavaParam(JBOTransaction tx,Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx,Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); returnValue.put("FUNDTYPE","01"); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFinancingSubOthersMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFinancingSubOthersMoney.java index 8445fd97a..d8bb8d833 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFinancingSubOthersMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFinancingSubOthersMoney.java @@ -13,7 +13,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; public class CommLoanFinancingSubOthersMoney implements VoucherJavaParamService{ @Override - public Map getJavaParam(JBOTransaction tx,Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx,Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); returnValue.put("MONEY",param.get("FINANCING_SUB_OTHERS")); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFirstAddFinancingMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFirstAddFinancingMoney.java index 0b85bf2ad..437320b73 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFirstAddFinancingMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFirstAddFinancingMoney.java @@ -13,7 +13,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; public class CommLoanFirstAddFinancingMoney implements VoucherJavaParamService{ @Override - public Map getJavaParam(JBOTransaction tx,Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx,Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); returnValue.put("MONEY",param.get("FIRST_ADD_FINANCING")); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFirstAddHandlingMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFirstAddHandlingMoney.java index 8e5dff5dc..13b2ed8c6 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFirstAddHandlingMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFirstAddHandlingMoney.java @@ -13,7 +13,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; public class CommLoanFirstAddHandlingMoney implements VoucherJavaParamService{ @Override - public Map getJavaParam(JBOTransaction tx,Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx,Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); returnValue.put("MONEY",param.get("FIRST_ADD_HANDLING")); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanInterestAddHandlingMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanInterestAddHandlingMoney.java index caac23f77..74d6a2e62 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanInterestAddHandlingMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanInterestAddHandlingMoney.java @@ -13,7 +13,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; public class CommLoanInterestAddHandlingMoney implements VoucherJavaParamService{ @Override - public Map getJavaParam(JBOTransaction tx,Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx,Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); returnValue.put("MONEY",param.get("INTEREST_ADD_HANDLING")); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractCorpusMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractCorpusMoney.java index 9c7290129..612d61217 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractCorpusMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractCorpusMoney.java @@ -13,7 +13,7 @@ public class ContractCorpusMoney implements VoucherJavaParamService{ @Override public Map getJavaParam(JBOTransaction tx, - Map param) throws BusinessException { + Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); returnValue.put("MONEY",param.get("CORPUS")); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractEquipToJust.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractEquipToJust.java index a120361b4..7f8dca6f0 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractEquipToJust.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractEquipToJust.java @@ -12,7 +12,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; */ public class ContractEquipToJust implements VoucherJavaParamService{ public Map getJavaParam(JBOTransaction tx, - Map param) throws BusinessException { + Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); returnValue.put("FUNDTYPE","01"); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterest.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterest.java index fcc1ddcd5..f527bbd76 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterest.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterest.java @@ -12,7 +12,7 @@ public class ContractInterest implements VoucherJavaParamService{ @Override public Map getJavaParam(JBOTransaction tx, - Map param) throws BusinessException { + Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); returnValue.put("MONEY",param.get("INTEREST")); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterestNoTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterestNoTax.java index 1967ea004..9925cb363 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterestNoTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterestNoTax.java @@ -11,7 +11,7 @@ public class ContractInterestNoTax implements VoucherJavaParamService{ @Override public Map getJavaParam(JBOTransaction tx, - Map param) throws BusinessException { + Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); returnValue.put("MONEY",param.get("INTERESTNOTAX")); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterestTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterestTax.java index 8fc97897e..268ae910c 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterestTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterestTax.java @@ -14,7 +14,7 @@ public class ContractInterestTax implements VoucherJavaParamService{ @Override public Map getJavaParam(JBOTransaction tx, - Map param) throws BusinessException { + Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); returnValue.put("MONEY",param.get("TAX")); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractMoneyToRent.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractMoneyToRent.java index 56dfbf9ce..945300b1e 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractMoneyToRent.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractMoneyToRent.java @@ -14,7 +14,7 @@ public class ContractMoneyToRent implements VoucherJavaParamService{ @Override public Map getJavaParam(JBOTransaction tx, - Map param) throws BusinessException { + Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); returnValue.put("MONEY",param.get("RENTMONEY")); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractOtherMoneyNoTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractOtherMoneyNoTax.java index 187e9763d..f166314c1 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractOtherMoneyNoTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractOtherMoneyNoTax.java @@ -15,7 +15,7 @@ public class ContractOtherMoneyNoTax implements VoucherJavaParamService{ @Override public Map getJavaParam(JBOTransaction tx, - Map param) throws BusinessException { + Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); returnValue.put("MONEY",param.get("OTHERNOTAX")); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractOtherMoneyToTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractOtherMoneyToTax.java index 02f217fe7..aa62ead8b 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractOtherMoneyToTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractOtherMoneyToTax.java @@ -12,7 +12,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; * @author xiezhiwen */ public class ContractOtherMoneyToTax implements VoucherJavaParamService{ - public Map getJavaParam(JBOTransaction tx,Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx,Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); returnValue.put("FUNDTYPE","01"); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractToDeditMoneyNoTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractToDeditMoneyNoTax.java index 24413e5de..77b9bb502 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractToDeditMoneyNoTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractToDeditMoneyNoTax.java @@ -10,7 +10,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; public class ContractToDeditMoneyNoTax implements VoucherJavaParamService{ @Override - public Map getJavaParam(JBOTransaction tx,Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx,Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); returnValue.put("MONEY",param.get("DEDITMONEY_NOTAX")); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FundGPSFee.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FundGPSFee.java index d51f3cb5f..7ebb6b0a0 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FundGPSFee.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FundGPSFee.java @@ -11,7 +11,7 @@ public class FundGPSFee implements VoucherJavaParamService{ @Override public Map getJavaParam(JBOTransaction tx, - Map param) throws BusinessException { + Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); // GPS diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFee.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFee.java index efb5ff60b..f3fae112d 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFee.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFee.java @@ -13,7 +13,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; */ public class OtherFee implements VoucherJavaParamService{ public Map getJavaParam(JBOTransaction tx, - Map param) throws BusinessException { + Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); // 保险费 String INSURANCE_PREMIUM=param.get("INSURANCE_PREMIUM")==null?"0.00":param.get("INSURANCE_PREMIUM"); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFeeAddGps.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFeeAddGps.java index bb0792e2f..816d88aed 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFeeAddGps.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFeeAddGps.java @@ -13,7 +13,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; */ public class OtherFeeAddGps implements VoucherJavaParamService{ public Map getJavaParam(JBOTransaction tx, - Map param) throws BusinessException { + Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); String INSURANCE_PREMIUM=param.get("INSURANCE_PREMIUM")==null?"0.00":param.get("INSURANCE_PREMIUM"); String PURCHASE_TAX=param.get("PURCHASE_TAX")==null?"0.00":param.get("PURCHASE_TAX"); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFeeMoneyToLoan.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFeeMoneyToLoan.java index 33489251b..f65bb4d89 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFeeMoneyToLoan.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFeeMoneyToLoan.java @@ -13,7 +13,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; */ public class OtherFeeMoneyToLoan implements VoucherJavaParamService{ public Map getJavaParam(JBOTransaction tx, - Map param) throws BusinessException { + Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); String INSURANCE_PREMIUM=param.get("INSURANCE_PREMIUM")==null?"0.00":param.get("INSURANCE_PREMIUM"); String PURCHASE_TAX=param.get("PURCHASE_TAX")==null?"0.00":param.get("PURCHASE_TAX"); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFees.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFees.java index ad2c34d9b..c9b2a9307 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFees.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFees.java @@ -13,7 +13,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; */ public class OtherFees implements VoucherJavaParamService{ public Map getJavaParam(JBOTransaction tx, - Map param) throws BusinessException { + Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); // 保险费 String INSURANCE_PREMIUM=param.get("INSURANCE_PREMIUM")==null?"0.00":param.get("INSURANCE_PREMIUM"); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/SynthesizeLeaseMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/SynthesizeLeaseMoney.java index 3839790b1..857ae97ca 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/SynthesizeLeaseMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/SynthesizeLeaseMoney.java @@ -15,7 +15,7 @@ public class SynthesizeLeaseMoney implements VoucherJavaParamService{ @Override public Map getJavaParam(JBOTransaction tx, - Map param) throws BusinessException { + Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); String EQUIP_AMT=param.get("EQUIP_AMT")==null?"0.00":param.get("EQUIP_AMT"); String FIRST_PAYMENT=param.get("FIRST_PAYMENT")==null?"0.00":param.get("FIRST_PAYMENT"); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/SynthesizeMoneyToJust.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/SynthesizeMoneyToJust.java index 515772381..a46563e68 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/SynthesizeMoneyToJust.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/SynthesizeMoneyToJust.java @@ -12,7 +12,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; * @author xiezhiwen */ public class SynthesizeMoneyToJust implements VoucherJavaParamService{ - public Map getJavaParam(JBOTransaction tx,Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx,Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); String EQUIP_AMT=param.get("EQUIP_AMT")==null?"0.00":param.get("EQUIP_AMT"); String FIRST_PAYMENT=param.get("FIRST_PAYMENT")==null?"0.00":param.get("FIRST_PAYMENT"); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToCautionMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToCautionMoney.java index 75109516c..a8886a571 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToCautionMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToCautionMoney.java @@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; * @author xiezhiwen */ public class ContractGetMoneyToCautionMoney implements VoucherJavaParamService{ - public Map getJavaParam(JBOTransaction tx, Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx, Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); // 获取保证金 @@ -19,4 +19,5 @@ public class ContractGetMoneyToCautionMoney implements VoucherJavaParamService{ returnValue.put("MONEY",GUARANTY); return returnValue; } + } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquip.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquip.java index 808ee199c..f66908ee0 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquip.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquip.java @@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; * @author xiezhiwen */ public class ContractGetMoneyToEquip implements VoucherJavaParamService{ - public Map getJavaParam(JBOTransaction tx, Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx, Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); // 获取设备款 diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOther.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOther.java index c01dd804a..290c65fb7 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOther.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOther.java @@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; * @author xiezhiwen */ public class ContractGetMoneyToEquipAddInsuranceAddOther implements VoucherJavaParamService{ - public Map getJavaParam(JBOTransaction tx, Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx, Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); // 获取设备款 diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOtherSubFirst.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOtherSubFirst.java index d04e0f50f..7b2d8192f 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOtherSubFirst.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOtherSubFirst.java @@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; * @author xiezhiwen */ public class ContractGetMoneyToEquipAddInsuranceAddOtherSubFirst implements VoucherJavaParamService{ - public Map getJavaParam(JBOTransaction tx, Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx, Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); // 获取设备款 diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddOthers.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddOthers.java index 8e66546d8..d6c95d194 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddOthers.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddOthers.java @@ -12,7 +12,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; * @author xiezhiwen */ public class ContractGetMoneyToEquipAddOthers implements VoucherJavaParamService{ - public Map getJavaParam(JBOTransaction tx, Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx, Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); // 设备款+其他金额 diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipNoTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipNoTax.java index dd14fd0df..577aa7eed 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipNoTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipNoTax.java @@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; * @author xiezhiwen */ public class ContractGetMoneyToEquipNoTax implements VoucherJavaParamService{ - public Map getJavaParam(JBOTransaction tx, Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx, Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); // 获取设备款 diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipSubFirst.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipSubFirst.java index 35e67cf9c..6a5398513 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipSubFirst.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipSubFirst.java @@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; * @author xiezhiwen */ public class ContractGetMoneyToEquipSubFirst implements VoucherJavaParamService{ - public Map getJavaParam(JBOTransaction tx, Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx, Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); String EQUIP_SUBFIRST=param.get("EQUIP_SUBFIRST")==null?"0.00":param.get("EQUIP_SUBFIRST"); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipTax.java index ca9e17315..698307f5b 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipTax.java @@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; * @author xiezhiwen */ public class ContractGetMoneyToEquipTax implements VoucherJavaParamService{ - public Map getJavaParam(JBOTransaction tx, Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx, Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); // 获取设备款 diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToFirstPayment.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToFirstPayment.java index de432c84e..1ae0aa23c 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToFirstPayment.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToFirstPayment.java @@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; * @author xiezhiwen */ public class ContractGetMoneyToFirstPayment implements VoucherJavaParamService{ - public Map getJavaParam(JBOTransaction tx, Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx, Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); // 获取首付款 diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToFirstPaymentNoTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToFirstPaymentNoTax.java index 6e5551ff0..9a6b34cc6 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToFirstPaymentNoTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToFirstPaymentNoTax.java @@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; * @author xiezhiwen */ public class ContractGetMoneyToFirstPaymentNoTax implements VoucherJavaParamService{ - public Map getJavaParam(JBOTransaction tx, Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx, Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); // 首付款(不含税) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToFirstPaymentTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToFirstPaymentTax.java index bb58b06de..49724734d 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToFirstPaymentTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToFirstPaymentTax.java @@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; * @author xiezhiwen */ public class ContractGetMoneyToFirstPaymentTax implements VoucherJavaParamService{ - public Map getJavaParam(JBOTransaction tx, Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx, Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); // 首付款(税金) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToHandlingCharge.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToHandlingCharge.java index 9324dc22d..c3042d480 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToHandlingCharge.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToHandlingCharge.java @@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; * @author xiezhiwen */ public class ContractGetMoneyToHandlingCharge implements VoucherJavaParamService{ - public Map getJavaParam(JBOTransaction tx, Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx, Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); // 获取手续费 diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToHandlingChargeNoTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToHandlingChargeNoTax.java index b4e98aa2b..b6b1682a4 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToHandlingChargeNoTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToHandlingChargeNoTax.java @@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; * @author xiezhiwen */ public class ContractGetMoneyToHandlingChargeNoTax implements VoucherJavaParamService{ - public Map getJavaParam(JBOTransaction tx, Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx, Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); // 获取手续费(不含税) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToHandlingChargeTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToHandlingChargeTax.java index fa3bb3f3d..efc56345f 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToHandlingChargeTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToHandlingChargeTax.java @@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; * @author xiezhiwen */ public class ContractGetMoneyToHandlingChargeTax implements VoucherJavaParamService{ - public Map getJavaParam(JBOTransaction tx, Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx, Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); // 获取手续费(税金) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToINTEREST.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToINTEREST.java index 263990866..6b224a1e9 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToINTEREST.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToINTEREST.java @@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; * @author xiezhiwen */ public class ContractGetMoneyToINTEREST implements VoucherJavaParamService{ - public Map getJavaParam(JBOTransaction tx,Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx,Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); returnValue.put("FUNDTYPE","02"); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOther.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOther.java index 378311c84..5d92a95b6 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOther.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOther.java @@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; * @author xiezhiwen */ public class ContractGetMoneyToInsuranceAddOther implements VoucherJavaParamService{ - public Map getJavaParam(JBOTransaction tx, Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx, Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); // 获取设备款INSURANCE_OTHER diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherNoTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherNoTax.java index 778dec909..144debb6e 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherNoTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherNoTax.java @@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; * @author xiezhiwen */ public class ContractGetMoneyToInsuranceAddOtherNoTax implements VoucherJavaParamService{ - public Map getJavaParam(JBOTransaction tx, Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx, Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); // 获取设备款 diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherTax.java index 487f23ccb..d9d5075ca 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherTax.java @@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; * @author xiezhiwen */ public class ContractGetMoneyToInsuranceAddOtherTax implements VoucherJavaParamService{ - public Map getJavaParam(JBOTransaction tx, Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx, Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); // 保险+其他(税金) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoney.java index 5c91a7924..f5520ed80 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoney.java @@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; * @author xiezhiwen */ public class ContractGetMoneyToMoney implements VoucherJavaParamService{ - public Map getJavaParam(JBOTransaction tx,Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx,Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); returnValue.put("MONEY",param.get("FACT_MONEY")); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyNoTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyNoTax.java index 37cab07a1..6cf5d66d7 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyNoTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyNoTax.java @@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; * @author xiezhiwen */ public class ContractGetMoneyToMoneyNoTax implements VoucherJavaParamService{ - public Map getJavaParam(JBOTransaction tx,Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx,Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); returnValue.put("FUNDTYPE","02"); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyTax.java index b8f5ab032..6131236ce 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyTax.java @@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; * @author xiezhiwen */ public class ContractGetMoneyToMoneyTax implements VoucherJavaParamService{ - public Map getJavaParam(JBOTransaction tx,Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx,Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); returnValue.put("FUNDTYPE","02"); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOther.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOther.java index 69a796e86..1205d8c63 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOther.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOther.java @@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; * @author xiezhiwen */ public class ContractGetMoneyToOther implements VoucherJavaParamService{ - public Map getJavaParam(JBOTransaction tx, Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx, Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); // 获取其它金额 diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherNoTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherNoTax.java index 48f72774e..f9e075046 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherNoTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherNoTax.java @@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; * @author xiezhiwen */ public class ContractGetMoneyToOtherNoTax implements VoucherJavaParamService{ - public Map getJavaParam(JBOTransaction tx, Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx, Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); // 获取其它金额 diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherTax.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherTax.java index b417d773c..476a82ee4 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherTax.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherTax.java @@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; * @author xiezhiwen */ public class ContractGetMoneyToOtherTax implements VoucherJavaParamService{ - public Map getJavaParam(JBOTransaction tx, Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx, Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); // 获取其它金额 diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOthersMath.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOthersMath.java index 95d183658..bbb8bb8fb 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOthersMath.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOthersMath.java @@ -12,7 +12,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; * @author xiezhiwen */ public class ContractGetMoneyToOthersMath implements VoucherJavaParamService{ - public Map getJavaParam(JBOTransaction tx, Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx, Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); returnValue.putAll(param); String OTHERS_MATH=param.get("OTHERS_MATH")==null?"0.00":param.get("OTHERS_MATH"); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryBusinessType.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryBusinessType.java index 096e1a481..947820b03 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryBusinessType.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryBusinessType.java @@ -12,7 +12,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; */ public class auxiliaryBusinessType implements VoucherJavaParamService { - public Map getJavaParam(JBOTransaction tx,Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx,Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); String BUSINESSTYPE=param.get("BUSINESSTYPE"); returnValue.put("BUSINESSTYPE",BUSINESSTYPE); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryCashFlow.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryCashFlow.java index 577f4c4a6..38a6e8ec3 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryCashFlow.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryCashFlow.java @@ -13,7 +13,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; public class auxiliaryCashFlow implements VoucherJavaParamService { public Map getJavaParam(JBOTransaction tx, - Map param) throws BusinessException { + Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); String CASHFLOW=param.get("CASHFLOW"); returnValue.put("CASHFLOW",CASHFLOW); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractAcc.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractAcc.java index 9cc91e24c..c1ca3d746 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractAcc.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractAcc.java @@ -14,7 +14,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService; public class auxiliaryContractAcc implements VoucherJavaParamService { - public Map getJavaParam(JBOTransaction tx,Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx,Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); String ACC_NUMBER=param.get("ACC_NUMBER"); returnValue.put("ACC_NUMBER",ACC_NUMBER); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractCustomer.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractCustomer.java index bb5243034..01bcb579d 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractCustomer.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractCustomer.java @@ -9,13 +9,33 @@ import com.tenwa.voucher.service.VoucherJavaParamService; public class auxiliaryContractCustomer implements VoucherJavaParamService { - public Map getJavaParam(JBOTransaction tx, - Map param) throws BusinessException { + public Map getJavaParam(JBOTransaction tx,Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); - String DISTRIBUTOR_ID=param.get("DISTRIBUTOR_ID"); - String DISTRIBUTOR_NAME=param.get("DISTRIBUTOR_NAME"); - returnValue.put("DISTRIBUTOR_ID",DISTRIBUTOR_ID); - returnValue.put("DISTRIBUTOR_NAME",DISTRIBUTOR_NAME); + // 定义全局客商编码和名称 + String CUSTID=""; + String CUSTNAME=""; + + // 获取CreateVoucherServiceImpl类中定义的客商编码 + String s1 = subData.get("CUSTID"); + // s1为空, 取值param中的编码 + if(s1 ==null || "".equals(s1)) { + CUSTID=param.get("CUSTID"); + // 如果不为空, 说明已经有了, 取值s1 + }else { + CUSTID=s1; + } + + // 获取CreateVoucherServiceImpl类中定义的客商名称 + String s2 = subData.get("CUSTNAME"); + // s1为空, 取值param中的名称 + if(s2 ==null || "".equals(s2)) { + CUSTNAME=param.get("CUSTNAME"); + // 如果不为空, 说明已经有了, 取值s1 + }else { + CUSTNAME=s2; + } + returnValue.put("CUSTID",CUSTID); + returnValue.put("CUSTNAME",CUSTNAME); return returnValue; } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractNumber.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractNumber.java index e49aeda28..bffb9718a 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractNumber.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractNumber.java @@ -11,7 +11,7 @@ public class auxiliaryContractNumber implements VoucherJavaParamService { @Override public Map getJavaParam(JBOTransaction tx, - Map param) throws BusinessException { + Map param,Map subData) throws BusinessException { MapreturnValue=new HashMap(); String CONTRACT_NUMBER=param.get("CONTRACT_NUMBER"); returnValue.put("CONTRACT_NUMBER",CONTRACT_NUMBER); diff --git a/src_core/com/tenwa/voucher/service/VoucherJavaParamService.java b/src_core/com/tenwa/voucher/service/VoucherJavaParamService.java index 53f1b492e..902d09ee1 100644 --- a/src_core/com/tenwa/voucher/service/VoucherJavaParamService.java +++ b/src_core/com/tenwa/voucher/service/VoucherJavaParamService.java @@ -7,5 +7,5 @@ import com.tenwa.comm.exception.BusinessException; public interface VoucherJavaParamService { - public Map getJavaParam(JBOTransaction tx,Map param)throws BusinessException; + public Map getJavaParam(JBOTransaction tx,Map param,Map subData)throws BusinessException; } diff --git a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java index 9ca884ddc..5215232c8 100644 --- a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java +++ b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java @@ -323,7 +323,7 @@ public class CreateVoucherServiceImpl { ps=null; } if(ps!=null){ - dataTemp=ps.getJavaParam(tx, param); + dataTemp=ps.getJavaParam(tx, param,subData); }else{ dataTemp=psi.getParamSql(tx, param,bo.getAttribute("VALUE_MODE").getString(), null); } @@ -361,10 +361,10 @@ public class CreateVoucherServiceImpl { subData.put("CUSTNAME","业务系统待查客户");//虚拟账户 }else if("PZ2018072100000038".equals(VOUCHERNO) || "PZ2018072100000039".equals(VOUCHERNO) || "PZ2018072100000043".equals(VOUCHERNO)) { subData.put("CUSTNAME","业务系统待查客户");//虚拟账户 - }else { + }/*else { subData.put("CUSTID",dataTemp.get("CUSTID"));//客商id subData.put("CUSTNAME",dataTemp.get("CUSTNAME"));//客商名称 - } + }*/ }else{ subData.put("F7","0");//借方金额 subData.put("F8",dataTemp.get("MONEY"));//贷方金额 @@ -373,10 +373,11 @@ public class CreateVoucherServiceImpl { if("PZ2018081600000120".equals(VOUCHERNO)){ subData.put("CUSTID","APZL00000000DC"); subData.put("CUSTNAME","业务系统待查客户"); - }else { + } + /*else { subData.put("CUSTID",dataTemp.get("CUSTID"));//客商id subData.put("CUSTNAME",dataTemp.get("CUSTNAME"));//客商名称 - } + }*/ } if(dataTemp.containsKey("FACT_DATE")){ subData.put("F15", dataTemp.get("FACT_DATE"));//业务日期 @@ -388,11 +389,10 @@ public class CreateVoucherServiceImpl { } if(sub.getAttribute("AUXILIARY_TYPE").getString().length()>0){ - subData.putAll(this.getAuxiliaryData(tx, param, sub.getAttribute("AUXILIARY_TYPE").getString())); + subData.putAll(this.getAuxiliaryData(tx, param,subData,sub.getAttribute("AUXILIARY_TYPE").getString())); } // 获取直租/回租类型 String LEAS_FORM = param.get("LEAS_FORM"); - // 起租, 购置融资租赁资产带经销商编码 if("PZ2018070900000002".equals(VOUCHERNO)) { if("3".equals(SORT_NUMBER)) { @@ -445,7 +445,7 @@ public class CreateVoucherServiceImpl { return list; } @SuppressWarnings("unchecked") - public Map getAuxiliaryData(JBOTransaction tx,Map param,String auxids) throws Exception{ + public Map getAuxiliaryData(JBOTransaction tx,Map param,Map subData,String auxids) throws Exception{ Map data=new HashMap(); VoucherParamServiceImpl psi=new VoucherParamServiceImpl(); @@ -461,7 +461,7 @@ public class CreateVoucherServiceImpl { ps=null; } if(ps!=null){ - data.putAll(ps.getJavaParam(tx, param)); + data.putAll(ps.getJavaParam(tx, param,subData)); }else{ data.putAll(psi.getParamSql(tx, param,con.getAttribute("VALUE_MODE").getString(), con.getAttribute("VALUE_LIST").getString())); }