Merge branch 'develop' of http://git2.tenwa.com.cn/ApzlDev/apzl_leasing.git into zhouyh2
This commit is contained in:
zhouyahui
commit
711cd867a5
@ -133,8 +133,12 @@
|
||||
Vector<Parameter> v=CurPage.parameterList;
|
||||
v.add(p);
|
||||
/*设置页面属性*/
|
||||
|
||||
|
||||
if(CurUser.hasRole("401")){
|
||||
doTemp.setVisible("RENT_RATIO",false);
|
||||
doTemp.setVisible("CAUTION_MONEY_METHOD",false);
|
||||
}else{
|
||||
doTemp.setVisible("RENT_RATIO",false);
|
||||
}
|
||||
ASObjectWindowCalc dwTemp = new ASObjectWindowCalc(CurPage, doTemp,request);
|
||||
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
doTemp.setDataQueryClass("com.tenwa.lease.flow.flowarchive.calcarchive.CalcRentListArachiveShow");
|
||||
}
|
||||
String Distributor=CurPage.getParameter("isDistributor");
|
||||
if("true".equals(Distributor)){
|
||||
if("true".equals(Distributor)||CurUser.hasRole("401")){
|
||||
doTemp.setVisible("CORPUS", false);
|
||||
doTemp.setVisible("INTEREST", false);
|
||||
doTemp.setVisible("CORPUS_BUSINESS", false);
|
||||
|
||||
@ -30,7 +30,9 @@ public class CreateVoucherContractOnhireChange {
|
||||
String PROJECT_NAME=null;
|
||||
String leas_form=null;
|
||||
String DISTRIBUTOR_ID=null;
|
||||
String DISTRIBUTOR_NAME=null;
|
||||
String DISTRIBUTOR_NAME=null;
|
||||
String CUSTID=null;
|
||||
String CUSTNAME=null;
|
||||
//String CARID=null;
|
||||
//String CARMODEL=null;
|
||||
String sql="";
|
||||
@ -38,31 +40,11 @@ public class CreateVoucherContractOnhireChange {
|
||||
map.put("FlowUnid", FlowUnid);
|
||||
|
||||
if("PZ2018072100000049".equals(VOUCHERNO)){
|
||||
sql="SELECT LRPT.SUMINTE-LRP.SUMINTE 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,LCI."
|
||||
+ "DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME FROM LB_CONTRACT_INFO LCI "
|
||||
+ "INNER JOIN (SELECT MAX(CONTRACT_ID) CONTRACT_ID,SUM(ROUND(INTEREST/1.06,2))"
|
||||
+ " SUMINTE, FLOWUNID FROM LC_RENT_PLAN_TEMP GROUP BY FLOWUNID) LRPT ON "
|
||||
+ "LRPT.CONTRACT_ID=LCI.ID INNER JOIN (SELECT CONTRACT_ID,SUM(ROUND(INTEREST/"
|
||||
+ "1.06,2)) SUMINTE FROM LC_RENT_PLAN GROUP BY CONTRACT_ID) LRP ON LRP."
|
||||
+ "CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO="
|
||||
+ "LCI.DISTRIBUTOR_ID WHERE LRPT.FLOWUNID=:FLOWUNID";
|
||||
sql="SELECT LRPT.SUMINTE - LRP.SUMINTE 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,LCI.DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMERID,CIF.CUSTOMERNAME FROM LB_CONTRACT_INFO LCI INNER JOIN (SELECT MAX(CONTRACT_ID) CONTRACT_ID,SUM(ROUND(INTEREST / 1.06, 2)) SUMINTE, FLOWUNID FROM LC_RENT_PLAN_TEMP GROUP BY FLOWUNID) LRPT ON LRPT.CONTRACT_ID = LCI.ID INNER JOIN (SELECT CONTRACT_ID,SUM(ROUND(INTEREST / 1.06, 2)) SUMINTE FROM LC_RENT_PLAN GROUP BY CONTRACT_ID) LRP ON LRP.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 WHERE LRPT.FLOWUNID = :FLOWUNID ";
|
||||
}
|
||||
|
||||
if("PZ2018072100000050".equals(VOUCHERNO)){
|
||||
sql="SELECT LRPT.SUMINTE-LRP.SUMINTE 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,LCI."
|
||||
+ "DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME FROM LB_CONTRACT_INFO LCI "
|
||||
+ "INNER JOIN (SELECT MAX(CONTRACT_ID) CONTRACT_ID,SUM(INTEREST-ROUND(INTEREST/1.06,2))"
|
||||
+ " SUMINTE, FLOWUNID FROM LC_RENT_PLAN_TEMP GROUP BY FLOWUNID) LRPT ON "
|
||||
+ "LRPT.CONTRACT_ID=LCI.ID INNER JOIN (SELECT CONTRACT_ID,SUM(INTEREST-ROUND(INTEREST/1.06,2))"
|
||||
+ " SUMINTE FROM LC_RENT_PLAN GROUP BY CONTRACT_ID) LRP ON LRP."
|
||||
+ "CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO="
|
||||
+ "LCI.DISTRIBUTOR_ID WHERE LRPT.FLOWUNID=:FLOWUNID";
|
||||
sql="SELECT LRPT.SUMINTE-LRP.SUMINTE 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,LCI.DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME ,CIF.CUSTOMERID,CIF.CUSTOMERNAME FROM LB_CONTRACT_INFO LCI INNER JOIN (SELECT MAX(CONTRACT_ID) CONTRACT_ID,SUM(INTEREST-ROUND(INTEREST/1.06,2))SUMINTE, FLOWUNID FROM LC_RENT_PLAN_TEMP GROUP BY FLOWUNID) LRPT ON LRPT.CONTRACT_ID=LCI.ID INNER JOIN (SELECT CONTRACT_ID,SUM(INTEREST-ROUND(INTEREST/1.06,2)) SUMINTE FROM LC_RENT_PLAN GROUP BY CONTRACT_ID) LRP ON LRP.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 WHERE LRPT.FLOWUNID=:FLOWUNID";
|
||||
}
|
||||
List<Map<String,String>> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map);
|
||||
|
||||
@ -84,6 +66,8 @@ public class CreateVoucherContractOnhireChange {
|
||||
leas_form=dataList.get(i).get("LEAS_FORM").toString();
|
||||
DISTRIBUTOR_ID=dataList.get(i).get("DISTRIBUTOR_ID");
|
||||
DISTRIBUTOR_NAME=dataList.get(i).get("DISTRIBUTOR_NAME");
|
||||
CUSTID=dataList.get(i).get("CUSTOMERID");
|
||||
CUSTNAME=dataList.get(i).get("CUSTOMERNAME");
|
||||
//CARID=dataList.get(i).get("CARID");
|
||||
//CARMODEL=dataList.get(i).get("MODEL");
|
||||
|
||||
@ -98,6 +82,8 @@ public class CreateVoucherContractOnhireChange {
|
||||
param.put("LEAS_FORM",leas_form);
|
||||
param.put("DISTRIBUTOR_ID",DISTRIBUTOR_ID);
|
||||
param.put("DISTRIBUTOR_NAME",DISTRIBUTOR_NAME);
|
||||
param.put("CUSTID",CUSTID);
|
||||
param.put("CUSTNAME",CUSTNAME);
|
||||
//param.put("CARID",CARID);
|
||||
//param.put("CARMODEL",CARMODEL);
|
||||
|
||||
|
||||
@ -31,54 +31,23 @@ public class CreateVoucherContractTerminate {
|
||||
String leas_form=null;
|
||||
String DISTRIBUTOR_ID=null;
|
||||
String DISTRIBUTOR_NAME=null;
|
||||
String CARID=null;
|
||||
String CARMODEL=null;
|
||||
String CUSTID=null;
|
||||
String CUSTNAME=null;
|
||||
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,"
|
||||
+ "LCI.DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME 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 WHERE "
|
||||
+ "LFRA.FLOWUNID=:FLOWUNID";
|
||||
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,LCI.DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMERID,CIF.CUSTOMERNAME 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 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,LCI.DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME 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 WHERE LFRA.FLOWUNID=:FLOWUNID";
|
||||
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,LCI.DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMERID,CIF.CUSTOMERNAME 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 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,LCI.DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME 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 WHERE LFRA.FLOWUNID=:FLOWUNID";
|
||||
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,LCI.DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMERID,CIF.CUSTOMERNAME 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 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,LCI.DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME 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 WHERE LFRA.FLOWUNID=:FLOWUNID";
|
||||
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,LCI.DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMERID,CIF.CUSTOMERNAME 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 WHERE LFRA.FLOWUNID=:FLOWUNID";
|
||||
}
|
||||
List<Map<String,String>> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map);
|
||||
|
||||
@ -100,6 +69,8 @@ public class CreateVoucherContractTerminate {
|
||||
leas_form=dataList.get(i).get("LEAS_FORM").toString();
|
||||
DISTRIBUTOR_ID=dataList.get(i).get("DISTRIBUTOR_ID");
|
||||
DISTRIBUTOR_NAME=dataList.get(i).get("DISTRIBUTOR_NAME");
|
||||
CUSTID=dataList.get(i).get("CUSTOMERID");
|
||||
CUSTNAME=dataList.get(i).get("CUSTOMERNAME");
|
||||
//CARID=dataList.get(i).get("CARID");
|
||||
//CARMODEL=dataList.get(i).get("MODEL");
|
||||
|
||||
@ -114,8 +85,8 @@ public class CreateVoucherContractTerminate {
|
||||
param.put("LEAS_FORM",leas_form);
|
||||
param.put("DISTRIBUTOR_ID",DISTRIBUTOR_ID);
|
||||
param.put("DISTRIBUTOR_NAME",DISTRIBUTOR_NAME);
|
||||
//param.put("CARID",CARID);
|
||||
//param.put("CARMODEL",CARMODEL);
|
||||
param.put("CUSTID",CUSTID);
|
||||
param.put("CUSTNAME",CUSTNAME);
|
||||
|
||||
param.put("FlowUnid", FlowUnid);
|
||||
map.clear();
|
||||
|
||||
@ -34,20 +34,13 @@ public class CreateVoucherCustCautionMoneyIncome extends BaseBussiness{
|
||||
String DISTRIBUTOR_NAME=null;
|
||||
String CARID=null;
|
||||
String CARMODEL=null;
|
||||
String CUSTID=null;
|
||||
String CUSTNAME=null;
|
||||
String sql="";
|
||||
param.clear();
|
||||
map.put("FlowUnid", FlowUnid);
|
||||
map.put("FEE_TYPE", FeeType);
|
||||
sql= "SELECT LFIT.FACT_MONEY AS MONEY,LFIT.FACT_MONEY/1.06 AS MONEYNOTAX,"
|
||||
+ "(LFIT.FACT_MONEY-LFIT.FACT_MONEY/1.06) AS MONEYTAX,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') "
|
||||
+ "AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,"
|
||||
+ "LFIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,"
|
||||
+ "LCI.DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL "
|
||||
+ "FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI "
|
||||
+ "ON LFIT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON "
|
||||
+ "DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR "
|
||||
+ "LEC ON LEC.CONTRACT_ID=LCI.ID WHERE LFIT.FEE_TYPE=:FEE_TYPE "
|
||||
+ "AND LFIT.FLOWUNID=:FLOWUNID ";
|
||||
sql= "SELECT LFIT.FACT_MONEY AS MONEY,LFIT.FACT_MONEY/1.06 AS MONEYNOTAX,(LFIT.FACT_MONEY-LFIT.FACT_MONEY/1.06) AS MONEYTAX,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LFIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,LCI.DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL ,CIF.CUSTOMERID,CIF.CUSTOMERNAME FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LFIT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id WHERE LFIT.FEE_TYPE=:FEE_TYPE AND LFIT.FLOWUNID=:FLOWUNID ";
|
||||
|
||||
|
||||
List<Map<String,String>> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map);
|
||||
@ -72,6 +65,8 @@ public class CreateVoucherCustCautionMoneyIncome extends BaseBussiness{
|
||||
DISTRIBUTOR_NAME=dataList.get(i).get("DISTRIBUTOR_NAME");
|
||||
CARID=dataList.get(i).get("CARID");
|
||||
CARMODEL=dataList.get(i).get("MODEL");
|
||||
CUSTID=dataList.get(i).get("CUSTOMERID");
|
||||
CUSTNAME=dataList.get(i).get("CUSTOMERNAME");
|
||||
|
||||
param.put("FACT_MONEY",MONEY);
|
||||
param.put("INTERESTNOTAX",MONEYNOTAX);
|
||||
@ -86,6 +81,8 @@ public class CreateVoucherCustCautionMoneyIncome extends BaseBussiness{
|
||||
param.put("DISTRIBUTOR_NAME",DISTRIBUTOR_NAME);
|
||||
param.put("CARID",CARID);
|
||||
param.put("CARMODEL",CARMODEL);
|
||||
param.put("CUSTID",CUSTID);
|
||||
param.put("CUSTNAME",CUSTNAME);
|
||||
|
||||
param.put("FlowUnid", FlowUnid);
|
||||
map.clear();
|
||||
|
||||
@ -42,22 +42,12 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception {
|
||||
String DISTRIBUTOR_NAME=null;
|
||||
String CARID=null;
|
||||
String CARMODEL=null;
|
||||
String CUSTID=null;
|
||||
String CUSTNAME=null;
|
||||
//String FlowUnid=this.getAttribute("FlowUnid").toString();
|
||||
//String VOUCHERNO="PZ2018071000000005";
|
||||
//String VOUCHERNO=this.getAttribute("VoucherNo").toString();
|
||||
String sql="SELECT LCCT.EQUIP_AMT,LCCT.FIRST_PAYMENT,LCCT.CLEAN_LEASE_MONEY,"
|
||||
+ "LCCT.INSURANCE_PREMIUM,LCCT.PURCHASE_TAX,LCCT.INCIDENTAL,"
|
||||
+ "LCCT.GPS_FEE_FINANCE,LRPT.INTEREST,LRPT.INTERESTNOTAX,LRPT.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,LCI.DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,"
|
||||
+ "LEC.ID AS CARID,LEC.MODEL FROM LC_CALC_CONDITION_TEMP LCCT LEFT JOIN "
|
||||
+ "LB_CONTRACT_INFO LCI ON LCI.ID=LCCT.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,"
|
||||
+ "SUM(INTEREST) AS INTEREST,SUM(ROUND((INTEREST/1.06),2)) AS INTERESTNOTAX,"
|
||||
+ "SUM(INTEREST-ROUND((INTEREST/1.06),2)) AS TAX FROM LC_RENT_PLAN_TEMP "
|
||||
+ "GROUP BY FLOWUNID) LRPT ON LRPT.FLOWUNID=LCCT.FLOWUNID LEFT JOIN "
|
||||
+ "DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN "
|
||||
+ "LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID WHERE LCCT.FLOWUNID=:FLOWUNID";
|
||||
String sql="SELECT LCCT.EQUIP_AMT,LCCT.FIRST_PAYMENT,LCCT.CLEAN_LEASE_MONEY,LCCT.INSURANCE_PREMIUM,LCCT.PURCHASE_TAX,LCCT.INCIDENTAL,LCCT.GPS_FEE_FINANCE,LRPT.INTEREST,LRPT.INTERESTNOTAX,LRPT.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,LCI.DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMERID,CIF.CUSTOMERNAME FROM LC_CALC_CONDITION_TEMP LCCT LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LCCT.CONTRACT_ID LEFT JOIN (SELECT FLOWUNID,SUM(INTEREST) AS INTEREST,SUM(ROUND((INTEREST/1.06),2)) AS INTERESTNOTAX,SUM(INTEREST-ROUND((INTEREST/1.06),2)) AS TAX FROM LC_RENT_PLAN_TEMP GROUP BY FLOWUNID) LRPT ON LRPT.FLOWUNID=LCCT.FLOWUNID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id WHERE LCCT.FLOWUNID=:FLOWUNID";
|
||||
param.clear();
|
||||
map.put("FLOWUNID", FlowUnid);
|
||||
|
||||
@ -89,6 +79,8 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception {
|
||||
DISTRIBUTOR_NAME=dataList.get(i).get("DISTRIBUTOR_NAME");
|
||||
CARID=dataList.get(i).get("CARID");
|
||||
CARMODEL=dataList.get(i).get("MODEL");
|
||||
CUSTID=dataList.get(i).get("CUSTOMERID");
|
||||
CUSTNAME=dataList.get(i).get("CUSTOMERNAME");
|
||||
|
||||
|
||||
param.put("EQUIP_AMT",EQUIP_AMT);
|
||||
@ -111,7 +103,8 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception {
|
||||
param.put("DISTRIBUTOR_NAME",DISTRIBUTOR_NAME);
|
||||
param.put("CARID",CARID);
|
||||
param.put("CARMODEL",CARMODEL);
|
||||
|
||||
param.put("CUSTID",CUSTID);
|
||||
param.put("CUSTNAME",CUSTNAME);
|
||||
|
||||
param.put("FlowUnid", FlowUnid);
|
||||
map.clear();
|
||||
|
||||
@ -35,20 +35,14 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception {
|
||||
String DISTRIBUTOR_NAME=null;
|
||||
String CARID=null;
|
||||
String CARMODEL=null;
|
||||
String CUSTID=null;
|
||||
String CUSTNAME=null;
|
||||
//String FlowUnid=this.getAttribute("FlowUnid").toString();
|
||||
String sql="";
|
||||
//String VOUCHERNO=this.getAttribute("VoucherNo").toString();
|
||||
param.clear();
|
||||
map.put("FlowUnid", FlowUnid);
|
||||
sql= "SELECT LCCT.HANDLING_CHARGE_MONEY AS MONEY,LCCT.HANDLING_CHARGE_MONEY/1.06 "
|
||||
+ "AS HANDLFEENOTAX,(LCCT.HANDLING_CHARGE_MONEY-LCCT.HANDLING_CHARGE_MONEY/1.06)"
|
||||
+ " AS HANDLTAX,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,LCI.DISTRIBUTOR_ID,"
|
||||
+ "DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL FROM LC_CALC_CONDITION_TEMP "
|
||||
+ "LCCT LEFT JOIN LB_CONTRACT_INFO LCI ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN "
|
||||
+ "DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN "
|
||||
+ "LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID WHERE LCCT.FLOWUNID=:FLOWUNID";
|
||||
sql= "SELECT LCCT.HANDLING_CHARGE_MONEY AS MONEY,LCCT.HANDLING_CHARGE_MONEY/1.06 AS HANDLFEENOTAX,(LCCT.HANDLING_CHARGE_MONEY-LCCT.HANDLING_CHARGE_MONEY/1.06)AS HANDLTAX,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,LCI.DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL ,CIF.CUSTOMERID,CIF.CUSTOMERNAME FROM LC_CALC_CONDITION_TEMP LCCT LEFT JOIN LB_CONTRACT_INFO LCI ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id WHERE LCCT.FLOWUNID=:FLOWUNID";
|
||||
|
||||
List<Map<String,String>> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map);
|
||||
|
||||
@ -73,6 +67,8 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception {
|
||||
DISTRIBUTOR_NAME=dataList.get(i).get("DISTRIBUTOR_NAME");
|
||||
CARID=dataList.get(i).get("CARID");
|
||||
CARMODEL=dataList.get(i).get("MODEL");
|
||||
CUSTID=dataList.get(i).get("CUSTOMERID");
|
||||
CUSTNAME=dataList.get(i).get("CUSTOMERNAME");
|
||||
|
||||
param.put("FACT_MONEY",MONEY);
|
||||
param.put("INTERESTNOTAX",MONEYNOTAX);
|
||||
@ -87,7 +83,8 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception {
|
||||
param.put("DISTRIBUTOR_NAME",DISTRIBUTOR_NAME);
|
||||
param.put("CARID",CARID);
|
||||
param.put("CARMODEL",CARMODEL);
|
||||
|
||||
param.put("CUSTID",CUSTID);
|
||||
param.put("CUSTNAME",CUSTNAME);
|
||||
|
||||
param.put("FlowUnid", FlowUnid);
|
||||
map.clear();
|
||||
|
||||
@ -23,6 +23,8 @@ public class CreateVoucherLoanDistributor {
|
||||
Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource());
|
||||
|
||||
String MONEY=null;
|
||||
String MONEYNOTAX=null;
|
||||
String MONEYTAX=null;
|
||||
String ACCOUNT_DATE=null;
|
||||
String FACT_DATE=null;
|
||||
String CONTRACT_ID=null;
|
||||
@ -33,11 +35,13 @@ public class CreateVoucherLoanDistributor {
|
||||
String DISTRIBUTOR_NAME=null;
|
||||
String CARID=null;
|
||||
String CARMODEL=null;
|
||||
String CUSTID=null;
|
||||
String CUSTNAME=null;
|
||||
String sql="";
|
||||
String moneyDataSource="";
|
||||
param.clear();
|
||||
map.put("FlowUnid", FlowUnid);
|
||||
if("PZ2018070900000002".equals(VOUCHERNO)){
|
||||
if("PZ2018070900000002".equals(VOUCHERNO)||"PZ2018072400000060".equals(VOUCHERNO)){
|
||||
moneyDataSource="LCCT.EQUIP_AMT";
|
||||
}
|
||||
if("PZ2018070900000003".equals(VOUCHERNO)){
|
||||
@ -46,14 +50,8 @@ public class CreateVoucherLoanDistributor {
|
||||
if("PZ2018070900000004".equals(VOUCHERNO)||"PZ2018071000000006".equals(VOUCHERNO)){
|
||||
moneyDataSource="LCCT.CAUTION_MONEY";
|
||||
}
|
||||
sql= "SELECT "+moneyDataSource+" AS MONEY,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,LCI.DISTRIBUTOR_ID,"
|
||||
+ "DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL FROM LC_CALC_CONDITION_TEMP "
|
||||
+ "LCCT LEFT JOIN LB_CONTRACT_INFO LCI ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN "
|
||||
+ "DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN "
|
||||
+ "LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID WHERE LCCT.FLOWUNID=:FLOWUNID";
|
||||
|
||||
//sql= "SELECT "+moneyDataSource+ " AS MONEY,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,LCI.DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMERID,CIF.CUSTOMERNAME FROM LC_CALC_CONDITION_TEMP LCCT LEFT JOIN LB_CONTRACT_INFO LCI ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id WHERE LCCT.FLOWUNID=:FLOWUNID";
|
||||
sql="SELECT "+moneyDataSource+ " AS MONEY,round("+moneyDataSource+ "/1.17,2) as MONEYNOTAX, ("+moneyDataSource+ "-ROUND("+moneyDataSource+ "/1.17,2)) as MONEYTAX,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,LCI.DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMERID,CIF.CUSTOMERNAME FROM LC_CALC_CONDITION_TEMP LCCT LEFT JOIN LB_CONTRACT_INFO LCI ON LCCT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id WHERE LCCT.FLOWUNID=:FLOWUNID";
|
||||
List<Map<String,String>> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map);
|
||||
|
||||
CreateVoucherServiceImpl vs=new CreateVoucherServiceImpl();
|
||||
@ -64,6 +62,8 @@ public class CreateVoucherLoanDistributor {
|
||||
if("".equals(MONEY)||MONEY==null) MONEY="0.00";
|
||||
double mon=Double.parseDouble(MONEY);
|
||||
if(mon>0){
|
||||
MONEYNOTAX=dataList.get(i).get("MONEYNOTAX").toString();
|
||||
MONEYTAX=dataList.get(i).get("MONEYTAX").toString();
|
||||
ACCOUNT_DATE=dataList.get(i).get("ACCOUNT_DATE").toString();
|
||||
FACT_DATE =dataList.get(i).get("FACT_DATE").toString();
|
||||
CONTRACT_ID=dataList.get(i).get("CONTRACT_ID").toString();
|
||||
@ -74,8 +74,12 @@ public class CreateVoucherLoanDistributor {
|
||||
DISTRIBUTOR_NAME=dataList.get(i).get("DISTRIBUTOR_NAME");
|
||||
CARID=dataList.get(i).get("CARID");
|
||||
CARMODEL=dataList.get(i).get("MODEL");
|
||||
CUSTID=dataList.get(i).get("CUSTOMERID");
|
||||
CUSTNAME=dataList.get(i).get("CUSTOMERNAME");
|
||||
|
||||
param.put("FACT_MONEY",MONEY);
|
||||
param.put("INTERESTNOTAX",MONEYNOTAX);
|
||||
param.put("TAX",MONEYTAX);
|
||||
param.put("ACCOUNT_DATE",ACCOUNT_DATE);
|
||||
param.put("FACT_DATE",FACT_DATE);
|
||||
param.put("CONTRACT_ID",CONTRACT_ID);
|
||||
@ -86,6 +90,8 @@ public class CreateVoucherLoanDistributor {
|
||||
param.put("DISTRIBUTOR_NAME",DISTRIBUTOR_NAME);
|
||||
param.put("CARID",CARID);
|
||||
param.put("CARMODEL",CARMODEL);
|
||||
param.put("CUSTID",CUSTID);
|
||||
param.put("CUSTNAME",CUSTNAME);
|
||||
|
||||
param.put("FlowUnid", FlowUnid);
|
||||
map.clear();
|
||||
|
||||
@ -0,0 +1,16 @@
|
||||
package com.tenwa.voucher.CreateVoucherProcess.CreateVoucherMethodSettle;
|
||||
|
||||
import com.amarsoft.awe.util.Transaction;
|
||||
import com.tenwa.flow.baseBussion.BaseBussiness;
|
||||
import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherCustCautionMoneyIncome;
|
||||
|
||||
public class CautionMoneyVoucher extends BaseBussiness {
|
||||
@Override
|
||||
public Object run(Transaction Sqlca) throws Exception {
|
||||
this.initBussinessParam(Sqlca);
|
||||
String FlowUnid=this.getAttribute("FlowUnid").toString();
|
||||
CreateVoucherCustCautionMoneyIncome cvcc=new CreateVoucherCustCautionMoneyIncome();
|
||||
cvcc.CreateVoucher(FlowUnid, "PZ2018072400000059", "feetype17");//Í˻ر£Ö¤½ð
|
||||
return "true";
|
||||
}
|
||||
}
|
||||
@ -14,7 +14,8 @@ public class ContractOnhireVoucher extends BaseBussiness {
|
||||
this.initBussinessParam(Sqlca);
|
||||
String FlowUnid=this.getAttribute("FlowUnid").toString();
|
||||
CreateVoucherLoanDistributor cvld=new CreateVoucherLoanDistributor();
|
||||
cvld.CreateVoucher(FlowUnid, "PZ2018070900000002");//记录给经销商放款-车款全款
|
||||
cvld.CreateVoucher(FlowUnid, "PZ2018070900000002");//记录给经销商放款-车款全款-回
|
||||
cvld.CreateVoucher(FlowUnid, "PZ2018072400000060");//记录给经销商放款-车款全款-直
|
||||
cvld.CreateVoucher(FlowUnid, "PZ2018070900000003");//经销商支付的预付款(首付)
|
||||
cvld.CreateVoucher(FlowUnid, "PZ2018070900000004");//记录保证金（合同结束后要退回给客户，或者冲抵其他款项）
|
||||
cvld.CreateVoucher(FlowUnid, "PZ2018071000000006");//给经销商放款冲抵客户保证金
|
||||
|
||||
@ -38,29 +38,17 @@ public class CreateVoucherMonthSettlement{
|
||||
String DISTRIBUTOR_NAME=null;
|
||||
String CARID=null;
|
||||
String CARMODEL=null;
|
||||
String CUSTID=null;
|
||||
String CUSTNAME=null;
|
||||
param.clear();
|
||||
String sql="";
|
||||
String moneyType="MONEY";
|
||||
if("PZ2018071200000017".equals(voucherNo)) moneyType="FEEMONEY";
|
||||
if("PZ2018071200000016".equals(voucherNo)) moneyType="MONEY";
|
||||
sql="SELECT CRM.INTEREST AS MONEY,CRM.FEE AS FEEMONEY,'2018/07/31' "
|
||||
+ "AS ACCOUNT_DATE,'2018/07/31' AS FACT_DATE,CRM.CONTRACT_ID,"
|
||||
+ "LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,LCI.DISTRIBUTOR_ID,"
|
||||
+ "DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL FROM CONTRACT_RENT_MONTH "
|
||||
+ "CRM LEFT JOIN LB_CONTRACT_INFO LCI ON CRM.CONTRACT_ID=LCI.ID LEFT JOIN "
|
||||
+ "DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN "
|
||||
+ "LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID WHERE CRM.END_DATE='2018/07/31'";
|
||||
sql="SELECT CRM.INTEREST AS MONEY,CRM.FEE AS FEEMONEY,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,CRM.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,LCI.DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CUSTOMERID,CIF.CUSTOMERNAME FROM CONTRACT_RENT_MONTH CRM LEFT JOIN LB_CONTRACT_INFO LCI ON CRM.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id WHERE DATE_FORMAT(str_to_date(CRM.END_DATE,'%Y/%m/%d'),'%Y/%m/%d')=DATE_FORMAT(SYSDATE(),'%Y/%m/%d')";
|
||||
|
||||
if("PZ2018072100000055".equals(voucherNo)){
|
||||
sql="SELECT LRP.INTEREST-ROUND(LRP.INTEREST/1.06,2) AS MONEY,"
|
||||
+ "DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT"
|
||||
+ "(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LCI.ID as CONTRACT_ID,LCI.CONTRACT_NUMBER,"
|
||||
+ "LCI.PROJECT_NAME,LCI.LEAS_FORM,LCI.DISTRIBUTOR_ID,"
|
||||
+ "DI.DISTRIBUTOR_NAME FROM LC_RENT_PLAN LRP INNER JOIN "
|
||||
+ "LB_CONTRACT_INFO LCI ON LCI.ID=LRP.CONTRACT_ID INNER JOIN "
|
||||
+ "DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID "
|
||||
+ "WHERE DATE_FORMAT(SYSDATE(),'%Y/%m/%d')=DATE_FORMAT"
|
||||
+ "(STR_TO_DATE(LRP.PLAN_DATE,'%Y/%m/%d'),'%Y/%m/%d')";
|
||||
sql="SELECT LRP.INTEREST-ROUND(LRP.INTEREST/1.06,2) AS MONEY,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LCI.ID as CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,LCI.DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMERID,CIF.CUSTOMERNAME FROM LC_RENT_PLAN LRP INNER JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LRP.CONTRACT_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 WHERE DATE_FORMAT(SYSDATE(),'%Y/%m/%d')=DATE_FORMAT(STR_TO_DATE(LRP.PLAN_DATE,'%Y/%m/%d'),'%Y/%m/%d')";
|
||||
}
|
||||
|
||||
List<Map<String,String>> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map);
|
||||
@ -85,6 +73,8 @@ public class CreateVoucherMonthSettlement{
|
||||
DISTRIBUTOR_NAME=dataList.get(i).get("DISTRIBUTOR_NAME");
|
||||
CARID=dataList.get(i).get("CARID");
|
||||
CARMODEL=dataList.get(i).get("MODEL");
|
||||
CUSTID=dataList.get(i).get("CUSTOMERID");
|
||||
CUSTNAME=dataList.get(i).get("CUSTOMERNAME");
|
||||
|
||||
param.put("FACT_MONEY",MONEY);
|
||||
//param.put("FACT_MONEY",FEEMONEY);
|
||||
@ -98,6 +88,8 @@ public class CreateVoucherMonthSettlement{
|
||||
param.put("DISTRIBUTOR_NAME",DISTRIBUTOR_NAME);
|
||||
param.put("CARID",CARID);
|
||||
param.put("CARMODEL",CARMODEL);
|
||||
param.put("CUSTID",CUSTID);
|
||||
param.put("CUSTNAME",CUSTNAME);
|
||||
|
||||
map.clear();
|
||||
map.put("PROJ_TYPE", leas_form);
|
||||
|
||||
@ -31,28 +31,16 @@ public class CreateVoucherRentIncome {
|
||||
String DISTRIBUTOR_NAME=null;
|
||||
String CARID=null;
|
||||
String CARMODEL=null;
|
||||
String CUSTID=null;
|
||||
String CUSTNAME=null;
|
||||
String sql="";
|
||||
param.clear();
|
||||
map.put("FlowUnid", FlowUnid);
|
||||
map.put("FLOWUNID", FlowUnid);
|
||||
if("PZ2018072100000024".equals(VOUCHERNO)){
|
||||
sql= "SELECT LrIT.rent AS MONEY,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') "
|
||||
+ "AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,"
|
||||
+ "LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,"
|
||||
+ "LCI.DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LrIT.FLOWUNID FROM "
|
||||
+ "LC_rent_INCOME_TEMP LrIT LEFT JOIN LB_CONTRACT_INFO LCI ON "
|
||||
+ "LrIT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON "
|
||||
+ "DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR "
|
||||
+ "LEC ON LEC.CONTRACT_ID=LCI.ID WHERE LrIT.FLOWUNID=:FLOWUNID ";
|
||||
sql= "SELECT LRIT.rent AS MONEY,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,LCI.DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LrIT.FLOWUNID,CIF.CUSTOMERID,CIF.CUSTOMERNAME FROM LC_rent_INCOME_TEMP LrIT LEFT JOIN LB_CONTRACT_INFO LCI ON LrIT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id WHERE LrIT.FLOWUNID=:FLOWUNID";
|
||||
}
|
||||
if("PZ2018072100000025".equals(VOUCHERNO)){
|
||||
sql= "SELECT LrIT.penalty AS MONEY,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') "
|
||||
+ "AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,"
|
||||
+ "LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,"
|
||||
+ "LCI.DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LrIT.FLOWUNID FROM "
|
||||
+ "LC_rent_INCOME_TEMP LrIT LEFT JOIN LB_CONTRACT_INFO LCI ON "
|
||||
+ "LrIT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON "
|
||||
+ "DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR "
|
||||
+ "LEC ON LEC.CONTRACT_ID=LCI.ID WHERE LrIT.FLOWUNID=:FLOWUNID ";
|
||||
sql= "SELECT LrIT.penalty AS MONEY,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LrIT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,LCI.DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LrIT.FLOWUNID,CIF.CUSTOMERID,CIF.CUSTOMERNAME FROM LC_rent_INCOME_TEMP LrIT LEFT JOIN LB_CONTRACT_INFO LCI ON LrIT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.ID LEFT JOIN lb_union_lessee lul ON lul.contract_id=lci.id LEFT JOIN customer_info cif ON cif.customerid=lul.customer_id WHERE LrIT.FLOWUNID=:FLOWUNID";
|
||||
}
|
||||
List<Map<String,String>> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map);
|
||||
|
||||
@ -74,6 +62,8 @@ public class CreateVoucherRentIncome {
|
||||
DISTRIBUTOR_NAME=dataList.get(i).get("DISTRIBUTOR_NAME");
|
||||
CARID=dataList.get(i).get("CARID");
|
||||
CARMODEL=dataList.get(i).get("MODEL");
|
||||
CUSTID=dataList.get(i).get("CUSTOMERID");
|
||||
CUSTNAME=dataList.get(i).get("CUSTOMERNAME");
|
||||
|
||||
param.put("FACT_MONEY",MONEY);
|
||||
param.put("ACCOUNT_DATE",ACCOUNT_DATE);
|
||||
@ -86,6 +76,8 @@ public class CreateVoucherRentIncome {
|
||||
param.put("DISTRIBUTOR_NAME",DISTRIBUTOR_NAME);
|
||||
param.put("CARID",CARID);
|
||||
param.put("CARMODEL",CARMODEL);
|
||||
param.put("CUSTID",CUSTID);
|
||||
param.put("CUSTNAME",CUSTNAME);
|
||||
|
||||
param.put("FlowUnid", FlowUnid);
|
||||
map.clear();
|
||||
|
||||
@ -125,9 +125,10 @@ public class VoucherToV8Impl implements VoucherService {
|
||||
d.put("F62",list.get(i).get("F6"));
|
||||
|
||||
d.put("F60",list.get(i).get("CONTRACT_NUMBER"));
|
||||
d.put("F61",list.get(i).get("PROJECT_NAME"));
|
||||
d.put("F61",list.get(i).get("CUSTNAME"));
|
||||
d.put("F66",list.get(i).get("DISTRIBUTOR_NAME"));
|
||||
d.put("F64",list.get(i).get("CARMODEL"));
|
||||
d.put("F64","汽车");
|
||||
d.put("F63","业务二部");
|
||||
|
||||
d.put("inputuserid",user.getAttribute("userid").getString());
|
||||
d.put("v8_status",status);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user