diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractOnhireChange.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractOnhireChange.java index 72f1f8243..4ff270528 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractOnhireChange.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractOnhireChange.java @@ -92,12 +92,12 @@ public class CreateVoucherContractOnhireChange { param.put("BUSINESSTYPE",BUSINESSTYPE); //param.put("CARID",CARID); //param.put("CARMODEL",CARMODEL); - if(BUSINESSTYPE=="1"){ + if("1".equals(BUSINESSTYPE)){ param.put("LEASFORMASSET", "04"); // 融资租赁资产 param.put("DEPT", "02"); // 部门 - if(CUSTOMERTYPE=="03"){ // 如果是个人业务 + if("03".equals(CUSTOMERTYPE)){ // 如果是个人业务 param.put("LEASINCOMEFORM", "02"); // C端 - }else if(CUSTOMERTYPE=="01"){ + }else if("01".equals(CUSTOMERTYPE)){ param.put("LEASINCOMEFORM", "01"); // B端 } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java index d5c0f0ffa..401e4355d 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java @@ -97,12 +97,12 @@ public class CreateVoucherContractTerminate { param.put("CUSTOMERTYPE",CUSTOMERTYPE); param.put("BUSINESSTYPE",BUSINESSTYPE); - if(BUSINESSTYPE=="1"){ + if("1".equals(BUSINESSTYPE)){ param.put("LEASFORMASSET", "04"); // 融资租赁资产 param.put("DEPT", "02"); // 部门 - if(CUSTOMERTYPE=="03"){ // 如果是个人业务 + if("03".equals(CUSTOMERTYPE)){ // 如果是个人业务 param.put("LEASINCOMEFORM", "02"); // C端 - }else if(CUSTOMERTYPE=="01"){ + }else if("01".equals(CUSTOMERTYPE)){ param.put("LEASINCOMEFORM", "01"); // B端 } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java index b13103bf9..1c94cb51d 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java @@ -90,12 +90,12 @@ public class CreateVoucherCustCautionMoneyIncome extends BaseBussiness{ param.put("CUSTOMERTYPE",CUSTOMERTYPE); param.put("BUSINESSTYPE",BUSINESSTYPE); - if(BUSINESSTYPE=="1"){ + if("1".equals(BUSINESSTYPE)){ param.put("LEASFORMASSET", "04"); // 融资租赁资产 param.put("DEPT", "02"); // 部门 - if(CUSTOMERTYPE=="03"){ // 如果是个人业务 + if("03".equals(CUSTOMERTYPE)){ // 如果是个人业务 param.put("LEASINCOMEFORM", "02"); // C端 - }else if(CUSTOMERTYPE=="01"){ + }else if("01".equals(CUSTOMERTYPE)){ param.put("LEASINCOMEFORM", "01"); // B端 } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustomerRentOrFee.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustomerRentOrFee.java index 0f1d7930c..c276a946b 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustomerRentOrFee.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustomerRentOrFee.java @@ -112,12 +112,12 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { param.put("CUSTOMERTYPE",CUSTOMERTYPE); param.put("BUSINESSTYPE",BUSINESSTYPE); - if(BUSINESSTYPE=="1"){ + if("1".equals(BUSINESSTYPE)){ param.put("LEASFORMASSET", "04"); // 融资租赁资产 param.put("DEPT", "02"); // 部门 - if(CUSTOMERTYPE=="03"){ // 如果是个人业务 + if("03".equals(CUSTOMERTYPE)){ // 如果是个人业务 param.put("LEASINCOMEFORM", "02"); // C端 - }else if(CUSTOMERTYPE=="01"){ + }else if("01".equals(CUSTOMERTYPE)){ param.put("LEASINCOMEFORM", "01"); // B端 } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java index 2fb7446c1..77f91f575 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java @@ -39,7 +39,7 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { sql= "SELECT DDIT.CAUTION_MONEY,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') " + "AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE," + "DDIT.REFUND_PERSON,DIF.DISTRIBUTOR_CODING DISTRIBUTOR_NO,DIF.DISTRIBUTOR_NAME FROM D_DEPOSITRETURN_INFO_TEMP" - + " DDIT LEFT JOIN DISTRIBUTOR_INFO DIF ON DIF.ID=DDIT.DISTRIBUTOR_ID " + + " DDIT LEFT JOIN DISTRIBUTOR_INFO DIF ON DIF.DISTRIBUTOR_NO=DDIT.DISTRIBUTOR_ID " + "WHERE DDIT.FLOWUNID=:FLOWUNID"; } if("PZ2018072100000032".equals(VOUCHERNO)){ @@ -48,7 +48,7 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { + "AS FACT_DATE,DDIT.payer,DIF.DISTRIBUTOR_CODING DISTRIBUTOR_NO," + "DIF.DISTRIBUTOR_NAME FROM D_DEPOSITCHARGE_INFO_TEMP " + "DDIT LEFT JOIN DISTRIBUTOR_INFO DIF ON " - + "DIF.ID=DDIT.DISTRIBUTOR_ID WHERE DDIT.FLOWUNID=:FLOWUNID"; + + "DIF.DISTRIBUTOR_NO=DDIT.DISTRIBUTOR_ID WHERE DDIT.FLOWUNID=:FLOWUNID"; } List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); @@ -72,7 +72,8 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { param.put("LEAS_FORM",leas_form); param.put("DISTRIBUTOR_ID",DISTRIBUTOR_ID); param.put("DISTRIBUTOR_NAME",DISTRIBUTOR_NAME); - + param.put("CUSTID",DISTRIBUTOR_ID); + param.put("CUSTNAME",DISTRIBUTOR_NAME); param.put("FlowUnid", FlowUnid); map.clear(); map.put("PROJ_TYPE", leas_form); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java index bc1b3f559..9f52ee4e4 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java @@ -92,12 +92,12 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { param.put("CUSTOMERTYPE",CUSTOMERTYPE); param.put("BUSINESSTYPE",BUSINESSTYPE); - if(BUSINESSTYPE=="1"){ + if("1".equals(BUSINESSTYPE)){ param.put("LEASFORMASSET", "04"); // 融资租赁资产 param.put("DEPT", "02"); // 部门 - if(CUSTOMERTYPE=="03"){ // 如果是个人业务 + if("03".equals(CUSTOMERTYPE)){ // 如果是个人业务 param.put("LEASINCOMEFORM", "02"); // C端 - }else if(CUSTOMERTYPE=="01"){ + }else if("01".equals(CUSTOMERTYPE)){ param.put("LEASINCOMEFORM", "01"); // B端 } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java index 201226ed1..3f2c3ecc8 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoanDistributor.java @@ -43,9 +43,11 @@ public class CreateVoucherLoanDistributor { String moneyDataSource=""; param.clear(); map.put("FlowUnid", FlowUnid); + //起租-给经销商放款-车款全款 if("PZ2018070900000002".equals(VOUCHERNO)||"PZ2018072400000060".equals(VOUCHERNO)){ moneyDataSource="LCCT.EQUIP_AMT"; } + //起租-经销商支付的预付款(首付) if("PZ2018070900000003".equals(VOUCHERNO)){ moneyDataSource="LCCT.FIRST_PAYMENT"; } @@ -99,12 +101,12 @@ public class CreateVoucherLoanDistributor { param.put("CUSTOMERTYPE",CUSTOMERTYPE); param.put("BUSINESSTYPE",BUSINESSTYPE); - if(BUSINESSTYPE=="1"){ + if("1".equals(BUSINESSTYPE)){ param.put("LEASFORMASSET", "04"); // 融资租赁资产 param.put("DEPT", "02"); // 部门 - if(CUSTOMERTYPE=="03"){ // 如果是个人业务 + if("03".equals(CUSTOMERTYPE)){ // 如果是个人业务 param.put("LEASINCOMEFORM", "02"); // C端 - }else if(CUSTOMERTYPE=="01"){ + }else if("01".equals(CUSTOMERTYPE)){ param.put("LEASINCOMEFORM", "01"); // B端 } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java index cca7fbbe4..e54e67ad8 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMonthSettlement.java @@ -97,12 +97,12 @@ public class CreateVoucherMonthSettlement{ param.put("CUSTOMERTYPE",CUSTOMERTYPE); param.put("BUSINESSTYPE",BUSINESSTYPE); - if(BUSINESSTYPE=="1"){ + if("1".equals(BUSINESSTYPE)){ param.put("LEASFORMASSET", "04"); // 融资租赁资产 param.put("DEPT", "02"); // 部门 - if(CUSTOMERTYPE=="03"){ // 如果是个人业务 + if("03".equals(CUSTOMERTYPE)){ // 如果是个人业务 param.put("LEASINCOMEFORM", "02"); // C端 - }else if(CUSTOMERTYPE=="01"){ + }else if("01".equals(CUSTOMERTYPE)){ param.put("LEASINCOMEFORM", "01"); // B端 } } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentIncome.java index e1d31af97..cdf3b92da 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentIncome.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentIncome.java @@ -85,12 +85,12 @@ public class CreateVoucherRentIncome { param.put("CUSTOMERTYPE",CUSTOMERTYPE); param.put("BUSINESSTYPE",BUSINESSTYPE); - if(BUSINESSTYPE=="1"){ + if("1".equals(BUSINESSTYPE)){ param.put("LEASFORMASSET", "04"); // 融资租赁资产 param.put("DEPT", "02"); // 部门 - if(CUSTOMERTYPE=="03"){ // 如果是个人业务 + if("03".equals(CUSTOMERTYPE)){ // 如果是个人业务 param.put("LEASINCOMEFORM", "02"); // C端 - }else if(CUSTOMERTYPE=="01"){ + }else if("01".equals(CUSTOMERTYPE)){ param.put("LEASINCOMEFORM", "01"); // B端 } } diff --git a/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java b/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java index 4553a31b4..4b46b968a 100644 --- a/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java +++ b/src_core/com/tenwa/voucher/serviceImp/VoucherToV8Impl.java @@ -129,10 +129,10 @@ public class VoucherToV8Impl implements VoucherService { d.put("F61",list.get(i).get("CUSTNAME")); d.put("F72",list.get(i).get("DISTRIBUTOR_ID")); d.put("F66",list.get(i).get("DISTRIBUTOR_NAME")); - d.put("F64","汽车"); - d.put("F63","业务二部"); + d.put("F64",list.get(i).get("LEASFORMASSET")); + d.put("F63",list.get(i).get("DEPT")); d.put("F73",list.get(i).get("LEASINCOMEFORM")); - d.put("F75",list.get(i).get("FUNDTYPE")); + d.put("F74",list.get(i).get("FUNDTYPE")); d.put("F75",list.get(i).get("BUSINESSTYPE")); d.put("inputuserid",user.getAttribute("userid").getString());