From 8af33ae32c16d5884c653cdf18ced75fc17538b9 Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Mon, 6 Sep 2021 16:24:42 +0800 Subject: [PATCH 01/26] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E7=BB=8F=E9=94=80?= =?UTF-8?q?=E5=95=86=EF=BC=8C=E8=B4=B4=E6=81=AF=E5=AD=97=E6=AE=B5=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp index db72d1d38..265eb43b7 100644 --- a/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp +++ b/WebContent/Accounting/LoanSimulation/LoanBasicInfo.jsp @@ -198,7 +198,7 @@ if(CurUser.hasRole("401")){ doTemp.setVisible("CAUTION_MONEY_METHOD",false); doTemp.setVisible("DISCOUNT", false); - doTemp.setVisible("DISCOUNT_INTEREST", false); + //doTemp.setVisible("DISCOUNT_INTEREST", true); // doTemp.setColumnAttribute("DISCOUNT","colvisible","0"); } if(CurUser.hasRole("800R00000013")||CurUser.hasRole("800R00000014")||CurUser.hasRole("800R00000015")){ From 5c43d3ff442bb1f1105e12859acbdfd63d7f50d9 Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Tue, 7 Sep 2021 14:44:03 +0800 Subject: [PATCH 02/26] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=93=E6=B8=85?= =?UTF-8?q?=E4=B8=8A=E5=8D=88=E6=9D=A1=E4=BB=B6=E6=97=A0=E6=B3=95=E6=89=93?= =?UTF-8?q?=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Accounting/LoanSimulation_new/LoanBasicInfo.jsp | 2 +- WebContent/Accounting/LoanSimulation_old/LoanBasicInfo.jsp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WebContent/Accounting/LoanSimulation_new/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation_new/LoanBasicInfo.jsp index 930747909..5ff957b26 100644 --- a/WebContent/Accounting/LoanSimulation_new/LoanBasicInfo.jsp +++ b/WebContent/Accounting/LoanSimulation_new/LoanBasicInfo.jsp @@ -36,7 +36,7 @@ //费用规则 ProductCondition pc=new ProductCondition(); - String calcRules=pc.getProductRules(doTemp, productId,vali); + String calcRules=pc.getProductRules(doTemp, productId,vali,flowunid); //获取产品名称 BizObject bo = JBOFactory.createBizObjectQuery(BUSINESS_TYPE.CLASS_NAME,"typeno=:productID") .setParameter("productID", productId).getSingleResult(false); diff --git a/WebContent/Accounting/LoanSimulation_old/LoanBasicInfo.jsp b/WebContent/Accounting/LoanSimulation_old/LoanBasicInfo.jsp index a289e8fd8..4754bbd51 100644 --- a/WebContent/Accounting/LoanSimulation_old/LoanBasicInfo.jsp +++ b/WebContent/Accounting/LoanSimulation_old/LoanBasicInfo.jsp @@ -36,7 +36,7 @@ //费用规则 ProductCondition pc=new ProductCondition(); - String calcRules=pc.getProductRules(doTemp, productId,vali); + String calcRules=pc.getProductRules(doTemp, productId,vali,flowunid); //获取产品名称 BizObject bo = JBOFactory.createBizObjectQuery(BUSINESS_TYPE.CLASS_NAME,"typeno=:productID") .setParameter("productID", productId).getSingleResult(false); From 5f09982b1fe7ebccea4b143e9932ee1b179bd07a Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Tue, 7 Sep 2021 16:20:35 +0800 Subject: [PATCH 03/26] =?UTF-8?q?=E7=BB=93=E6=B8=85=E6=89=8B=E7=BB=AD?= =?UTF-8?q?=E8=B4=B9=E5=87=AD=E8=AF=81=E5=A2=9E=E5=8A=A0=E6=8C=89=E6=9C=88?= =?UTF-8?q?=E5=88=86=E6=91=8A=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateVoucherProcess/CreateVoucherContractTerminate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java index 6ccab92fe..bb31ae657 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java @@ -92,7 +92,7 @@ public class CreateVoucherContractTerminate { // 确认手续费 }else if("PZ2018081700000122".equals(VOUCHERNO)) { //sql="SELECT IFNULL(CRM.FEE, 0) AS MONEY,ROUND(IFNULL(CRM.FEE, 0)/getTax(LCI.LEAS_FORM,'手续费',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(CRM.FEE, 0) - ROUND(IFNULL(CRM.FEE, 0)/getTax(LCI.LEAS_FORM,'手续费',LCCT.START_DATE),2)) AS MONEYTAX,DATE_FORMAT(LCRAT.PAYDAY_ADJUST, '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(LCRAT.PAYDAY_ADJUST, '%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,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_FUND_RENT_ADJUST_TEMP LCRAT LEFT JOIN (SELECT MAX(LRPT.FLOWUNID) FLOWUNID,CRM.CONTRACT_ID,SUM(IFNULL(CRM.FEE, 0)) AS FEE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN (SELECT LRPT.FLOWUNID,LRPT.CONTRACT_ID,MAX(LCRAT.PAYDAY_ADJUST) PAYDAY_ADJUST FROM LC_RENT_PLAN_TEMP LRPT LEFT JOIN LC_FUND_RENT_ADJUST_TEMP LCRAT ON LCRAT.FLOWUNID = LRPT.FLOWUNID AND LCRAT.PAYMENT_NUMBER = LRPT.PAYMENT_NUMBER GROUP BY LRPT.FLOWUNID,LRPT.CONTRACT_ID) LRPT ON LRPT.CONTRACT_ID = CRM.CONTRACT_ID WHERE DATE_FORMAT(CRM.END_DATE, '%Y%m') >= DATE_FORMAT(LRPT.PAYDAY_ADJUST, '%Y%m') GROUP BY CRM.CONTRACT_ID) CRM ON CRM.FLOWUNID = LCRAT.FLOWUNID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = CRM.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID = LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID = LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN='Y' AND LCRAT.FLOWUNID = :FLOWUNID "; - sql="SELECT IFNULL(CRM.FEE, 0) AS MONEY,ROUND(IFNULL(CRM.FEE, 0) / getTax(LCI.LEAS_FORM,'手续费',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(CRM.FEE, 0) - ROUND(IFNULL(CRM.FEE, 0) / getTax(LCI.LEAS_FORM,'手续费',LCCT.START_DATE),2)) AS MONEYTAX,DATE_FORMAT(NOW(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(LE.FACT_DATE, '%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,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_FUND_RENT_ADJUST_TEMP LCRAT LEFT JOIN (SELECT FLOWUNID,MAX(FACT_DATE) AS FACT_DATE FROM LC_EBANK_TEMP GROUP BY FLOWUNID) LE ON LE.FLOWUNID=LCRAT.FLOWUNID LEFT JOIN (SELECT MAX(LRPT.FLOWUNID) FLOWUNID,CRM.CONTRACT_ID,SUM(IFNULL(CRM.FEE, 0)) AS FEE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN (SELECT LRPT.FLOWUNID,LRPT.CONTRACT_ID,MAX(LCRAT.PAYDAY_ADJUST) PAYDAY_ADJUST FROM LC_RENT_PLAN_TEMP LRPT LEFT JOIN LC_FUND_RENT_ADJUST_TEMP LCRAT ON LCRAT.FLOWUNID = LRPT.FLOWUNID AND LCRAT.PAYMENT_NUMBER = LRPT.PAYMENT_NUMBER GROUP BY LRPT.FLOWUNID,LRPT.CONTRACT_ID) LRPT ON LRPT.CONTRACT_ID = CRM.CONTRACT_ID WHERE DATE_FORMAT(CRM.END_DATE, '%Y%m') >= DATE_FORMAT(LRPT.PAYDAY_ADJUST, '%Y%m') GROUP BY CRM.CONTRACT_ID) CRM ON CRM.FLOWUNID = LCRAT.FLOWUNID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = CRM.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID = LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID = LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND IFNULL(CRM.FEE, 0)>0 AND LCRAT.FLOWUNID = :FLOWUNID "; + sql="SELECT IFNULL(CRM.FEE, 0) AS MONEY, ROUND( IFNULL(CRM.FEE, 0) / getTax ( LCI.LEAS_FORM, '手续费', LCCT.START_DATE ), 2 ) AS MONEYNOTAX, ( IFNULL(CRM.FEE, 0) - ROUND( IFNULL(CRM.FEE, 0) / getTax ( LCI.LEAS_FORM, '手续费', LCCT.START_DATE ), 2 ) ) AS MONEYTAX, DATE_FORMAT(NOW(), '%Y/%m/%d') AS ACCOUNT_DATE, DATE_FORMAT(LE.FACT_DATE, '%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, DI.F_I_TYPE, CIF.CUSTOMER_NUM AS CUSTOMERID, CIF.CUSTOMERNAME, CIF.CUSTOMERTYPE, LPI.BUSINESSTYPE FROM LC_FUND_RENT_ADJUST_TEMP LCRAT LEFT JOIN (SELECT FLOWUNID, MAX(FACT_DATE) AS FACT_DATE FROM LC_EBANK_TEMP GROUP BY FLOWUNID) LE ON LE.FLOWUNID = LCRAT.FLOWUNID LEFT JOIN (SELECT MAX(LRPT.FLOWUNID) FLOWUNID, CRM.CONTRACT_ID, SUM(IFNULL(CRM.FEE, 0)) AS FEE FROM CONTRACT_RENT_MONTH CRM LEFT JOIN (SELECT LRPT.FLOWUNID, LRPT.CONTRACT_ID, MAX(LCRAT.PAYDAY_ADJUST) PAYDAY_ADJUST FROM LC_RENT_PLAN_TEMP LRPT LEFT JOIN LC_FUND_RENT_ADJUST_TEMP LCRAT ON LCRAT.FLOWUNID = LRPT.FLOWUNID AND LCRAT.PAYMENT_NUMBER = LRPT.PAYMENT_NUMBER GROUP BY LRPT.FLOWUNID, LRPT.CONTRACT_ID) LRPT ON LRPT.CONTRACT_ID = CRM.CONTRACT_ID WHERE DATE_FORMAT(CRM.END_DATE, '%Y%m') >= DATE_FORMAT(LRPT.PAYDAY_ADJUST, '%Y%m') GROUP BY CRM.CONTRACT_ID) CRM ON CRM.FLOWUNID = LCRAT.FLOWUNID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = CRM.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID = LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID = LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND LCCT.HANDLING_CHARGE_MONEY_TYPE='0020' AND IFNULL(CRM.FEE, 0) > 0 AND LCRAT.FLOWUNID = :FLOWUNID"; }else { //sql="SELECT ROUND((getTax(lci.LEAS_FORM,'"+taxType+"',LCCT.START_DATE)-1)*100,0) AS TAX_NUM,"+date1+" AS MONEY,ROUND("+date1+"/getTax(LCI.LEAS_FORM,'"+taxType+"',LCCT.START_DATE),2) AS MONEYNOTAX,("+date1+" - ROUND("+date1+"/getTax(LCI.LEAS_FORM,'"+taxType+"',LCCT.START_DATE),2)) AS MONEYTAX,DATE_FORMAT(LCRAT.PAYDAY_ADJUST, '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(LCRAT.PAYDAY_ADJUST, '%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,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_FUND_RENT_ADJUST_TEMP LCRAT LEFT JOIN (SELECT LRPT.CONTRACT_ID,LRPT.FLOWUNID FROM LC_RENT_PLAN_TEMP LRPT GROUP BY LRPT.FLOWUNID,LRPT.CONTRACT_ID) LRPT ON LRPT.FLOWUNID = LCRAT.FLOWUNID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRPT.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID = LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID = LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN='Y' AND LCRAT.FLOWUNID = :FLOWUNID "; sql="SELECT ROUND((getTax(lci.LEAS_FORM,'"+taxType+"',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,"+date1+" AS MONEY,ROUND("+date1+" / getTax(LCI.LEAS_FORM,'"+taxType+"',LCCT.START_DATE),2) AS MONEYNOTAX,("+date1+" - ROUND("+date1+" / getTax(LCI.LEAS_FORM,'"+taxType+"',LCCT.START_DATE),2)) AS MONEYTAX,DATE_FORMAT(NOW(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(LE.FACT_DATE, '%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,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_FUND_RENT_ADJUST_TEMP LCRAT LEFT JOIN (SELECT FLOWUNID,MAX(FACT_DATE) AS FACT_DATE FROM LC_EBANK_TEMP GROUP BY FLOWUNID) LE ON LE.FLOWUNID=LCRAT.FLOWUNID LEFT JOIN (SELECT LRPT.CONTRACT_ID,LRPT.FLOWUNID FROM LC_RENT_PLAN_TEMP LRPT GROUP BY LRPT.FLOWUNID,LRPT.CONTRACT_ID) LRPT ON LRPT.FLOWUNID = LCRAT.FLOWUNID LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRPT.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID = LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID = LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND lul.IS_MAIN = 'Y' AND "+date1+">0 AND LCRAT.FLOWUNID = :FLOWUNID "; From 1adb175c3807d39a1cab5b9a5dc8b2bf7ca4529d Mon Sep 17 00:00:00 2001 From: yjf <2211675158@qq.com> Date: Thu, 9 Sep 2021 17:54:13 +0800 Subject: [PATCH 04/26] =?UTF-8?q?=E8=B4=B4=E6=81=AF=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LCCalcSubsectionInfoTempList.jsp | 16 +++++------ .../LoanSimulation/LoanBasicInfo.jsp | 27 ++++++++++--------- WebContent/WEB-INF/etc/jbo/jbo_calc.xml | 1 + .../reckon/executor/CashFlowExecutor.java | 4 +-- .../executor/SegmentedFinancingExecutor.java | 6 ++--- .../reckon/product/ProductCondition.java | 6 +++-- .../calc/LC_CALC_SUBSECTION_INFO_TEMP.java | 4 +++ 7 files changed, 36 insertions(+), 28 deletions(-) diff --git a/WebContent/Accounting/LoanSimulation/LCCalcSubsectionInfoTempList.jsp b/WebContent/Accounting/LoanSimulation/LCCalcSubsectionInfoTempList.jsp index cefb3c1a8..f9244329d 100644 --- a/WebContent/Accounting/LoanSimulation/LCCalcSubsectionInfoTempList.jsp +++ b/WebContent/Accounting/LoanSimulation/LCCalcSubsectionInfoTempList.jsp @@ -8,7 +8,7 @@ String flowunid = CurPage.getParameter("flowunid"); String projectId = CurPage.getParameter("projectId"); ASObjectModel doTemp = new ASObjectModel("LCCalcSubsectionInfoTemp"); - doTemp.setHtmlEvent( "DISCOUNT", "onblur", "changeDiscount" ); + doTemp.setHtmlEvent( "DISCOUNT_INTEREST", "onblur", "changeDiscount" ); doTemp.setHtmlEvent( "DISCOUNT_RATE", "onblur", "changeDiscountRate" ); doTemp.setHtmlEvent( "CLEAN_LEASE_RATIO", "onblur", "changeCleanLeaseRatio" ); doTemp.setHtmlEvent( "CLEAN_LEASE_MONEY", "onblur", "changeCleanLeaseMoney" ); @@ -16,16 +16,16 @@ String discountCalcMethod = Sqlca.getString("select DISCOUNT_CALC_METHOD from LC_CALC_SUBSECTION_INFO_TEMP where FLOWUNID='"+flowunid+"'"); if(discountCalcMethod != null){ if(discountCalcMethod.equals("1")){ - doTemp.setReadOnly("DISCOUNT",true); + doTemp.setReadOnly("DISCOUNT_INTEREST",true); doTemp.setReadOnly("DISCOUNT_RATE",false); }else if (discountCalcMethod.equals("2")){ - doTemp.setReadOnly("DISCOUNT",false); + doTemp.setReadOnly("DISCOUNT_INTEREST",false); doTemp.setReadOnly("DISCOUNT_RATE",true); }else if (discountCalcMethod.equals("3")){//固定值，对应的值改为只读 doTemp.setReadOnly("DISCOUNT_RATE",true); doTemp.setReadOnly("FINANCING_RATE",true); doTemp.setReadOnly("INCOME_NUMBER",true); - doTemp.setReadOnly("DISCOUNT",true); + doTemp.setReadOnly("DISCOUNT_INTEREST",true); } } ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); @@ -43,19 +43,19 @@ <%@ include file="/Frame/resources/include/include_end.jspf"%> From ed0c035ae23a260446f881dee42f915df7a874bf Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Fri, 17 Sep 2021 17:14:44 +0800 Subject: [PATCH 09/26] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateVoucherDepositDeductionToMoney.java | 6 +- ...CreateVoucherDepositDeductionToMoney2.java | 131 ++++++++++++++++++ .../serviceImp/CreateVoucherServiceImpl.java | 20 +++ .../app/quartzmession/MarginDeduction.java | 9 ++ 4 files changed, 165 insertions(+), 1 deletion(-) create mode 100644 src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionToMoney2.java diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionToMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionToMoney.java index c11c49e31..1623fdbb7 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionToMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionToMoney.java @@ -30,6 +30,7 @@ public class CreateVoucherDepositDeductionToMoney extends BaseBussiness { String MONEYNOTAX = null; String MONEYTAX = null; String CORPUS_ADD_INTEREST_TAX = null; + String INTERESTNOTAX = null; String DEDITMONEY_NOTAX = null; String CORPUS = null; String INTEREST = null; @@ -52,7 +53,7 @@ public class CreateVoucherDepositDeductionToMoney extends BaseBussiness { // 保证金抵扣 if("PZ2018072100000053".equals(VOUCHERNO) || "PZ2019070100000026".equals(VOUCHERNO)){ - sql = "SELECT ROUND((getTax(lci.LEAS_FORM,'本金',LCCT.START_DATE)-1)*100,0) AS TAX_NUM,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 lul.IS_MAIN='Y' AND LCI.BUSINESSTYPE='1' AND LUL.IS_MAIN = 'Y' AND LRIT.FLOWUNID = :FLOWUNID "; + sql = "SELECT ROUND((getTax (lci.LEAS_FORM,'本金',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM, 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)+IFNULL(IFNULL(LRIT.INTEREST, 0)-ROUND(IFNULL(LRIT.INTEREST, 0)/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, IFNULL(ROUND(IFNULL(LRIT.INTEREST, 0)/GETTAX(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2),0) AS INTEREST_NOTAX, 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 lul.IS_MAIN = 'Y' AND LCI.BUSINESSTYPE = '1' AND LUL.IS_MAIN = 'Y' AND LRIT.FLOWUNID = :FLOWUNID"; // 确认未实现利息收入-抵扣租金利息 }else if("PZ2019070100000027".equals(VOUCHERNO)){ sql = "SELECT ROUND((getTax (lci.LEAS_FORM,'租息',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.INTEREST, 0) AS MONEY,IFNULL(ROUND(LRIT.INTEREST / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2),0) AS MONEYNOTAX, IFNULL((LRIT.CORPUS - ROUND(LRIT.CORPUS / getTax(LCI.LEAS_FORM,'本金',LCCT.START_DATE),2)),0) AS MONEYTAX,((IFNULL(LRIT.CORPUS, 0) - ROUND(IFNULL(LRIT.CORPUS, 0) / getTax (LCI.LEAS_FORM,'本金',LCCT.START_DATE),2))+(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) / getTax (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2))) AS CORPUS_ADD_INTEREST_TAX,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM (SELECT SUM(LRIT.CORPUS) CORPUS,SUM(LRIT.INTEREST) INTEREST,SUM(LRIT.PENALTY) PENALTY,LRIT.FLOWUNID,LRIT.CONTRACT_ID,LRIT.PLAN_LIST FROM LC_RENT_INCOME_TEMP LRIT WHERE LRIT.SETTLE_METHOD = 'settlemethod7' GROUP BY LRIT.FLOWUNID,LRIT.CONTRACT_ID,LRIT.PLAN_LIST) LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID=LRIT.CONTRACT_ID AND LRP.PLAN_LIST=LRIT.PLAN_LIST LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LRP.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.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 lul.IS_MAIN = 'Y' AND LCI.BUSINESSTYPE = '1' AND LUL.IS_MAIN = 'Y' AND DATE_FORMAT(NOW(),'%Y%m')=DATE_FORMAT(LRP.PLAN_DATE,'%Y%m') AND LRIT.FLOWUNID = :FLOWUNID "; @@ -74,6 +75,7 @@ public class CreateVoucherDepositDeductionToMoney extends BaseBussiness { DEDITMONEY_NOTAX = dataList.get(i).get("DEDITMONEY_NOTAX"); CORPUS = dataList.get(i).get("CORPUS"); INTEREST = dataList.get(i).get("INTEREST"); + INTERESTNOTAX = dataList.get(i).get("INTEREST_NOTAX"); 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"); @@ -100,6 +102,7 @@ public class CreateVoucherDepositDeductionToMoney extends BaseBussiness { param.put("DEDITMONEY_NOTAX", DEDITMONEY_NOTAX); param.put("CORPUS", CORPUS); param.put("INTEREST", INTEREST); + param.put("INTERESTNOTAX", INTERESTNOTAX); param.put("ACCOUNT_DATE", ACCOUNT_DATE); param.put("FACT_DATE", FACT_DATE); param.put("CONTRACT_ID", CONTRACT_ID); @@ -111,6 +114,7 @@ public class CreateVoucherDepositDeductionToMoney extends BaseBussiness { param.put("CUSTID", CUSTID); param.put("CUSTNAME", CUSTNAME); param.put("CUSTOMERTYPE", CUSTOMERTYPE); + param.put("VOUCHERNO", VOUCHERNO); param.put("BUSINESSTYPE", "0603"); param.put("FlowUnid", FlowUnid); if(TAX_CODES!=null) { diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionToMoney2.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionToMoney2.java new file mode 100644 index 000000000..361804eb4 --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionToMoney2.java @@ -0,0 +1,131 @@ +package com.tenwa.voucher.CreateVoucherProcess; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import jbo.voucher.LV_VOUCHER_CONFIG; +import jbo.voucher.TAX_CODE; +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.awe.util.Transaction; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.voucher.serviceImp.CreateVoucherServiceImpl; + +public class CreateVoucherDepositDeductionToMoney2 { + + public String CreateVoucher(String VOUCHERNO,String userid,Transaction Sqlca,String DEDUCTION_ID) throws Exception { + + Map map = new HashMap(); + Map param = new HashMap(); + CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl(); + String VOUCHER_TYPE = "1"; + + String F58=null; + String MONEY = null; + String MONEYNOTAX = null; + String MONEYTAX = null; + String CORPUS_ADD_INTEREST_TAX = null; + String INTERESTNOTAX = null; + String DEDITMONEY_NOTAX = null; + String CORPUS = null; + String INTEREST = null; + String ACCOUNT_DATE = null; + String FACT_DATE = null; + String CONTRACT_ID = null; + String CONTRACT_NUMBER = null; + String PROJECT_NAME = null; + String leas_form = null; + String DISTRIBUTOR_ID = null; + String DISTRIBUTOR_NAME = null; + String CUSTID = null; + String CUSTNAME = null; + String CUSTOMERTYPE = null; + String TAX_NUM = null; + String sql = ""; + param.clear(); + map.put("DEDUCTION_ID", DEDUCTION_ID); + + // 保证金自动抵扣 + if("PZ2021091700000031".equals(VOUCHERNO) || "PZ2021091700000032".equals(VOUCHERNO)){ + sql = "SELECT LRI.ID AS F58,ROUND((getTax (lci.LEAS_FORM,'本金',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM, IFNULL(LRI.RENT, 0)+IFNULL(LRI.PENALTY , 0) AS MONEY, IFNULL(IFNULL(LRI.INTEREST, 0) - ROUND(IFNULL(LRI.INTEREST, 0) / GETTAX (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2),0) AS MONEYTAX, IFNULL(LRI.CORPUS, 0) AS CORPUS, IFNULL(LRI.INTEREST, 0) AS INTEREST, IFNULL(ROUND(IFNULL(LRI.INTEREST, 0) / GETTAX (LCI.LEAS_FORM,'租息',LCCT.START_DATE),2),0) AS INTEREST_NOTAX, 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_RENT_INCOME LRI LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.PAYMENT_NUMBER=LRI.PAYMENT_NUMBER LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE lul.IS_MAIN = 'Y' AND LCI.BUSINESSTYPE = '1' AND LUL.IS_MAIN = 'Y' AND LRI.DEDUCTION_ID=:DEDUCTION_ID"; + } + + // 查询sql, 将结果集封装到list集合中 + List> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql, map); + + //遍历获取结果集, 将结果写入map中 + for (int i = 0; i < dataList.size(); i++) { + MONEY = dataList.get(i).get("MONEY").toString(); + if ("".equals(MONEY)||MONEY == null)MONEY = "0.00"; + double mon = Double.parseDouble(MONEY); + // 判断有金额, 封装值到map中 + if (Math.abs(mon) > 0) { + MONEYNOTAX = dataList.get(i).get("MONEYNOTAX"); + MONEYTAX = dataList.get(i).get("MONEYTAX"); + CORPUS_ADD_INTEREST_TAX = dataList.get(i).get("CORPUS_ADD_INTEREST_TAX"); + DEDITMONEY_NOTAX = dataList.get(i).get("DEDITMONEY_NOTAX"); + CORPUS = dataList.get(i).get("CORPUS"); + INTEREST = dataList.get(i).get("INTEREST"); + INTERESTNOTAX = dataList.get(i).get("INTEREST_NOTAX"); + 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"); + CONTRACT_NUMBER = dataList.get(i).get("CONTRACT_NUMBER"); + PROJECT_NAME = dataList.get(i).get("PROJECT_NAME"); + leas_form = dataList.get(i).get("LEAS_FORM"); + 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"); + CUSTOMERTYPE = dataList.get(i).get("CUSTOMERTYPE"); + TAX_NUM = dataList.get(i).get("TAX_NUM"); + F58 = dataList.get(i).get("F58"); + // 通过税率获取编码 + BizObject TAX_CODES=null; + if(TAX_NUM!=null && !"".equals(TAX_NUM)) { + TAX_CODES=JBOFactory.createBizObjectQuery(TAX_CODE.CLASS_NAME,"TAX_NUMBER='"+TAX_NUM+"'").getSingleResult(false); + } + + param.put("FACT_MONEY", MONEY); + param.put("INTERESTNOTAX", MONEYNOTAX); + param.put("TAX", MONEYTAX); + param.put("CORPUS_ADD_INTEREST_TAX", CORPUS_ADD_INTEREST_TAX); + param.put("DEDITMONEY_NOTAX", DEDITMONEY_NOTAX); + param.put("CORPUS", CORPUS); + param.put("INTEREST", INTEREST); + param.put("INTERESTNOTAX", INTERESTNOTAX); + param.put("ACCOUNT_DATE", ACCOUNT_DATE); + param.put("FACT_DATE", FACT_DATE); + param.put("CONTRACT_ID", CONTRACT_ID); + param.put("CONTRACT_NUMBER", CONTRACT_NUMBER); + param.put("PROJECT_NAME", PROJECT_NAME); + 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("CUSTOMERTYPE", CUSTOMERTYPE); + param.put("VOUCHERNO", VOUCHERNO); + param.put("BUSINESSTYPE", "0603"); + param.put("F58", F58); + if(TAX_CODES!=null) { + param.put("TAX_CODE",TAX_CODES.getAttribute("TAX_CODES").getString()); + } + + map.clear(); + map.put("PROJ_TYPE", leas_form); + map.put("VOUCHER_NO", VOUCHERNO); + // 根据map中的参数, 查询LV_VOUCHER_CONFIG表数据 + BizObject vouch = DataOperatorUtil.getSingleJBO(LV_VOUCHER_CONFIG.CLASS_NAME, map, Sqlca); + // 如果结果不为空, + if (vouch != null) { + //将创建凭证的参数传入在下一层 + vs.createVoucher(vouch.getAttribute("id").getString(),vouch.getAttribute("MODULAR_NUMBER").getString(),vouch.getAttribute("OWNED_COMPANY").getString(), leas_form, VOUCHER_TYPE, userid, param,Sqlca); + } + } + } + + String sMessage = "true"; + return sMessage; + } +} diff --git a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java index cd4267a00..906f91782 100644 --- a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java +++ b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java @@ -502,6 +502,26 @@ public class CreateVoucherServiceImpl { subData.putAll(this.getAuxiliaryData(tx, param,subData,sub.getAttribute("AUXILIARY_TYPE").getString())); } + /** + * 保证金抵扣业务类型配置 + */ + if("PZ2018072100000053".equals(VOUCHERNO) || "PZ2019070100000026".equals(VOUCHERNO)) { + if("3".equals(SORT_NUMBER)) { + subData.put("BUSINESSTYPE", "0604"); + } + if("4".equals(SORT_NUMBER)) { + subData.put("BUSINESSTYPE", "0602"); + } + if("5".equals(SORT_NUMBER)) { + subData.put("BUSINESSTYPE", "0603"); + } + } + if("PZ2021091700000031".equals(VOUCHERNO) || "PZ2021091700000032".equals(VOUCHERNO)) { + if("3".equals(SORT_NUMBER)) { + subData.put("BUSINESSTYPE", "0604"); + } + } + /*// 需要带经销商编码的在此匹配 if("PZ2018092500000156".equals(VOUCHERNO) || "PZ2019072000000074".equals(VOUCHERNO) || "PZ2018092500000164".equals(VOUCHERNO) || "PZ2019072000000079".equals(VOUCHERNO) || "PZ2019072200000108".equals(VOUCHERNO) || "PZ2019072200000114".equals(VOUCHERNO)) { if("2".equals(SORT_NUMBER)) { diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/MarginDeduction.java b/src_tenwa/com/tenwa/lease/app/quartzmession/MarginDeduction.java index d81751f19..8cb662d4a 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/MarginDeduction.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/MarginDeduction.java @@ -9,6 +9,8 @@ import java.util.UUID; import com.base.util.DateUtil; import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.voucher.CreateVoucherProcess.CreateVoucherDepositDeductionToMoney2; + import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; @@ -143,6 +145,13 @@ public class MarginDeduction implements Job{ lrp.setAttributeValue("COLLECT_MSG","保证金抵扣"); lrpBm.saveObject(lrp); } + + /** + * 生成凭证 + */ + CreateVoucherDepositDeductionToMoney2 cddm = new CreateVoucherDepositDeductionToMoney2(); + cddm.CreateVoucher("PZ2021091700000031", "admin", Sqlca,fundIncomeId); + cddm.CreateVoucher("PZ2021091700000032", "admin", Sqlca,fundIncomeId); } } From e7715c7570cabe7261355e9019940f9d8d2a0d1e Mon Sep 17 00:00:00 2001 From: tangfutang <3218982385@qq.com> Date: Wed, 22 Sep 2021 13:51:22 +0800 Subject: [PATCH 10/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E6=AE=B5?= =?UTF-8?q?=E8=9E=8D=E8=B4=B4=E6=81=AF=E9=A1=B5=E9=9D=A2=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanSimulation/LCCalcSubsectionInfoTempList.jsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WebContent/Accounting/LoanSimulation/LCCalcSubsectionInfoTempList.jsp b/WebContent/Accounting/LoanSimulation/LCCalcSubsectionInfoTempList.jsp index f9244329d..22ef46869 100644 --- a/WebContent/Accounting/LoanSimulation/LCCalcSubsectionInfoTempList.jsp +++ b/WebContent/Accounting/LoanSimulation/LCCalcSubsectionInfoTempList.jsp @@ -209,8 +209,8 @@ var ifd = getItemValue( 0, i, 'IS_FIXED_DISCOUNT' ); if(ifd =="Y"){ - $("input[id*=DISCOUNT_"+i+"]").attr('readonly',true); - $("input[id*=DISCOUNT_"+i+"]").css('border','0'); + $("input[id*=DISCOUNT_INTEREST_"+i+"]").attr('readonly',true); + $("input[id*=DISCOUNT_INTEREST_"+i+"]").css('border','0'); } } } From e6c2cc3dea34f2156a59ae4004de55cdce0aefce Mon Sep 17 00:00:00 2001 From: tangfutang <3218982385@qq.com> Date: Thu, 23 Sep 2021 11:37:36 +0800 Subject: [PATCH 11/26] =?UTF-8?q?app=E6=B7=BB=E5=8A=A0=E4=B8=80=E5=90=88?= =?UTF-8?q?=E5=90=8C=E5=A4=9A=E8=BD=A6=E5=92=8C=E7=A7=9F=E8=B5=81=E8=B5=8B?= =?UTF-8?q?=E5=80=BC=E8=BD=A6=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Comm/LBEquipment_Car/LBEquipmentInfo.jsp | 5 ++++ .../apply/business/start/bo/BusinessBO.java | 16 +++++++++++++ .../als/base/awe/select/SelectCatalogWin.java | 23 +++++++++++++++++-- .../SelectCarAttributeController.java | 18 +++++++++++++++ .../service/SelectCarAttributeService.java | 3 +++ .../impl/SelectCarAttributeServiceImpl.java | 14 +++++++++++ .../LBProjectIntoTempInitCarBusiness.java | 8 ++++++- 7 files changed, 84 insertions(+), 3 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp index 702000a00..35c0575fb 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp @@ -415,6 +415,11 @@ setItemValue(0,getRow(),"gears",""); setItemValue(0,getRow(),"car_typea",sReturn[3]); + if("SYC"==sReturn[3]){ + setItemValue(0,getRow(), "cartype" , "商用车" ); + }else if ("CYC"==sReturn[3]){ + setItemValue(0,getRow(), "cartype" , "乘用车" ); + } carReadonly(sReturn[3]); },"请选择车品牌",''); } diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java index e6b9426fa..d00208097 100644 --- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/bo/BusinessBO.java @@ -74,6 +74,8 @@ public class BusinessBO implements Serializable { private String distributor_no; private String distributorType; + private String cartypea; //车辆类型，CYC:乘用车；SYC：商用车 + public void setParam(Map fieldMap, String param, Object obj) { obj = fieldMap.get(param.toLowerCase()) == null ? null : fieldMap.get( param.toLowerCase()).toString(); @@ -202,6 +204,8 @@ public class BusinessBO implements Serializable { this.SubjectName = MultiSubjectUtil.TJSUBJECTNAME; } } + //获取车辆类型字段 + this.cartypea = fieldMap.get("cartypea".toLowerCase()) == null ? "": fieldMap.get("cartypea".toLowerCase()).toString(); CustomerInfoCheck CustomerInfoCheck = new CustomerInfoCheck(); @@ -280,6 +284,9 @@ public class BusinessBO implements Serializable { map.put("distributorNo", distributor_no); map.put("distributorName", distributor_name); } + //添加车型字段 + map.put("cartypea", cartypea); + JSONObject jsonObject = JSONObject.fromObject(map); this.fixedFlowParam = jsonObject.toString(); @@ -650,6 +657,15 @@ public class BusinessBO implements Serializable { public void setDistributorType(String distributorType) { this.distributorType = distributorType; } + + + public String getCartypea() { + return cartypea; + } + + public void setCartypea(String cartypea) { + this.cartypea = cartypea; + } public void sethaveCommission(String haveCommission) { haveCommission = haveCommission; diff --git a/src_app_fresh/apx/com/amarsoft/als/base/awe/select/SelectCatalogWin.java b/src_app_fresh/apx/com/amarsoft/als/base/awe/select/SelectCatalogWin.java index b6f3d7f4b..69c86817f 100644 --- a/src_app_fresh/apx/com/amarsoft/als/base/awe/select/SelectCatalogWin.java +++ b/src_app_fresh/apx/com/amarsoft/als/base/awe/select/SelectCatalogWin.java @@ -9,6 +9,7 @@ import java.util.StringTokenizer; import javax.servlet.http.HttpServletRequest; +import jbo.app.LB_EQUIPMENT_CAR_TEMP; import jbo.sys.SELECT_CATALOG; import apx.com.amarsoft.als.base.cache.instance.AppCodeCache; @@ -29,6 +30,7 @@ public class SelectCatalogWin { private String sSelName; private boolean loadSelectflag = true; private Map param; + private String flowunid; public boolean isLoadSelectflag() { return loadSelectflag; @@ -81,6 +83,7 @@ public class SelectCatalogWin { } } } + this.flowunid = param.get("flowunid") == null ? "" : param.get("flowunid").toString(); this.sSelName = sSelName; try { BizObjectManager bom = JBOFactory @@ -230,12 +233,14 @@ public class SelectCatalogWin { .substring(sTableName.lastIndexOf(",") + 1); if (i > 0) { sql2 += " or "; + }else { + sql2 += " ( "; } - sql2 += "A." + sSelectFilter + " like '%" + sGlobalText + sql2 += " A." + sSelectFilter + " like '%" + sGlobalText + "%'"; i++; } -// sql2 += ")"; + sql2 += " ) "; // if (sql2.length() > 0) { // if (sqlWhere.toLowerCase().contains("where") // || sql2.toLowerCase().contains("where")) { @@ -245,6 +250,20 @@ public class SelectCatalogWin { // } // } } + if(this.flowunid!=null && this.flowunid.length() > 0) { + BizObjectManager lectm = JBOFactory.getBizObjectManager(LB_EQUIPMENT_CAR_TEMP.CLASS_NAME); + BizObject lect = lectm.createQuery("FLOWUNID=:FLOWUNID").setParameter("FLOWUNID", this.flowunid).getSingleResult(false); + if(lect!=null) { + if(sql2!=null && sql2.length() > 0) { + sql2 += " and (A.cartypea='"+lect.getAttribute("car_typea").toString()+"') "; + }else { + sql2 += " (A.cartypea='"+lect.getAttribute("car_typea").toString()+"') "; + } + } + + } + + if (!StringX.isSpace(sOtherWhere)) { String[] array = sOtherWhere.split("&"); sql = sql.replace(array[0], array[1]); diff --git a/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/controller/SelectCarAttributeController.java b/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/controller/SelectCarAttributeController.java index d5c80acfc..a3e2197f4 100644 --- a/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/controller/SelectCarAttributeController.java +++ b/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/controller/SelectCarAttributeController.java @@ -141,4 +141,22 @@ public class SelectCarAttributeController { return ReturnMapUtil.rollback(e); } } + + //获取头车信息 + @Path("/headcar/info") + @POST + public Map selectHeadCarInfo( + @Context HttpServletRequest request, @Context Transaction sqlca, + @Context JBOTransaction tx) throws Exception { + ReturnMapUtil ReturnMapUtil = new ReturnMapUtil(tx, sqlca); + ARE.getLog() + .info("[CONTROLLER] SelectCarAttributeController run ................."); + ARE.getLog().info("[Path] /select/headcar/info run ................."); + try { + return service + .selectHeadCarInfo(request, sqlca, tx, ReturnMapUtil); + } catch (Exception e) { + return ReturnMapUtil.rollback(e); + } + } } diff --git a/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/service/SelectCarAttributeService.java b/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/service/SelectCarAttributeService.java index 3ecaf9f0e..f5e819188 100644 --- a/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/service/SelectCarAttributeService.java +++ b/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/service/SelectCarAttributeService.java @@ -28,4 +28,7 @@ public interface SelectCarAttributeService { Map SubDistributionName(HttpServletRequest request, Transaction sqlca, JBOTransaction tx, ReturnMapUtil returnMapUtil) throws Exception; + + Map selectHeadCarInfo(HttpServletRequest request, Transaction sqlca, JBOTransaction tx, + ReturnMapUtil returnMapUtil) throws Exception; } diff --git a/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/service/impl/SelectCarAttributeServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/service/impl/SelectCarAttributeServiceImpl.java index db146c09b..80424425f 100644 --- a/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/service/impl/SelectCarAttributeServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/currency/select/apzl/car/service/impl/SelectCarAttributeServiceImpl.java @@ -97,4 +97,18 @@ public class SelectCarAttributeServiceImpl implements SelectCarAttributeService{ return ReturnMapUtil.getReturnMap(); } + @Override + public Map selectHeadCarInfo(HttpServletRequest request, Transaction sqlca, JBOTransaction tx, + ReturnMapUtil ReturnMapUtil) throws Exception { + Map testMap = (Map) MultipartDataUtil.readRequestParam(request, "UTF-8"); + Map fieldMap = (Map) testMap.get("fieldMap"); + String flowunid = fieldMap.get("flowunid") == null ? "" : fieldMap.get("flowunid").toString(); + List> dataList = DataOperatorUtil.getDataBySql("SELECT UU_ID,BRAND,CAR_SERIES,MODEL,NOW_TOTAL FROM LB_EQUIPMENT_CAR_TEMP WHERE car_attribute='head' AND flowunid='"+flowunid+"' "); + Map body = new HashMap(); + body.put("headCarInfo", dataList); + ReturnMapUtil.setReturnMap(body,RestfullConstant.baseProperty.get("success").toString(), + "查询成功"); + return ReturnMapUtil.getReturnMap(); + } + } diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java index 34c9e3149..9dcea529c 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/LBProjectIntoTempInitCarBusiness.java @@ -326,7 +326,13 @@ public class LBProjectIntoTempInitCarBusiness extends BaseBussiness { bmLEC.setAttributeValue("INPUTUSERID", asUser.getUserID());//登记人 bmLEC.setAttributeValue("INPUTORGID", asUser.getOrgID());//登记部门 bmLEC.setAttributeValue("INPUTTIME", StringFunction.getTodayNow());//登记时间,系统当前时间 - bmLEC.setAttributeValue("cartype",this.getAttribute("cartype")); +// bmLEC.setAttributeValue("cartype",this.getAttribute("cartype")); + String cartypea = this.getAttribute("cartypea") == null ? "" : this.getAttribute("cartypea").toString() ; + if(cartypea.equals("SYC")) { + bmLEC.setAttributeValue("cartype","商用车"); + }else if(cartypea.equals("CYC")){ + bmLEC.setAttributeValue("cartype","乘用车"); + } bmLEC.setAttributeValue("vehicletype",this.getAttribute("vehicletype")); bmLEC.setAttributeValue("vehiclelevel",this.getAttribute("vehiclelevel")); bmLEC.setAttributeValue("car_attribute","head"); From 69cf93bbca3bfc3c731a16968a93d9329bac5ee8 Mon Sep 17 00:00:00 2001 From: tangfutang <3218982385@qq.com> Date: Thu, 23 Sep 2021 16:17:34 +0800 Subject: [PATCH 12/26] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E7=BB=8F=E9=94=80?= =?UTF-8?q?=E5=95=86=E7=A4=BE=E4=BC=9A=E4=BF=A1=E7=94=A8=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=94=AF=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributorApproval/LDistributorInfo.jsp | 15 ++++++++----- .../group/CustomerGroupCompanyController.java | 22 +++++++++++++++++++ 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp index 2c7c7ac28..54eb1df02 100644 --- a/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp +++ b/WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp @@ -66,14 +66,17 @@ $(function(){ //组织机构验证码的的校验 function Checkfield(){ var businessLicenseNo = getItemValue(0,getRow(0),"BUSINESS_LICENSE_NO"); - if(businessLicenseNo==""){ - //alert("组织机构代码不能为空!"); - return true; - } if(checkORGRight(businessLicenseNo)){ - return true; + var sReturnInfo = RunJavaMethodTrans("com.tenwa.customer.controller.group.CustomerGroupCompanyController","checkBusinessLicenseNo","businessLicenseNo="+businessLicenseNo+",id="+getItemValue(0,0,'ID')); + if("false" ==sReturnInfo){ + setErrorTips("BUSINESS_LICENSE_NO","统一社会信用代码已存在!");; + return false; + }else{ + setErrorTips("BUSINESS_LICENSE_NO",""); + return true; + } }else{ - setErrorTips("BUSINESS_LICENSE_NO","组织机构代码格式不正确!"); + setErrorTips("BUSINESS_LICENSE_NO","统一社会信用代码格式不正确!"); //AsDebug.alert("提示","组织机构代码格式不正确!"); return false; } diff --git a/src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java b/src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java index ce9e19d8e..04931a6b4 100644 --- a/src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java +++ b/src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java @@ -36,6 +36,7 @@ public class CustomerGroupCompanyController { private String OLDITEMNO = ""; private String inputUserId = ""; private String inputOrgId = ""; + private String businessLicenseNo = ""; public String getITEMNO() { return ITEMNO; @@ -131,6 +132,15 @@ public class CustomerGroupCompanyController { public void setInputOrgId(String inputOrgId) { this.inputOrgId = inputOrgId; } + + + public String getBusinessLicenseNo() { + return businessLicenseNo; + } + + public void setBusinessLicenseNo(String businessLicenseNo) { + this.businessLicenseNo = businessLicenseNo; + } /** * 锟斤拷锟斤拷 @@ -364,4 +374,16 @@ public class CustomerGroupCompanyController { } return "success"; } + //校验经销商审核社会统一信用代码是否已经存在 + public String checkBusinessLicenseNo(JBOTransaction tx) throws Exception{ + List> dataBySql = DataOperatorUtil.getDataBySql("select id from distributor_info_temp where id<>'"+id+"' and BUSINESS_LICENSE_NO='"+businessLicenseNo+"' "); + if(dataBySql!=null && dataBySql.size() > 0) { + return "false"; + } + dataBySql = DataOperatorUtil.getDataBySql("select id from distributor_info where BUSINESS_LICENSE_NO='"+businessLicenseNo+"' "); + if(dataBySql!=null && dataBySql.size() > 0) { + return "false"; + } + return "true"; + } } \ No newline at end of file From 127b0efa73bd3a3a07986b9ca7fc69acdafa68ce Mon Sep 17 00:00:00 2001 From: tangfutang <3218982385@qq.com> Date: Sun, 26 Sep 2021 13:44:59 +0800 Subject: [PATCH 13/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9app=E8=B5=84=E6=96=99?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doc/upload/service/impl/BusinessDocUploadServiceImpl.java | 3 +-- .../als/apzl/flow/data/service/Impl/FlowDataServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/upload/service/impl/BusinessDocUploadServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/upload/service/impl/BusinessDocUploadServiceImpl.java index 8fc0cd5f3..efa0c5169 100644 --- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/upload/service/impl/BusinessDocUploadServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/upload/service/impl/BusinessDocUploadServiceImpl.java @@ -92,8 +92,7 @@ public class BusinessDocUploadServiceImpl implements BusinessDocUploadService { .getBizObjectManager(LB_DOCLIBRARY.CLASS_NAME); BizObject library = libraryManage .createQuery( - "RELATIVE_ID=:RELATIVE_ID AND DOC_NAME=:DOC_NAME").setParameter("RELATIVE_ID", relaId).setParameter("DOC_NAME", docName) - .getSingleResult(true); + "RELATIVE_ID=:RELATIVE_ID AND DOC_NAME like '%身份证%' ").setParameter("RELATIVE_ID", relaId).getSingleResult(true); String libraryId = ""; if (null == library) { ReturnMapUtil.setReturnMap(null, diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/flow/data/service/Impl/FlowDataServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/flow/data/service/Impl/FlowDataServiceImpl.java index db9be0af6..b0f728eef 100644 --- a/src_app_fresh/apx/com/amarsoft/als/apzl/flow/data/service/Impl/FlowDataServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/flow/data/service/Impl/FlowDataServiceImpl.java @@ -85,7 +85,7 @@ public class FlowDataServiceImpl implements FlowDataService{ } //获取扣款文件id - String fileSql = "select * from (select * from (select lda.inputtime,lda.id as fileid ,case locate('front', FILENAME) when 0 then 'back' else 'front'end identify,FILENAME from LB_DOCRELATIVE ldra left join LB_DOCLIBRARY ldc on ldc.RELATIVE_ID=ldra.id and ldc.DOC_NAME='还款卡（正反面）' left join LB_DOCATTRIBUTE lda on lda.library_id=ldc.id where ldra.objecttype='BusinessApplyFlow' and ldra.proj_id='"+dataList.get(0).get("project_id")+"' and lda.deleteed is null ORDER BY lda.inputtime DESC) tmp where tmp.identify = 'front' limit 1) t1 union all select * from (select * from (select lda.inputtime,lda.id as fileid ,case locate('front', FILENAME) when 0 then 'back' else 'front'end identify,FILENAME from LB_DOCRELATIVE ldra left join LB_DOCLIBRARY ldc on ldc.RELATIVE_ID=ldra.id and ldc.DOC_NAME='还款卡（正反面）' left join LB_DOCATTRIBUTE lda on lda.library_id=ldc.id where ldra.objecttype='BusinessApplyFlow' and ldra.proj_id='"+dataList.get(0).get("project_id")+"' and lda.deleteed is null ORDER BY lda.inputtime DESC) tmp where tmp.identify = 'back' limit 1) t2; "; + String fileSql = "select * from (select * from (select lda.inputtime,lda.id as fileid ,case locate('front', FILENAME) when 0 then 'back' else 'front'end identify,FILENAME from LB_DOCRELATIVE ldra left join LB_DOCLIBRARY ldc on ldc.RELATIVE_ID=ldra.id and ( ldc.DOC_NAME like '%还款卡%' or ldc.DOC_NAME like '%银行卡%' ) left join LB_DOCATTRIBUTE lda on lda.library_id=ldc.id where ldra.objecttype='BusinessApplyFlow' and ldra.proj_id='"+dataList.get(0).get("project_id")+"' and lda.deleteed is null ORDER BY lda.inputtime DESC) tmp where tmp.identify = 'front' limit 1) t1 union all select * from (select * from (select lda.inputtime,lda.id as fileid ,case locate('front', FILENAME) when 0 then 'back' else 'front'end identify,FILENAME from LB_DOCRELATIVE ldra left join LB_DOCLIBRARY ldc on ldc.RELATIVE_ID=ldra.id and ( ldc.DOC_NAME like '%还款卡%' or ldc.DOC_NAME like '%银行卡%' ) left join LB_DOCATTRIBUTE lda on lda.library_id=ldc.id where ldra.objecttype='BusinessApplyFlow' and ldra.proj_id='"+dataList.get(0).get("project_id")+"' and lda.deleteed is null ORDER BY lda.inputtime DESC) tmp where tmp.identify = 'back' limit 1) t2; "; //String fileSql = "select lda.id as fileid,case locate('front', FILENAME) when 0 then 'reverse' else 'front' end identify from LB_DOCRELATIVE ldra left join LB_DOCLIBRARY ldc on ldc.RELATIVE_ID=ldra.id and ldc.DOC_NAME='还款卡（正反面）' left join LB_DOCATTRIBUTE lda on lda.library_id=ldc.id where ldra.objecttype='BusinessApplyFlow' and ldra.proj_id='"+dataList.get(0).get("project_id")+"' and lda.deleteed is null limit 0,2 "; List> fileList = DataOperatorUtil.getDataBySql(fileSql); body.put("attributeid", fileList); @@ -824,7 +824,7 @@ public class FlowDataServiceImpl implements FlowDataService{ } BizObjectManager libraryManage = JBOFactory.getBizObjectManager(LB_DOCLIBRARY.CLASS_NAME); - BizObject library = libraryManage.createQuery("RELATIVE_ID=:RELATIVE_ID AND DOC_NAME='还款卡（正反面）' ").setParameter("RELATIVE_ID", relaId).getSingleResult(true); + BizObject library = libraryManage.createQuery("RELATIVE_ID=:RELATIVE_ID AND (DOC_NAME like '%还款卡%' or DOC_NAME like '%银行卡%' ) ").setParameter("RELATIVE_ID", relaId).getSingleResult(true); String libraryId = ""; if (null == library) { return ; From a223e696b66584174d727d673584706e025764a5 Mon Sep 17 00:00:00 2001 From: yjf <2211675158@qq.com> Date: Sat, 9 Oct 2021 08:22:25 +0800 Subject: [PATCH 14/26] =?UTF-8?q?=E7=94=9F=E4=BA=A7BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/AppConfig/OrgUserManage/UserList.jsp | 2 +- .../lease/app/allinpay/service/impl/AllinpayPaymentRun.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WebContent/AppConfig/OrgUserManage/UserList.jsp b/WebContent/AppConfig/OrgUserManage/UserList.jsp index 8a037b561..c0f9083cc 100644 --- a/WebContent/AppConfig/OrgUserManage/UserList.jsp +++ b/WebContent/AppConfig/OrgUserManage/UserList.jsp @@ -19,7 +19,7 @@ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; //设置DW风格 1:Grid 2:Freeform dwTemp.ReadOnly = "1"; //设置是否只读 1:只读 0:可写 - dwTemp.setPageSize(20); + dwTemp.setPageSize(pageSize == null ? 20 : Integer.parseInt(pageSize)); //生成HTMLDataWindow dwTemp.genHTMLObjectWindow(sSortNo+"%"); System.out.println(CurUser.getRoleTable().toString()); diff --git a/src/com/tenwa/lease/app/allinpay/service/impl/AllinpayPaymentRun.java b/src/com/tenwa/lease/app/allinpay/service/impl/AllinpayPaymentRun.java index 18ad81762..373746703 100644 --- a/src/com/tenwa/lease/app/allinpay/service/impl/AllinpayPaymentRun.java +++ b/src/com/tenwa/lease/app/allinpay/service/impl/AllinpayPaymentRun.java @@ -62,7 +62,7 @@ public class AllinpayPaymentRun implements Runnable { try { BizObject object = JBOFactory.getBizObjectManager("jbo.com.tenwa.lease.comm.LB_PROJECT_INFO").createQuery("O.id=:id").setParameter("id", map.get("PROJECT_ID")).getSingleResult(false); allinpay = new AllinpayProperties(object.getAttribute("subjectid").toString()); - BizObject result = JBOFactory.getBizObjectManager("jbo.app.tenwa.calc.LC_CARD_TLSIGN").createQuery("O.PROJECT_ID=:projectId and SIGN_STATUS='sign_status2'").setParameter("projectId", map.get("PROJECT_ID")).getSingleResult(false); + BizObject result = JBOFactory.getBizObjectManager("jbo.app.tenwa.calc.LC_CARD_TLSIGN").createQuery("O.PROJECT_ID=:projectId ").setParameter("projectId", map.get("PROJECT_ID")).getSingleResult(false); logger.info(">>>>>>>>>>>通联卡扣协议支付>>>>>>>>PROJECT_ID=" + map.get("PROJECT_ID")); sqlMap.put("SUBMITTIME", time); sqlMap.put("AGRMNO", result.getAttribute("AGRMNO").toString()); From a82589167a917919e543642eb1bb5991df166dc3 Mon Sep 17 00:00:00 2001 From: maliang Date: Mon, 11 Oct 2021 14:33:54 +0800 Subject: [PATCH 15/26] =?UTF-8?q?fix:=E6=8C=89=E7=85=A7=E6=B3=95=E5=8A=A1?= =?UTF-8?q?=E7=BB=99=E5=AE=9A=E7=9A=84=E6=9C=80=E6=96=B0=E5=90=88=E5=90=8C?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=EF=BC=8C=E6=96=B0=E5=A2=9E=E4=B9=98=E7=94=A8?= =?UTF-8?q?=E8=BD=A6=E6=89=8B=E7=AD=BE=E3=80=81=E4=B9=98=E7=94=A8=E8=BD=A6?= =?UTF-8?q?=E7=94=B5=E5=AD=90=E7=AD=BE=E3=80=81=E5=95=86=E7=94=A8=E8=BD=A6?= =?UTF-8?q?=E6=89=8B=E7=AD=BE=E3=80=81=E5=95=86=E7=94=A8=E8=BD=A6=E7=94=B5?= =?UTF-8?q?=E5=AD=90=E7=AD=BE=E5=90=88=E5=90=8C=E6=A8=A1=E6=9D=BF=EF=BC=8C?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=B5=8B=E8=AF=95=E5=B7=A5=E4=BD=9C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Comm/LBContract/LBContractPrintList.jsp | 15 +- .../LBContractTemplate/contract_template.jsp | 25 +- .../handle/FileTemplateUtil.java | 17 +- .../action/ContractSignActionDzq.java | 379 +++++++++++++ .../action/ContractSignActionDzqUtil.java | 498 ++++++++++++++++++ .../util/MakeOneCodeAndContractModel.java | 36 +- 6 files changed, 959 insertions(+), 11 deletions(-) create mode 100644 src/com/tenwa/channelportal/action/ContractSignActionDzq.java create mode 100644 src/com/tenwa/channelportal/action/ContractSignActionDzqUtil.java diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp index ab637f607..99912da0d 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/LBContractPrintList.jsp @@ -129,10 +129,15 @@ // alert("客户签约类型：operationType=" + operationType); if("LHZL"==operationType || "SQSYC"==operationType){ sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignActionTwo","signIng","ProjectId=<%=projectId%>,CurUserID=<%=CurUser.getUserID()%>,FlowUnid=<%=flowunid%>,,SubjectId=<%=SubjectId%>,operationType="+operationType); - }else if("CYSHDZ"==operationType ||"SYCSHHZDZQ"==operationType ){ + }//else if("CYSHDZ"==operationType ||"SYCSHHZDZQ"==operationType ){ // alert("契约锁2.0"); - sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignActionNewUtils","signIng","ProjectId=<%=projectId%>,CurUserID=<%=CurUser.getUserID()%>,FlowUnid=<%=flowunid%>,,SubjectId=<%=SubjectId%>,operationType="+operationType); - }else{ + //sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignActionNewUtils","signIng","ProjectId=<%=projectId%>,CurUserID=<%=CurUser.getUserID()%>,FlowUnid=<%=flowunid%>,,SubjectId=<%=SubjectId%>,operationType="+operationType); + //} + else if("CYCDZQ"==operationType||"SYCDZQ"==operationType||"CYSHDZ"==operationType||"SYCSHHZDZQ"==operationType){ + // 乘用车售后回租电子签约 乘用车电子签约 + // 商用车一车一挂电子签约 商用车电子签约 + sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignActionDzq","signIng","ProjectId=<%=projectId%>,CurUserID=<%=CurUser.getUserID()%>,FlowUnid=<%=flowunid%>,,SubjectId=<%=SubjectId%>,operationType="+operationType); + }else{ sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","signIng","ProjectId=<%=projectId%>,CurUserID=<%=CurUser.getUserID()%>,FlowUnid=<%=flowunid%>,,SubjectId=<%=SubjectId%>"); } var sReturns = sReturn.split("@"); @@ -184,7 +189,7 @@ var sReturn = ""; if("LHZL"==operationType || "SQSYC"==operationType) { sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignActionTwo", "contractSignStatus", sParams + ",operationType=" + operationType); - }else if("CYSHDZ"==operationType ||"SYCSHHZDZQ"==operationType){ + }else if("CYSHDZ"==operationType ||"SYCSHHZDZQ"==operationType||"CYCDZQ"==operationType||"SYCDZQ"==operationType){ // alert("契约锁2.0"); sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignActionNewUtils","contractSignStatus",sParams+",operationType="+operationType); }else{ @@ -340,7 +345,7 @@ var sReturn = ""; if("LHZL"==operationType || "SQSYC"==operationType ){ sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignActionTwo","sendMessageAgain","ProjectId=<%=projectId%>,SubjectId=<%=SubjectId%>,operationType="+operationType); - }else if("CYSHDZ"==operationType ||"SYCSHHZDZQ"==operationType){ + }else if("CYSHDZ"==operationType ||"SYCSHHZDZQ"==operationType||"CYCDZQ"==operationType||"SYCDZQ"==operationType){ // alert("契约锁2.0"); sReturn = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignActionNewUtils","sendMessageAgain","ProjectId=<%=projectId%>,SubjectId=<%=SubjectId%>,operationType="+operationType); }else{ diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp index a16e23e7b..987e7ff11 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractTemplate/contract_template.jsp @@ -340,6 +340,23 @@ param["templateIds"]=tempids;//选择的模板ID } + //20210922 合同模板调整 + + // 客户手签（通用C端售后回租合同） 乘用车手签 + // 乘用车售后回租电子签约 乘用车电子签约 + // 专用车产品、商用车一车一挂 商用车手签 + // 商用车一车一挂电子签约 商用车电子签约 + + if("KHSQ"==operationType2){ + param["templateIds"]='f57aa80567853aa37fd6dd902021a';//选择的模板ID + }else if("CYSHDZ"==operationType2){ + param["templateIds"]='f57aa80567853aa37fd6dd902021b';//选择的模板ID + }else if("ZYC"==operationType2||"SYCSHHZ"==operationType2){ + param["templateIds"]='f57aa80567853aa37fd6dd902021c';//选择的模板ID + }else if("SYCSHHZDZQ"==operationType2){ + param["templateIds"]='f57aa80567853aa37fd6dd902021d';//选择的模板ID + } + param["templateParam"]=JSON.stringify(tempParam).replace(/,/g,"@");//生成模板的参数据 for(var key in param){ if(sparam.length>0){sparam+=",";} @@ -372,12 +389,14 @@ if("LHZL"==operationType || "SQSYC"==operationType){ falg = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignActionTwo","compnySignIng","FlowUnid=<%=flowunid%>,flagType=word,ProjectId=<%=projectId%>,SubjectId=<%=SubjectId%>,operationType="+operationType); - //商用车一车一挂、专用车产品、网约车、大通、C端直租、客户手签、 - }else if ("SYCSHHZ"==operationType||"ZYC"==operationType||"WYC"==operationType||"DT"==operationType||"CDZZ"==operationType||"5c494617683548a49cfc050f60067ea2"==tempids){ + //商用车一车一挂、专用车产品、网约车、大通、C端直租、客户手签、商用车手签、乘用车手签 + }else if ("SYCSHHZ"==operationType||"ZYC"==operationType||"WYC"==operationType||"DT"==operationType||"CDZZ"==operationType + ||"CYCSQ"==operationType||"SYCSQ"==operationType||"5c494617683548a49cfc050f60067ea2"==tempids){ falg = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignActionTwoOwn","compnySignIng","FlowUnid=<%=flowunid%>,flagType=word,ProjectId=<%=projectId%>,SubjectId=<%=SubjectId%>,tempid="+tempids); }else if("ZC"==operationType){ falg="success"; - }else if("KJLHZL"==operationType||"KJLHZLCYC"==operationType||"KJLHZLSYC"==operationType){//凯捷联合租赁 + }else if("KJLHZL"==operationType||"KJLHZLCYC"==operationType||"KJLHZLSYC"==operationType ||"KJCYYQR"==operationType + ||"KJSYYQR"==operationType||"CYCDZQ"==operationType||"SYCDZQ"==operationType){//凯捷联合租赁商用车手签、乘用车手签 // alert("凯捷联合租赁，合同模板id=" + tempids); falg = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignActionNewUtils","compnySignIng","FlowUnid=<%=flowunid%>,flagType=word,ProjectId=<%=projectId%>,SubjectId=<%=SubjectId%>,operationType="+operationType); } else{ diff --git a/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java b/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java index 6d3bf6b84..02dd32063 100644 --- a/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java +++ b/src/com/tenwa/app/baseFileTemplate/handle/FileTemplateUtil.java @@ -175,11 +175,15 @@ public class FileTemplateUtil { return "[{'fileTemplate':\""+"[{'text':'狮桥商用车合同模板','value':'93e4194efb604c71b394d902b2060da8'}]"+"\"}]"; }else if("KJLHZL".equals(operationType)){//KJLHZL 调整成 KJLHZLCYC 凯捷联合融资租赁乘用车 return "[{'fileTemplate':\""+"[{'text':'凯捷联合融资租赁合同模板','value':'5e1b90d31c4749e2af83891b48ccbe19'}]"+"\"}]"; - }else if("KJLHZLCYC".equals(operationType)){//新增 KJLHZLCYC 凯捷联合融资租赁乘用车 '' + }else if("KJLHZLCYC".equals(operationType)){//新增 KJLHZLCYC 凯捷联合融资租赁乘用车 return "[{'fileTemplate':\""+"[{'text':'凯捷联合融资租赁乘用车合同模板','value':'5fd761a9cb0e4530ae029ec4d713b708'}]"+"\"}]"; }else if("KJLHZLSYC".equals(operationType)){//新增凯捷联合融资租赁商用车 return "[{'fileTemplate':\""+"[{'text':'凯捷联合融资租赁商用车合同模板','value':'4f724ee9a25048b5b0100fb6e5967fde'}]"+"\"}]"; - }else if("CYSHDZ".equals(operationType)){ + }else if("KJCYYQR".equals(operationType)){//新增 凯捷联合租赁手签-乘用车有确认函 + return "[{'fileTemplate':\""+"[{'text':'凯捷联合融资租赁乘用车有确认函合同','value':'hh8924e442646d488b4e568a83447cy'}]"+"\"}]"; + }else if("KJSYYQR".equals(operationType)){//新增 凯捷联合租赁手签-商用车有确认函 + return "[{'fileTemplate':\""+"[{'text':'凯捷联合融资租赁商用车有确认函合同','value':'hh8924e442646d488b4e568a83447sy'}]"+"\"}]"; + }else if("CYSHDZ".equals(operationType)){ return "[{'fileTemplate':\""+"[{'text':'乘用车售后回租电子签约','value':'e6972f1da71f11ebbfe100163e0e11e6'}]"+"\"}]"; }else if("SYCSHHZDZQ".equals(operationType)){ return "[{'fileTemplate':\""+"[{'text':'商用车一车一挂电子签约合同模板','value':'59f0423f984a46128292fbd8768fcd1e'}]"+"\"}]"; @@ -187,6 +191,15 @@ public class FileTemplateUtil { return "[{'fileTemplate':\""+"[{'text':'凯捷联合融资租赁电子签约合同模板','value':'e8e8924e442646d488b4e568a834477f'}]"+"\"}]"; }else if("ZC".equals(operationType)){ return "[{'fileTemplate':\""+"[{'text':'中车合同模板','value':'a37a3bc1919c4ba39d8ba6348fb1962e'}]"+"\"}]"; + //20210922 2021年度合同模板调整 + }else if("CYCSQ".equals(operationType)){ + return "[{'fileTemplate':\""+"[{'text':'乘用车手签合同模板','value':'f57aa80567853aa37fd6dd902021a'}]"+"\"}]"; + }else if("CYCDZQ".equals(operationType)){ + return "[{'fileTemplate':\""+"[{'text':'乘用车电子签约合同模板','value':'f57aa80567853aa37fd6dd902021b'}]"+"\"}]"; + }else if("SYCSQ".equals(operationType)){ + return "[{'fileTemplate':\""+"[{'text':'商用车手签合同模板','value':'f57aa80567853aa37fd6dd902021c'}]"+"\"}]"; + }else if("SYCDZQ".equals(operationType)){ + return "[{'fileTemplate':\""+"[{'text':'商用车电子签约合同模板','value':'f57aa80567853aa37fd6dd902021d'}]"+"\"}]"; }else{ if("01".equals(leasform)){ return "[{'fileTemplate':\""+"[{'text':'合同（直租）','value':'333cd5b36cd846938e618516ba9c8cbb'}]"+"\"}]"; diff --git a/src/com/tenwa/channelportal/action/ContractSignActionDzq.java b/src/com/tenwa/channelportal/action/ContractSignActionDzq.java new file mode 100644 index 000000000..48f9c1c29 --- /dev/null +++ b/src/com/tenwa/channelportal/action/ContractSignActionDzq.java @@ -0,0 +1,379 @@ +package com.tenwa.channelportal.action; + +import com.amarsoft.are.jbo.*; +import com.base.util.StringUtil; +import com.qiyuesuo.sdk.v2.bean.Action; +import com.qiyuesuo.sdk.v2.bean.Contract; +import com.qiyuesuo.sdk.v2.response.DocumentAddResult; +import com.qiyuesuo.sdk.v2.response.SdkResponse; +import com.tenwa.app.manage.qiyuesuo.v2.ContractSignEnums; +import com.tenwa.app.manage.qiyuesuo.v2.SignatoryVo; +import com.tenwa.comm.util.date.DateAssistant; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import jbo.app.tenwa.customer.CUSTOMER_FAMILY_TEMP; +import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST; +import jbo.com.tenwa.lease.carbrand.LB_CONTRACT_SIGN_LOG; +import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT_TEMP; +import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP; + +import java.util.*; + +public class ContractSignActionDzq { + + private String FlowUnid; + private String flagType; + private String ProjectId; + private String SubjectId; + private String customerType; + private String CurUserID; + private String operationType; + private String tempid; + + //直接添加公司公章 + public String compnySignIng(JBOTransaction tx) throws Exception { + BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME, tx); + BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); + BizObject bo = null; + try { + ContractSignActionTwoOwnUtil catu = new ContractSignActionTwoOwnUtil(); + BizObject pbo = pbm.createQuery("FLOWUNID=:flowunid").setParameter("flowunid", FlowUnid).getSingleResult(true); + // 查询lb_doc_contract_list表 + bo = contBom.createQuery("project_id=:projectId and flow_unid=:flowunid and file_flag='yes' and (sendprocess='0' or sendprocess='2' ) ") + .setParameter("projectId", ProjectId).setParameter("flowunid", FlowUnid).getSingleResult(true); + if(bo == null ){ + throw new RuntimeException("请检查合同文件是否生成！"); + } else { + Map>> parameter = new HashMap>>(); + List> companyPar = new LinkedList>(); + Map param1 = new HashMap(); + param1.put("type", "1");// 1标识当期发起公司公章，2标识当前公司下的子公司 + param1.put("mobile", "12599998888");//子公司添加接收手机号，如果不需要接收，直接填写一个虚拟不存在就行，如果需要传真实手机号 + companyPar.add(param1); + // 添加公司公章 + if("LHZL".equals(operationType)){ + Map param2 = new HashMap(); + param2.put("type", "2");// 1标识当期发起公司公章，2标识当前公司下的子公司 + param2.put("mobile", "12599998888");//子公司添加接收手机号，如果不需要接收，直接填写一个虚拟不存在就行，如果需要传真实手机号 + companyPar.add(param2); + } + parameter.put("COMPANY", companyPar); + //创建合同 + SdkResponse createContract = catu.createContract(parameter, SubjectId,bo.getAttribute("filename").getString()); + Long contractId = createContract.getResult().getId(); + //添加本地生成的合同文件 + String makefullPath = bo.getAttribute("FULLPATH").toString();// 获取生成文件路径 + SdkResponse addDocumentByFile = catu.addDocumentByFile(makefullPath, SubjectId, contractId); + Long documentId = addDocumentByFile.getResult().getDocumentId(); + //发起合同 + catu.send(null, SubjectId, contractId, documentId,tempid); + //调用公司盖章 + catu.companySealSign(SubjectId, contractId); +// ContractSignVtwoUtils contractSignVtwoUtils = new ContractSignVtwoUtils(); +// System.out.println("claimSignInsuranceTwo 发起公司盖章"); +// String tempId="5c494617683548a49cfc050f60067ea2"; +// String fileName=bo.getAttribute("filename").getString(); +// String filePath=makefullPath; +// String res = contractSignVtwoUtils.sign(ContractSignEnums.ContractSignTypeEnum.SIGNATURE_DEFAULT, +// tempId, SubjectId, fileName, filePath, null); + + + bo.setAttributeValue("DOCUMENT_ID",documentId); + bo.setAttributeValue("SINGCONTRACT_ID", contractId); + bo.setAttributeValue("SIGN_TYPE", "COMPLETE");// 法人客户当盖完章改为完成状态 + bo.setAttributeValue("SENDPROCESS", "2"); + contBom.saveObject(bo); + Map fromCondtion = new HashMap(); + Map otherProperty = new HashMap(); + String contractDocId = bo.getAttribute("id") + .toString(); + fromCondtion.put("id", contractDocId); + otherProperty.put("SIGNPROCESS", "0");// 发起电子签约 + otherProperty.put("CONTRACTDOCID", contractDocId);// 发起电子签约 + otherProperty.put("INPUTTIME",DateAssistant.getTodayNow()); + // 拷表的方法 + DataOperatorUtil.copySingleJBO(LB_DOC_CONTRACT_LIST.CLASS_NAME, fromCondtion,LB_CONTRACT_SIGN_LOG.CLASS_NAME, null,otherProperty, tx); + + pbo.setAttributeValue("DATA_STATE", "8");// 状态改成电子签约，签署中 + pbm.saveObject(pbo); + String downloadstatus = catu.contractDownload(SubjectId, documentId, makefullPath); + System.out.println("合同下载log===" + downloadstatus); + return "success"; + } + } catch (Exception e) { + tx.rollback(); + e.printStackTrace(); + System.out.println("法人客户生成合同盖章失败" + e.getMessage()); + return "flase@error"; + } + } + private List getPersonPar(BizObject bo, String FlowUnid) throws JBOException { + + List personPar = new LinkedList(); + + //添加个人基本信息 + SignatoryVo czVo=new SignatoryVo(); + czVo.setSignatoryType(ContractSignEnums.SignatoryTypeEnum.PERSON_CZ.getType()); + czVo.setSignatorySubType(ContractSignEnums.SignatoryTypeEnum.PERSON_CZ.getSubType()); + czVo.setName(bo.getAttribute("CUSTOMERNAME").toString()); + czVo.setMobile(bo.getAttribute("TELEPHONE").toString()); + personPar.add(czVo); + + //获取共同申请人的信息 + SignatoryVo gtVo=new SignatoryVo(); + BizObjectManager cftm = JBOFactory.getBizObjectManager(CUSTOMER_FAMILY_TEMP.CLASS_NAME); + BizObject cft = cftm.createQuery("flowunid=:FLowUnid and Partner_='Y'").setParameter("FLowUnid", FlowUnid).getSingleResult(false); + if(cft!=null){ + String name = cft.getAttribute("name").toString(); + String mobile = cft.getAttribute("tel").toString(); + if(name.length()>0 && mobile.length()>0){ + gtVo.setSignatoryType(ContractSignEnums.SignatoryTypeEnum.PERSON_GT.getType()); + gtVo.setSignatorySubType(ContractSignEnums.SignatoryTypeEnum.PERSON_GT.getSubType()); + gtVo.setName(name); + gtVo.setMobile(mobile); + personPar.add(gtVo); + } + } + //获取担保人信息 + BizObjectManager cptm = JBOFactory.getBizObjectManager(LB_GUARANTEE_UNIT_TEMP.CLASS_NAME); + List cpts = cptm.createQuery("select * from O where flowunid=:flowUnid and CERTTYPE='Ind01' ").setParameter("flowUnid", FlowUnid).getResultList(false); + int count = 0; + if(cpts!=null && cpts.size()>2){ + count = 2; + }else{ + count = cpts.size(); + } + for(int i=0;i0 && mobile.length()>0){ + SignatoryVo dbVo=new SignatoryVo(); + if(i==0){ + dbVo.setSignatoryType(ContractSignEnums.SignatoryTypeEnum.PERSON_DBONE.getType()); + dbVo.setSignatorySubType(ContractSignEnums.SignatoryTypeEnum.PERSON_DBONE.getSubType()); + }else if(i==1){ + dbVo.setSignatoryType(ContractSignEnums.SignatoryTypeEnum.PERSON_DBTWO.getType()); + dbVo.setSignatorySubType(ContractSignEnums.SignatoryTypeEnum.PERSON_DBTWO.getSubType()); + } + dbVo.setName(name); + dbVo.setMobile(mobile); + personPar.add(dbVo); + } + } + return personPar; + } + + //个人直接发起电子签约 + public String signIng(JBOTransaction tx) throws Exception { + BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME, tx); + BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); + BizObject bo = null; + // 乘用车售后回租电子签约 乘用车电子签约 + // 商用车一车一挂电子签约 商用车电子签约 + if("CYCDZQ".equals(operationType)||"CYSHDZ".equals(operationType) ){ + tempid="f57aa80567853aa37fd6dd902021b"; + }else if( "SYCDZQ".equals(operationType)||"SYCSHHZDZQ".equals(operationType) ){ + tempid="f57aa80567853aa37fd6dd902021d"; + } + + try { + BizObject pbo = pbm.createQuery("FLOWUNID=:flowunid") + .setParameter("flowunid", FlowUnid).getSingleResult(true); + // 查询lb_doc_contract_list表 + bo = contBom.createQuery("project_id=:projectId and file_flag='yes' and (sendprocess='0' or sendprocess='2' ) ") + .setParameter("projectId", ProjectId).getSingleResult(true); + if(bo == null ){ + throw new RuntimeException("请检查合同文件是否生成！"); + } else { + Map> parameter = new HashMap>(); + //List> companyPar = new LinkedList>(); + List companyPar=new LinkedList(); + // 添加公司公章 + SignatoryVo comVo=new SignatoryVo(); + comVo.setSignatoryType(ContractSignEnums.SignatoryTypeEnum.PARENT_COMPANY.getType()); + comVo.setSignatorySubType(ContractSignEnums.SignatoryTypeEnum.PARENT_COMPANY.getSubType()); + comVo.setMobile("12599998888"); + companyPar.add(comVo); +// if( "LHZL".equals(operationType) ){ +// Map param2 = new HashMap(); +// param2.put("type", "2");// 1标识当期发起公司公章，2标识当前公司下的子公司 +// param2.put("mobile", "12599998888");//子公司添加接收手机号，如果不需要接收，直接填写一个虚拟不存在就行，如果需要传真实手机号 +// companyPar.add(param2); +// } + parameter.put("COMPANY", companyPar); + //添加个人基本信息 + List personPar=getPersonPar(bo,FlowUnid); + + parameter.put("PERSONAL", personPar); + ContractSignActionDzqUtil catu = new ContractSignActionDzqUtil(); + //创建合同 + SdkResponse createContract = catu.createContract(parameter, SubjectId,bo.getAttribute("filename").getString()); + Long contractId = createContract.getResult().getId(); + //添加本地生成的合同文件 + String makefullPath = bo.getAttribute("FULLPATH").toString();// 获取生成文件路径 + SdkResponse addDocumentByFile = catu.addDocumentByFile(makefullPath, SubjectId, contractId); + Long documentId = addDocumentByFile.getResult().getDocumentId(); + + List signatoryVoList=new LinkedList(); + signatoryVoList.addAll(companyPar); + signatoryVoList.addAll(personPar); + //发起合同 + catu.send(signatoryVoList, SubjectId, contractId, documentId,tempid); + + bo.setAttributeValue("DOCUMENT_ID",documentId); + bo.setAttributeValue("SINGCONTRACT_ID", contractId); + bo.setAttributeValue("SIGN_TYPE", "SIGNING"); + bo.setAttributeValue("SENDPROCESS", "1"); + contBom.saveObject(bo); + Map fromCondtion = new HashMap(); + Map otherProperty = new HashMap(); + String contractDocId = bo.getAttribute("id") + .toString(); + fromCondtion.put("id", contractDocId); + otherProperty.put("SIGNPROCESS", "0");// 发起电子签约 + otherProperty.put("CONTRACTDOCID", contractDocId);// 发起电子签约 + otherProperty.put("INPUTTIME",DateAssistant.getTodayNow()); + // 拷表的方法 + DataOperatorUtil.copySingleJBO(LB_DOC_CONTRACT_LIST.CLASS_NAME, fromCondtion,LB_CONTRACT_SIGN_LOG.CLASS_NAME, null,otherProperty, tx); + + pbo.setAttributeValue("DATA_STATE", "8");// 状态改成电子签约，签署中 + pbm.saveObject(pbo); + return "success"; + } + + } catch (Exception e) { + tx.rollback(); + e.printStackTrace(); + System.out.println("自然人电子签约异常:" + e.getMessage()); + return "flase@error"; + } + } + + //查出签约结果 + public String contractSignStatus(JBOTransaction tx) throws Exception { + BizObjectManager pbm = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME, tx); + BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); + // 查询lb_doc_contract_list表 + BizObject bo = contBom.createQuery("project_id=:projectId and file_flag='yes' and (sendprocess='0' or sendprocess='1' ) ") + .setParameter("projectId", ProjectId).getSingleResult(true); + if(bo == null ){ + return "请检查合同文件是否生成！"; + } else { + long signContractId = new Long(bo.getAttribute("SINGCONTRACT_ID")==null ? null : bo.getAttribute("SINGCONTRACT_ID").getString()); + long documentId = new Long(bo.getAttribute("DOCUMENT_ID")==null ? null : bo.getAttribute("DOCUMENT_ID").getString()); + String makefullPath = bo.getAttribute("FULLPATH")==null ? null : bo.getAttribute("FULLPATH").getString();// 获取生成文件路径 + + ContractSignActionTwoOwnUtil catu = new ContractSignActionTwoOwnUtil(); + String contractStatus = catu.getContractStatus(SubjectId, signContractId); + if("success".equals(contractStatus)){ + //调用公司盖章 + catu.companySealSign(SubjectId, signContractId); + bo.setAttributeValue("SIGN_TYPE", "COMPLETE"); + bo.setAttributeValue("PROCESS", "5"); + // contBom.saveObject(bo); + Map fromCondtion = new HashMap(); + Map otherProperty = new HashMap(); + String contractDocId = bo.getAttribute("id").toString(); + fromCondtion.put("id", contractDocId); + otherProperty.put("SIGNPROCESS", "0");// 发起电子签约 + otherProperty.put("CONTRACTDOCID", contractDocId);// 发起电子签约 + otherProperty.put("INPUTTIME",DateAssistant.getTodayNow()); + // 拷表的方法 + DataOperatorUtil.copySingleJBO(LB_DOC_CONTRACT_LIST.CLASS_NAME, fromCondtion,LB_CONTRACT_SIGN_LOG.CLASS_NAME, null,otherProperty, tx); + + BizObject pbo = pbm.createQuery("FLOWUNID=:flowunid").setParameter("flowunid", FlowUnid).getSingleResult(true); + pbo.setAttributeValue("DATA_STATE", "8");// 状态改成电子签约，签署中 + pbm.saveObject(pbo); + String downloadstatus = catu.contractDownload(SubjectId, documentId, makefullPath); + System.out.println("合同下载log===" + downloadstatus); + bo.setAttributeValue("PROCESS", "6"); + contBom.saveObject(bo); + return "已完成"; + }else{ + return contractStatus; + } + } + } + + public String sendMessageAgain(JBOTransaction tx) { + try{ + BizObjectManager contBom = JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME, tx); + BizObject bo = null; + bo = contBom.createQuery("select singcontract_id,filename from O where project_id =:projectId" + +" and file_flag = 'yes' and sendprocess = '1' and sign_type = 'SIGNING'") + .setParameter("projectId", ProjectId).getSingleResult(true); + if(bo == null ){ + return "请检查合同文件是否生成！"; + } else { + long signContractId =new Long(bo.getAttribute("SINGCONTRACT_ID")==null ? null : bo.getAttribute("SINGCONTRACT_ID").getString()); + ContractSignActionTwoOwnUtil catu = new ContractSignActionTwoOwnUtil(); + return catu.messageSend(SubjectId, signContractId); + } + } catch (Exception e) { + try { + tx.rollback(); + } catch (JBOException e1) { + e1.printStackTrace(); + } + e.printStackTrace(); + return "error"; + } + } + + public String getFlowUnid() { + return FlowUnid; + } + public void setFlowUnid(String flowUnid) { + FlowUnid = flowUnid; + } + public String getFlagType() { + return flagType; + } + public void setFlagType(String flagType) { + this.flagType = flagType; + } + public String getProjectId() { + return ProjectId; + } + public void setProjectId(String projectId) { + ProjectId = projectId; + } + public String getSubjectId() { + return SubjectId; + } + public void setSubjectId(String subjectId) { + SubjectId = subjectId; + } + + public String getCustomerType() { + return customerType; + } + + public void setCustomerType(String customerType) { + this.customerType = customerType; + } + + public String getCurUserID() { + return CurUserID; + } + + public void setCurUserID(String curUserID) { + CurUserID = curUserID; + } + + public String getOperationType() { + return operationType; + } + + public void setOperationType(String operationType) { + this.operationType = operationType; + } + + public String getTempid() { + return tempid; + } + + public void setTempid(String tempid) { + this.tempid = tempid; + } +} diff --git a/src/com/tenwa/channelportal/action/ContractSignActionDzqUtil.java b/src/com/tenwa/channelportal/action/ContractSignActionDzqUtil.java new file mode 100644 index 000000000..66e372cb0 --- /dev/null +++ b/src/com/tenwa/channelportal/action/ContractSignActionDzqUtil.java @@ -0,0 +1,498 @@ +package com.tenwa.channelportal.action; + +import com.amarsoft.are.jbo.JBOException; +import com.amarsoft.awe.util.ASResultSet; +import com.amarsoft.awe.util.SqlObject; +import com.amarsoft.awe.util.Transaction; +import com.amarsoft.dict.als.cache.CacheLoaderFactory; +import com.qiyuesuo.sdk.v2.SdkClient; +import com.qiyuesuo.sdk.v2.bean.*; +import com.qiyuesuo.sdk.v2.http.StreamFile; +import com.qiyuesuo.sdk.v2.json.JSONUtils; +import com.qiyuesuo.sdk.v2.param.SignParam; +import com.qiyuesuo.sdk.v2.request.*; +import com.qiyuesuo.sdk.v2.response.DocumentAddResult; +import com.qiyuesuo.sdk.v2.response.SdkResponse; +import com.qiyuesuo.sdk.v2.utils.IOUtils; +import com.tenwa.app.manage.qiyuesuo.v2.ContractSignEnums; +import com.tenwa.app.manage.qiyuesuo.v2.SignatoryVo; +import com.tenwa.app.manage.qiyuesuo.v2.StamperVo; +import com.tenwa.util.MultiSubjectUtil; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.util.*; + +public class ContractSignActionDzqUtil { + + private static final ResourceBundle resourceBunlde = ResourceBundle.getBundle("qiyuesuo"); + + + //深圳公司参数 + private static final String sZ_Url = resourceBunlde.getString("SZ_Url"); + private static final String sZ_Key = resourceBunlde.getString("SZ_Key"); + private static final String sZ_Secret = resourceBunlde.getString("SZ_Secret"); + private static final String sZ_OfficialSealId = resourceBunlde.getString("SZ_OfficialSealId"); + private static final String sZ_CompanyName = resourceBunlde.getString("SZ_CompanyName"); + + //天津公司参数 + private static final String tJ_Url = resourceBunlde.getString("TJ_Url"); + private static final String tJ_Key = resourceBunlde.getString("TJ_Key"); + private static final String tJ_Secret = resourceBunlde.getString("TJ_Secret"); + private static final String tJ_OfficialSealId = resourceBunlde.getString("TJ_OfficialSealId"); + private static final String tJ_CompanyName = resourceBunlde.getString("TJ_CompanyName"); + + //子公司参数（辉煌） + private static final String hH_CompanyName = resourceBunlde.getString("HH_CompanyName"); + private static final String hH_OfficialSealId = resourceBunlde.getString("HH_OfficialSealId"); + + + public static void main(String[] args) { + System.out.println(sZ_Url); + System.out.println(sZ_CompanyName); + + } + + private SdkClient getSdkClient(String subjectId){ + if(MultiSubjectUtil.SZSUBJECTID.equals(subjectId)){ + return new SdkClient(sZ_Url, sZ_Key, sZ_Secret); + }else if (MultiSubjectUtil.TJSUBJECTID.equals(subjectId)){ + return new SdkClient(sZ_Url, sZ_Key, sZ_Secret);//应客户要求，现在都是以深圳主体发起 + //return new SdkClient(tJ_Url, tJ_Key, tJ_Secret); + } + return null; + } + + private String getComPanyName(String subjectId){ + if(MultiSubjectUtil.SZSUBJECTID.equals(subjectId)){ + return sZ_CompanyName; + }else if (MultiSubjectUtil.TJSUBJECTID.equals(subjectId)){ + return tJ_CompanyName; + } + return null; + } + //创建合同 + public SdkResponse createContract(Map> parameter, String subjectId, String fileNme) throws Exception { + SdkClient client = this.getSdkClient(subjectId); + Contract draftContract = new Contract(); + draftContract.setSubject(fileNme); + draftContract.setOrdinal(false); + List list = parameter.get("PERSONAL"); + if(list!=null && list.size()>0){ + for (SignatoryVo vo : list) { + Signatory persoanlSignatory = new Signatory(); + persoanlSignatory.setTenantType(vo.getSignatoryType()); + persoanlSignatory.setTenantName(vo.getName()); + persoanlSignatory.setReceiver(new User(vo.getSignatorySubType(), vo.getMobile(), "MOBILE")); + draftContract.addSignatory(persoanlSignatory); + } + } + list = parameter.get("COMPANY"); + if(list!=null && list.size()>0){ + for (SignatoryVo vo : list) { + Signatory platformSignatory = new Signatory(); + platformSignatory.setTenantType(vo.getSignatoryType()); + Action sealAction = new Action(); + sealAction.setType("COMPANY"); + if (ContractSignEnums.SignatoryTypeEnum.PARENT_COMPANY.getSubType().equals(vo.getSignatorySubType())) { + if(MultiSubjectUtil.SZSUBJECTID.equals(subjectId)){ + platformSignatory.setTenantName(sZ_CompanyName); + vo.setName(sZ_CompanyName); + sealAction.setName(sZ_CompanyName); + sealAction.setSealId(new Long(sZ_OfficialSealId)); + }else if (MultiSubjectUtil.TJSUBJECTID.equals(subjectId)){ + platformSignatory.setTenantName(tJ_CompanyName); + vo.setName(tJ_CompanyName); + sealAction.setName(tJ_CompanyName); + sealAction.setSealId(new Long(tJ_OfficialSealId)); + } + } else { + platformSignatory.setTenantName(hH_CompanyName); + vo.setName(hH_CompanyName); + sealAction.setName(hH_CompanyName); + sealAction.setSealId(new Long(hH_OfficialSealId) ); + } + platformSignatory.setReceiver(new User(vo.getMobile(), "MOBILE"));//子公司必须设置接收方，不管是否是子公司，都设置了一个 + platformSignatory.addAction(sealAction); + draftContract.addSignatory(platformSignatory); + } + } + draftContract.setSend(false); + String response = null; + try { + response = client.service(new ContractDraftRequest(draftContract)); + } catch (Exception e) { + throw new Exception("创建合同草稿请求服务/器失败，失败原因：" + e.getMessage()); + } + System.out.println(response); + SdkResponse sdkResponse = JSONUtils.toQysResponse(response, + Contract.class); + if (!sdkResponse.getCode().equals(0)) { + throw new Exception("创建合同草稿失败，失败原因：" + sdkResponse.getMessage()); + } + return sdkResponse; + } + + //添加本地文件 + public SdkResponse addDocumentByFile(String filePath,String subjectId,Long contractId)throws Exception { + SdkClient client = this.getSdkClient(subjectId); + // 进入本地文件 + StreamFile file = new StreamFile(new FileInputStream(new File(filePath))); + String response = null; + try { + // PDF为本地文件的类型，请修改为对应的本地文件类型 + response = client.service(new DocumentAddByFileRequest(contractId,file, "pdf", "由文件创建文档")); + } catch (Exception e) { + throw new Exception("根据文件添加文档请求服务器失败，失败原因：" + e.getMessage()); + } + SdkResponse sdkResponse = JSONUtils.toQysResponse( + response, DocumentAddResult.class); + if (!sdkResponse.getCode().equals(0)) { + throw new Exception("根据文件添加文档失败，失败原因：" + sdkResponse.getMessage()); + } + return sdkResponse; + } + + //发起合同 + public SdkResponse send(List signatoryVoList,String subjectId, Long contractId,Long documentId,String tempid) throws Exception { + SdkClient client = this.getSdkClient(subjectId); + Contract draft = getContract(subjectId, contractId).getResult(); + //赋值更新Volist，为发起合同做准备 + updateVoList(draft.getSignatories(),signatoryVoList); + //从数据库获取签章配置信息 + List stamperVoList = initQuerySql(tempid, documentId); + //遍历合并签署位置信息 + List stampers = updateStamperList(signatoryVoList,stamperVoList); +// for (Signatory signatory : draft.getSignatories()) { +// // 获取平台方SignatoryId，以及对应的公章签署ActionId和法人章签署ActionId +// if (signatory.getTenantType().equals("COMPANY")) { +// for (Action action : signatory.getActions()) { +// platformSignatoryId = signatory.getId(); +// companySealActionId = action.getId(); +// stampers=getStampers(tempid,documentId,companySealActionId,platformSignatoryId); +//// Stamper sealStamper = new Stamper(); +//// sealStamper.setPage(0); +//// sealStamper.setType("COMPANY"); +//// sealStamper.setActionId(companySealActionId); +//// sealStamper.setSignatoryId(platformSignatoryId); +//// sealStamper.setDocumentId(documentId); +//// if (action.getName().equals(sZ_CompanyName)||action.getName().equals(tJ_CompanyName)) { +////// sealStamper.setKeyword("甲方（出租人1）：（公章） "); +//// sealStamper.setKeyword("甲方（出租人）：（公章）"); +//// sealStamper.setOffsetX(-0.12); +////// sealStamper.setOffsetY(-0.04); +//// sealStamper.setOffsetY(-0.13); +//// +//// //添加第二个盖章位置 +//// Stamper sealStamper2 = new Stamper(); +//// sealStamper2.setPage(0); +//// sealStamper2.setType("COMPANY"); +//// sealStamper2.setActionId(companySealActionId); +//// sealStamper2.setSignatoryId(platformSignatoryId); +//// sealStamper2.setDocumentId(documentId); +//// sealStamper2.setKeyword("抵押权人：安鹏融资租赁（天津）有限公司"); +//// sealStamper2.setOffsetX(-0.18); +//// sealStamper2.setOffsetY(-0.10); +//// stampers.add(sealStamper2); +//// stampers.add(sealStamper); +//// } else { +//// //sealStamper.setKeyword("甲方（出租人2）：（公章）"); +//// sealStamper.setKeyword("甲方（出租人1）：（公章） "); +//// sealStamper.setOffsetX(-0.12); +////// sealStamper.setOffsetY(-0.13); +//// sealStamper.setOffsetY(-0.04); +//// stampers.add(sealStamper); +//// } +// } +// } +// } + String response = null; + try { + response = client.service(new ContractSendRequest(draft.getId(),stampers)); + } catch (Exception e) { + throw new Exception("发起合同请求服务器失败，失败原因：" + e.getMessage()); + } + SdkResponse sdkResponse = JSONUtils.toQysResponse(response); + if (!sdkResponse.getCode().equals(0)) { + throw new Exception("发起合同失败，失败原因：" + sdkResponse.getMessage()); + } + return sdkResponse; + } + + + /** + * 遍历合并签署位置信息 + * @param signatoryVoList + * @param listVo + * @return + */ + private List updateStamperList(List signatoryVoList, List listVo) { + List listStamper = new ArrayList<>(); + for(StamperVo stamperVo : listVo){ + for(SignatoryVo signatoryVo : signatoryVoList){ + if(stamperVo.getStamperSubType().equals(signatoryVo.getSignatorySubType())){ + Stamper stamper = stamperVo.getStamper(); + stamper.setSignatoryId(signatoryVo.getSignatoryId()); + stamper.setActionId(signatoryVo.getActionId()); + listStamper.add(stamper); + } + } + } + return listStamper; + } + /** + * 赋值操作更新 actionId， SignatoryId + * @param signatoryList + * @param signatoryVoList + * @return + */ + private void updateVoList(List signatoryList, List signatoryVoList) { + for(SignatoryVo signatoryVo : signatoryVoList){ + for (Signatory signatory : signatoryList) { + if(signatoryVo.getName().equals(signatory.getTenantName()) && signatoryVo.getSignatoryType().equals(signatory.getTenantType())){ + signatoryVo.setSignatoryId(signatory.getId()); + if (signatory.getTenantType().equals(ContractSignEnums.SignatoryTypeEnum.PARENT_COMPANY.getType())) { +// logger.info("ContractSignVtwoUtils#updateVoList 当签署方信息为公司时"); +// logger.info("ContractSignVtwoUtils#updateVoList 开始遍历签署方信息中的签署流程"); + for (Action action : signatory.getActions()) { + signatoryVo.setActionId(action.getId());//公司签署位置必传项 + } + } + } + } + } + } + + /** + * Stamper 签署位置 + * 公司签署位置需要指定ActionId + * 个人签署位置需要指定SignatoryId + */ + private List initQuerySql(String tempId, Long documentId) throws Exception{ + Transaction Sqlca=null; + List list = new ArrayList<>(); + try { + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + String selSql = " select stamper_type, stamper_sub_type, keyword, offsetX, offsetY, keywordIndex from lb_contract_sign_stamper where temp_id='"+ tempId +"' " ; + ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); + while(rs.next()) { + StamperVo stamperVo = new StamperVo(); + stamperVo.setStamperSubType(rs.getString("stamper_sub_type")); // 签署位置类型：母公司，子公司，承租人，共同申请人，担保人1，担保人2 + Stamper stamper = new Stamper(); + stamper.setPage(0);// 坐标页码，0代表所有 + stamper.setDocumentId(documentId);//合同文档ID + // 获取接口推送所需数据 + stamper.setType(rs.getString("stamper_type")); // 签署类型：COMPANY（公章），PERSONAL（个人签名），LP（法人章），TIMESTAMP（时间戳），ACROSS_PAGE（骑缝章） + stamper.setKeyword(rs.getString("keyword")); // 关键字 + stamper.setOffsetX(Double.parseDouble(rs.getString("offsetX"))); // 横坐标/关键字偏移量 + stamper.setOffsetY(Double.parseDouble(rs.getString("offsetY"))); // 纵坐标/关键字偏移量 + stamper.setKeywordIndex(Integer.parseInt(rs.getString("keywordIndex"))); // 关键字索引：1代表第1个关键字，0代表所有关键字，-1代表倒数第1个关键字；默认为1 + stamperVo.setStamper(stamper); + list.add(stamperVo); + } + }catch (Exception e){ + e.printStackTrace(); + throw new Exception("ContractSignVtwoUtils#initQuerySql 签署位置sql查询，失败原因：" + e.getMessage()); + }finally{ + if(Sqlca!=null){ + try { + Sqlca.disConnect(); + } catch (JBOException e) { + e.printStackTrace(); + } + Sqlca = null; + } + } + return list; + } + + /** + * 根据tempId获得签章的相关配置信息 + * @param tempId + * @param documentId + * @param companySealActionId + * @param platformSignatoryId + * @return + * @throws Exception + */ + List getStampers(String tempId,Long documentId,Long companySealActionId,Long platformSignatoryId)throws Exception{ + Transaction Sqlca=null; + List list = new ArrayList<>(); + try { + Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource()); + String selSql = " select stamper_type, stamper_sub_type, keyword, offsetX, offsetY, keywordIndex from lb_contract_sign_stamper where temp_id='"+ tempId +"' " ; + ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql)); + while(rs.next()) { + Stamper stamper = new Stamper(); + stamper.setPage(0);// 坐标页码，0代表所有 + stamper.setDocumentId(documentId);//合同文档ID + // 获取接口推送所需数据 + stamper.setType(rs.getString("stamper_type")); // 签署类型：COMPANY（公章），PERSONAL（个人签名），LP（法人章），TIMESTAMP（时间戳），ACROSS_PAGE（骑缝章） + stamper.setActionId(companySealActionId); + stamper.setSignatoryId(platformSignatoryId); + stamper.setKeyword(rs.getString("keyword")); // 关键字 + stamper.setOffsetX(Double.parseDouble(rs.getString("offsetX"))); // 横坐标/关键字偏移量 + stamper.setOffsetY(Double.parseDouble(rs.getString("offsetY"))); // 纵坐标/关键字偏移量 + stamper.setKeywordIndex(Integer.parseInt(rs.getString("keywordIndex"))); // 关键字索引：1代表第1个关键字，0代表所有关键字，-1代表倒数第1个关键字；默认为1 + list.add(stamper); + } + }catch (Exception e){ + throw new Exception("ContractSignVtwoUtils#initQuerySql 签署位置sql查询，失败原因：" + e.getMessage()); + }finally{ + if(Sqlca!=null){ + try { + Sqlca.disConnect(); + } catch (JBOException e) { + e.printStackTrace(); + } + Sqlca = null; + } + } + return list; + } + + //公司盖章 + public SdkResponse companySealSign(String subjectId,Long contractId) throws Exception { + String response = null; + try { + SdkClient client = this.getSdkClient(subjectId); + Contract contract = this.getContract(subjectId,contractId).getResult(); + List signatories = contract.getSignatories(); + if(signatories!=null && signatories.size()>0){ + for (Signatory signatory : signatories) { + String tenantType = signatory.getTenantType(); + String status = signatory.getStatus(); + if(tenantType!=null && "COMPANY".equals(tenantType) && status!=null && "SIGNING".equals(status)){ + SignParam param = new SignParam(); + param.setContractId(contractId); + String company = signatory.getTenantName(); + System.out.println("盖章公司名称："+company); + param.setTenantName(company); + + if(sZ_CompanyName.equals(company)){ + param.setSealId(new Long(sZ_OfficialSealId)); + }else if(tJ_CompanyName.equals(company)){ + param.setSealId(new Long(tJ_OfficialSealId)); + }else if(hH_CompanyName.equals(company)){ + param.setSealId(new Long(hH_OfficialSealId)); + } + response = client.service(new ContractSignCompanyRequest(param)); + } + } + } + } catch (Exception e) { + throw new Exception("公章签署请求服务器失败，失败原因：" + e.getMessage()); + } + SdkResponse sdkResponse = JSONUtils.toQysResponse(response); + if (!sdkResponse.getCode().equals(0)) { + throw new Exception("公章签署失败，失败原因：" + sdkResponse.getMessage()); + } + return sdkResponse; + } + + public String getContractStatus(String subjectId, Long contractId) throws Exception{ + Contract contract = this.getContract(subjectId,contractId).getResult(); + boolean stu = true; + StringBuffer sb = new StringBuffer(); + List signatories = contract.getSignatories(); + if(signatories!=null && signatories.size()>0){ + for (Signatory signatory : signatories) { + String tenantType = signatory.getTenantType(); + String status = signatory.getStatus(); + if(tenantType!=null && "PERSONAL".equals(tenantType)){ + if(stu && status != null && (!status.equals("SIGNED")) ){ + stu = false ; + } + String statusName = ""; + switch (status) { + case "DRAFT": + statusName="草稿"; + break; + case "RECALLED": + statusName="已撤回"; + break; + case "SIGNING": + statusName="签署中"; + break; + case "REJECTED": + statusName="已退回"; + break; + case "SIGNED": + statusName="已完成"; + break; + case "EXPIRED": + statusName="已过期"; + break; + case "FILLING": + statusName="拟定中"; + break; + case "WAITING": + statusName="待签署"; + break; + case "INVALIDING": + statusName="作废中"; + break; + case "INVALIDED": + statusName="已作废"; + break; + default: + statusName="状态未匹配"; + break; + } + sb.append(signatory.getTenantName()).append(":").append(statusName).append("；"); + } + } + } + if(stu){ + return "success"; + }else{ + return sb.substring(0, sb.length()-1); + } + } + public SdkResponse getContract(String subjectId, Long contractId) throws Exception { + SdkClient client = this.getSdkClient(subjectId); + ContractDetailRequest request = new ContractDetailRequest(contractId); + String response; + try { + response = client.service(request); + } catch (Exception e) { + throw new Exception("合同详情查询，失败原因：" + e.getMessage()); + } + SdkResponse sdkResponse = JSONUtils.toQysResponse(response, Contract.class); + if (!sdkResponse.getCode().equals(0)) { + throw new Exception("合同详情查询，失败原因：" + sdkResponse.getMessage()); + } + return sdkResponse; + } + //合同下载 + public String contractDownload(String subjectId, Long documentId, String filePath) throws Exception { + SdkClient client = this.getSdkClient(subjectId); + DocumentDownloadRequest request = new DocumentDownloadRequest(documentId); + FileOutputStream fos = null; + try { + fos = new FileOutputStream(filePath); + client.download(request, fos); + IOUtils.safeClose(fos); + } catch (FileNotFoundException e) { + throw new Exception("合同文件下载，失败原因：" + e.getMessage()); + }finally{ + fos.close(); + } + return "合同下载成功！"; + } + + public String messageSend(String subjectId,Long signContractId){ + SdkClient client = this.getSdkClient(subjectId); + ContractNoticeRequest request = new ContractNoticeRequest(signContractId); + String response = client.service(request); + SdkResponse responseObj = JSONUtils.toQysResponse(response); + if(responseObj.getCode() == 0) { + return "success"; + } else { + System.out.println("短信重发失败："+responseObj.getCode()+":"+responseObj.getMessage()); + return responseObj.getMessage(); + } + } +} diff --git a/src_tenwa/com/tenwa/makeContract/util/MakeOneCodeAndContractModel.java b/src_tenwa/com/tenwa/makeContract/util/MakeOneCodeAndContractModel.java index 1c6da89d1..d8d671933 100644 --- a/src_tenwa/com/tenwa/makeContract/util/MakeOneCodeAndContractModel.java +++ b/src_tenwa/com/tenwa/makeContract/util/MakeOneCodeAndContractModel.java @@ -345,8 +345,42 @@ public class MakeOneCodeAndContractModel { img.setAbsolutePosition(400, 800); under10.addImage(img); } - + if(pages>10&&"02".equals(leasform)&&("乘用车手签".equals(docName)||"商用车手签".equals(docName))){ + //车辆交接单水印 + PdfContentByte under5 = stamp.getUnderContent(5); + img.scaleAbsolute(180, 32); + img.setAbsolutePosition(400, 800); + under5.addImage(img); + + PdfContentByte under7 = stamp.getUnderContent(7); + img.scaleAbsolute(180, 32); + img.setAbsolutePosition(400, 800); + under7.addImage(img); + //租金支付表水印 + PdfContentByte under9 = stamp.getUnderContent(11); + img.scaleAbsolute(180, 32); + img.setAbsolutePosition(400, 800); + under9.addImage(img); + } + + if(pages>7&&"02".equals(leasform)&&("乘用车电子签约".equals(docName)||"商用车电子签约".equals(docName))){ + //车辆交接单水印 + PdfContentByte under5 = stamp.getUnderContent(5); + img.scaleAbsolute(180, 32); + img.setAbsolutePosition(400, 800); + under5.addImage(img); + + PdfContentByte under7 = stamp.getUnderContent(6); + img.scaleAbsolute(180, 32); + img.setAbsolutePosition(400, 800); + under7.addImage(img); + //租金支付表水印 + PdfContentByte under9 = stamp.getUnderContent(8); + img.scaleAbsolute(180, 32); + img.setAbsolutePosition(400, 800); + under9.addImage(img); + } stamp.close();// 关闭 File tempfile = new File(InPdfFile); //删除原文件 From dd1aa4cc8d118cd3b8388a77c73da23608a046a1 Mon Sep 17 00:00:00 2001 From: maliang Date: Mon, 11 Oct 2021 14:39:12 +0800 Subject: [PATCH 16/26] =?UTF-8?q?fix:=E6=96=B0=E5=A2=9E=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=AD=BE=E7=BA=A6=E7=A1=AE=E8=AE=A4=E5=87=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ElectronicSigningConfirmation.jsp | 184 ++++++++++++++++++ .../action/ContractSignAction.java | 2 + .../controller/FindNotifyAction.java | 47 +++++ .../controller/RentNotinyDeleteAction.java | 4 +- 4 files changed, 236 insertions(+), 1 deletion(-) create mode 100644 WebContent/Tenwa/Lease/Flow/Comm/LBContract/ElectronicSigningConfirmation.jsp diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/ElectronicSigningConfirmation.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/ElectronicSigningConfirmation.jsp new file mode 100644 index 000000000..c3eb133ad --- /dev/null +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/ElectronicSigningConfirmation.jsp @@ -0,0 +1,184 @@ +<%@page import="jbo.app.tenwa.calc.LC_CALC_CONDITION_TEMP"%> +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%> +<%@ page import="com.tenwa.doc.action.DocListInitAction" %> +<%@ page import="com.amarsoft.app.lc.workflow.action.GetFlowAction" %> +<%@ page import="com.amarsoft.app.util.*" %> +<% + /* + Author: undefined 2016-09-01 + Content: 电子签约确认书 + History Log: + */ + + String userId = CurUser.getUserID(); + String orgId =CurUser.getOrgID(); + System.out.print(orgId); + String falg = "true"; + String compClientID = request.getParameter("CompClientID"); + ASObjectModel doTemp = new ASObjectModel("ElectronicSigningConfirmation"); + if(userId.indexOf("8006")>-1){ + falg = "false"; + //按照用户维度进行权限调整（南京一贯通） + String sql="select count(1) nm from USER_INFO i,user_authority_check a where i.loginid=a.loginid and i.userid ='"+userId+"'"; + String result = Sqlca.getString(new SqlObject(sql)); + + if("8006011".equals(orgId) || "8006053".equals(orgId) || !"0".equals(result)){ + doTemp.appendJboWhere(" and lci.inputorgid='"+orgId+"'"); + }else{ + doTemp.appendJboWhere(" and O.PROJECT_MANAGE='"+userId+"'"); + } + } + + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + dwTemp.ReadOnly = "1"; + dwTemp.setPageSize(15); + dwTemp.MultiSelect = true; + dwTemp.genHTMLObjectWindow(userId); + + //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 + String sButtons[][] =null; + sButtons=new String[][]{ + {"true","All","Button","生成电子签约确认书","生成电子签约确认书","generateQuotation()","","","","btn_icon_generate"}, + {"true","All","Button","批量下载","批量下载","lotdown()","","","","btn_icon_down"}, + {"false","All","Button","公司盖章","公司盖章","stamp()","","","",""}, + }; + +%><%@include file="/Frame/resources/include/ui/include_list.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/src/com/tenwa/channelportal/action/ContractSignAction.java b/src/com/tenwa/channelportal/action/ContractSignAction.java index 5cf565984..83336c31f 100644 --- a/src/com/tenwa/channelportal/action/ContractSignAction.java +++ b/src/com/tenwa/channelportal/action/ContractSignAction.java @@ -1777,6 +1777,8 @@ public void wordToPdfJar(JBOTransaction tx){ DOCRELATIVE=bom.createQuery(" OBJECTTYPE='LetterApprova' and PROJ_ID=:projectId ").setParameter("projectId",ProjectId).getSingleResult(false); }else if("LoanNotice".equals(PLAN_LIST)){ DOCRELATIVE=bom.createQuery(" OBJECTTYPE='LoanNotice' and PROJ_ID=:projectId ").setParameter("projectId",ProjectId).getSingleResult(false); + }else if("ElectronicSigningConfirmation".equals(PLAN_LIST)){//电子签约确认书 + DOCRELATIVE=bom.createQuery(" OBJECTTYPE='ElectronicSigningConfirmation' and PROJ_ID=:projectId ").setParameter("projectId",ProjectId).getSingleResult(false); } else{ DOCRELATIVE=bom.createQuery("plan_number=:plan_number and plan_list=:plan_list").setParameter("plan_number",PAYMENT_NUMBER).setParameter("plan_list", PLAN_LIST).getSingleResult(false); diff --git a/src_core/com/tenwa/officetempalte/controller/FindNotifyAction.java b/src_core/com/tenwa/officetempalte/controller/FindNotifyAction.java index ddb3f9fc3..f1532c93c 100644 --- a/src_core/com/tenwa/officetempalte/controller/FindNotifyAction.java +++ b/src_core/com/tenwa/officetempalte/controller/FindNotifyAction.java @@ -163,4 +163,51 @@ public class FindNotifyAction { } return attributeid; } + + + //电子签约确认书 + public static String findFileNameConfirmation(String projectId) throws JBOException{ + BizObjectManager bom=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME); + BizObject DOCRELATIVE=bom.createQuery("PROJ_ID=:porjectId and OBJECTTYPE='ElectronicSigningConfirmation'").setParameter("porjectId",projectId).getSingleResult(false); + String filename=""; + if(DOCRELATIVE!=null){ + String DOCRELATIVEid=DOCRELATIVE.getAttribute("id").toString(); + BizObjectManager bom1=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME); + String DOCLIBRARYid=bom1.createQuery("relative_id=:relative_id").setParameter("relative_id", DOCRELATIVEid).getSingleResult(false).getAttribute("id").toString(); + BizObjectManager bom2=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME); + filename=bom2.createQuery("library_id=:library_id").setParameter("library_id", DOCLIBRARYid).getSingleResult(false).getAttribute("filename").toString(); + } + return filename; + } + public static String findCreatimeConfirmation(String projectId) throws JBOException{ + String creatime=""; + + BizObjectManager bom=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME); + BizObject DOCRELATIVE=bom.createQuery("PROJ_ID=:porjectId and OBJECTTYPE='ElectronicSigningConfirmation'").setParameter("porjectId",projectId).getSingleResult(false); + + if(DOCRELATIVE!=null){ + String DOCRELATIVEid=DOCRELATIVE.getAttribute("id").toString(); + BizObjectManager bom1=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME); + String DOCLIBRARYid=bom1.createQuery("relative_id=:relative_id").setParameter("relative_id", DOCRELATIVEid).getSingleResult(false).getAttribute("id").toString(); + BizObjectManager bom2=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME); + creatime=bom2.createQuery("library_id=:library_id").setParameter("library_id", DOCLIBRARYid).getSingleResult(false).getAttribute("inputtime").toString(); + } + return creatime; + } + public static String findAttributeidConfirmation(String projectId) throws JBOException{ + String attributeid=""; + + BizObjectManager bom=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME); + BizObject DOCRELATIVE=bom.createQuery("PROJ_ID=:porjectId and OBJECTTYPE='ElectronicSigningConfirmation'").setParameter("porjectId",projectId).getSingleResult(false); + + if(DOCRELATIVE!=null){ + String DOCRELATIVEid=DOCRELATIVE.getAttribute("id").toString(); + BizObjectManager bom1=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME); + String DOCLIBRARYid=bom1.createQuery("relative_id=:relative_id").setParameter("relative_id", DOCRELATIVEid).getSingleResult(false).getAttribute("id").toString(); + BizObjectManager bom2=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME); + attributeid=bom2.createQuery("library_id=:library_id").setParameter("library_id", DOCLIBRARYid).getSingleResult(false).getAttribute("id").toString(); + } + return attributeid; + } + } \ No newline at end of file diff --git a/src_core/com/tenwa/officetempalte/controller/RentNotinyDeleteAction.java b/src_core/com/tenwa/officetempalte/controller/RentNotinyDeleteAction.java index f551a39f1..629eef786 100644 --- a/src_core/com/tenwa/officetempalte/controller/RentNotinyDeleteAction.java +++ b/src_core/com/tenwa/officetempalte/controller/RentNotinyDeleteAction.java @@ -76,7 +76,9 @@ public class RentNotinyDeleteAction { DOCRELATIVE=bom.createQuery(" PROJ_ID=:projectId and OBJECTTYPE='LetterApprova'").setParameter("projectId",projectId).getSingleResult(false); }else if("LoanNotice".equals(objecttype)){ DOCRELATIVE=bom.createQuery(" PROJ_ID=:projectId and OBJECTTYPE='LoanNotice'").setParameter("projectId",projectId).getSingleResult(false); - }else if("contractInsurance".equals(objecttype)){ + }else if("ElectronicSigningConfirmation".equals(objecttype)){//电子签约确认书 + DOCRELATIVE=bom.createQuery(" PROJ_ID=:projectId and OBJECTTYPE='ElectronicSigningConfirmation'").setParameter("projectId",projectId).getSingleResult(false); + }else if("contractInsurance".equals(objecttype)){ DOCRELATIVE=bom.createQuery(" PROJ_ID=:projectId and OBJECTTYPE='contractInsurance' and PLAN_NUMBER=:plan_number").setParameter("projectId",projectId).setParameter("plan_number",plan_number).getSingleResult(false); } else{ From c645aa9ac00db9c2044d0fc7b9de94686bc6a97d Mon Sep 17 00:00:00 2001 From: tangfutang <3218982385@qq.com> Date: Tue, 12 Oct 2021 16:08:54 +0800 Subject: [PATCH 17/26] =?UTF-8?q?=E5=9C=A8=E9=A1=B9=E7=9B=AE=E5=B1=82?= =?UTF-8?q?=E5=92=8C=E5=90=88=E5=90=8C=E5=B1=82=E6=B7=BB=E5=8A=A0=E5=88=86?= =?UTF-8?q?=E6=AE=B5=E8=9E=8D=E6=A0=A1=E9=AA=8C=E5=92=8C=E7=BB=BC=E5=90=88?= =?UTF-8?q?=E5=88=A9=E7=8E=87=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/etc/jbo/jbo_calc.xml | 23 +++++++++++ .../app/tenwa/calc/LC_CONTRACT_CONDITION.java | 20 +++++++--- .../calc/LC_CONTRACT_SUBSECTION_INFO.java | 40 +++++++++++++++++++ .../jbo/app/tenwa/calc/LC_PROJ_CONDITION.java | 16 ++++---- .../tenwa/calc/LC_PROJ_SUBSECTION_INFO.java | 40 +++++++++++++++++++ 5 files changed, 125 insertions(+), 14 deletions(-) diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml index 35850752c..b2058a13b 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml @@ -778,6 +778,8 @@ + + @@ -1082,6 +1084,7 @@ + @@ -4805,6 +4808,16 @@ + + + + + + + + + + @@ -4839,6 +4852,16 @@ + + + + + + + + + + diff --git a/src_jbo/jbo/app/tenwa/calc/LC_CONTRACT_CONDITION.java b/src_jbo/jbo/app/tenwa/calc/LC_CONTRACT_CONDITION.java index 40f0afd3f..978093e6b 100644 --- a/src_jbo/jbo/app/tenwa/calc/LC_CONTRACT_CONDITION.java +++ b/src_jbo/jbo/app/tenwa/calc/LC_CONTRACT_CONDITION.java @@ -610,15 +610,23 @@ public interface LC_CONTRACT_CONDITION{ */ public static final String STRATEGY_ROA = "STRATEGY_ROA"; /** - * 是否灵活分润
- */ + * 是否灵活分润 STRING(20)
+ */ public static final String SPLIT_TYPE = "SPLIT_TYPE"; /** - * 个人意外险
- */ + * 个人意外险 DOUBLE(22)
+ */ public static final String PERSONAL_INSURANCE = "PERSONAL_INSURANCE"; /** - * 贴息
- */ + * 贴息 DOUBLE(22)
+ */ public static final String DISCOUNT_INTEREST = "DISCOUNT_INTEREST"; + /** + * 分段配置 STRING(32)
+ */ + public static final String SUBSECTION_CONDIG = "SUBSECTION_CONDIG"; + /** + * 综合利率 STRING(32)
+ */ + public static final String COMPREHENSIVE_RATE = "COMPREHENSIVE_RATE"; } \ No newline at end of file diff --git a/src_jbo/jbo/app/tenwa/calc/LC_CONTRACT_SUBSECTION_INFO.java b/src_jbo/jbo/app/tenwa/calc/LC_CONTRACT_SUBSECTION_INFO.java index 95dc01e37..c57b930a0 100644 --- a/src_jbo/jbo/app/tenwa/calc/LC_CONTRACT_SUBSECTION_INFO.java +++ b/src_jbo/jbo/app/tenwa/calc/LC_CONTRACT_SUBSECTION_INFO.java @@ -109,4 +109,44 @@ public interface LC_CONTRACT_SUBSECTION_INFO{ * 更新时间 STRING(32)
*/ public static final String UPDATETIME = "UPDATETIME"; + /** + * 期次是否只读 STRING(10)
+ */ + public static final String IS_ONLYREAD_INCOME_NUMBER = "IS_ONLYREAD_INCOME_NUMBER"; + /** + * 贴息金额是否固定金额 STRING(10)
+ */ + public static final String IS_FIXED_DISCOUNT = "IS_FIXED_DISCOUNT"; + /** + * 融资利率是否可修改 STRING(10)
+ */ + public static final String IS_UPDATE_LEASE_MONEY_RATIO = "IS_UPDATE_LEASE_MONEY_RATIO"; + /** + * 融资金额最大值 STRING(32)
+ */ + public static final String MAX_LEASE_MONEY = "MAX_LEASE_MONEY"; + /** + * 最小贴息金额 STRING(10)
+ */ + public static final String MINIMUM_DISCOUNT = "MINIMUM_DISCOUNT"; + /** + * 贴息后利率是否固定 STRING(10)
+ */ + public static final String IS_FIXED_DISCOUNT_RATE = "IS_FIXED_DISCOUNT_RATE"; + /** + * 最大期次 STRING(32)
+ */ + public static final String MAX_INCOME_NUMBER = "MAX_INCOME_NUMBER"; + /** + * 最小期次 STRING(32)
+ */ + public static final String MIN_INCOME_NUMBER = "MIN_INCOME_NUMBER"; + /** + * 融资金额最小值 STRING(32)
+ */ + public static final String MIN_LEASE_MONEY = "MIN_LEASE_MONEY"; + /** + * 贴息金额 DOUBLE(18)
+ */ + public static final String DISCOUNT_INTEREST = "DISCOUNT_INTEREST"; } \ No newline at end of file diff --git a/src_jbo/jbo/app/tenwa/calc/LC_PROJ_CONDITION.java b/src_jbo/jbo/app/tenwa/calc/LC_PROJ_CONDITION.java index c19e9e23e..407691c7e 100644 --- a/src_jbo/jbo/app/tenwa/calc/LC_PROJ_CONDITION.java +++ b/src_jbo/jbo/app/tenwa/calc/LC_PROJ_CONDITION.java @@ -610,15 +610,15 @@ public interface LC_PROJ_CONDITION{ */ public static final String STRATEGY_ROA = "STRATEGY_ROA"; /** - * 是否灵活分润
- */ + * 是否灵活分润 STRING(20)
+ */ public static final String SPLIT_TYPE = "SPLIT_TYPE"; /** - * 个人意外险
- */ - public static final String PERSONAL_INSURANCE = "PERSONAL_INSURANCE"; + * 分段配置 STRING(32)
+ */ + public static final String SUBSECTION_CONDIG = "SUBSECTION_CONDIG"; /** - * 贴息
- */ - public static final String DISCOUNT_INTEREST = "DISCOUNT_INTEREST"; + * 综合利率 STRING(32)
+ */ + public static final String COMPREHENSIVE_RATE = "COMPREHENSIVE_RATE"; } \ No newline at end of file diff --git a/src_jbo/jbo/app/tenwa/calc/LC_PROJ_SUBSECTION_INFO.java b/src_jbo/jbo/app/tenwa/calc/LC_PROJ_SUBSECTION_INFO.java index 2656ff94b..b52c5203a 100644 --- a/src_jbo/jbo/app/tenwa/calc/LC_PROJ_SUBSECTION_INFO.java +++ b/src_jbo/jbo/app/tenwa/calc/LC_PROJ_SUBSECTION_INFO.java @@ -109,4 +109,44 @@ public interface LC_PROJ_SUBSECTION_INFO{ * 更新时间 STRING(32)
*/ public static final String UPDATETIME = "UPDATETIME"; + /** + * 期次是否只读 STRING(10)
+ */ + public static final String IS_ONLYREAD_INCOME_NUMBER = "IS_ONLYREAD_INCOME_NUMBER"; + /** + * 贴息金额是否固定金额 STRING(10)
+ */ + public static final String IS_FIXED_DISCOUNT = "IS_FIXED_DISCOUNT"; + /** + * 融资利率是否可修改 STRING(10)
+ */ + public static final String IS_UPDATE_LEASE_MONEY_RATIO = "IS_UPDATE_LEASE_MONEY_RATIO"; + /** + * 融资金额最大值 STRING(32)
+ */ + public static final String MAX_LEASE_MONEY = "MAX_LEASE_MONEY"; + /** + * 最小贴息金额 STRING(10)
+ */ + public static final String MINIMUM_DISCOUNT = "MINIMUM_DISCOUNT"; + /** + * 贴息后利率是否固定 STRING(10)
+ */ + public static final String IS_FIXED_DISCOUNT_RATE = "IS_FIXED_DISCOUNT_RATE"; + /** + * 最大期次 STRING(32)
+ */ + public static final String MAX_INCOME_NUMBER = "MAX_INCOME_NUMBER"; + /** + * 最小期次 STRING(32)
+ */ + public static final String MIN_INCOME_NUMBER = "MIN_INCOME_NUMBER"; + /** + * 融资金额最小值 STRING(32)
+ */ + public static final String MIN_LEASE_MONEY = "MIN_LEASE_MONEY"; + /** + * 贴息金额 DOUBLE(18)
+ */ + public static final String DISCOUNT_INTEREST = "DISCOUNT_INTEREST"; } \ No newline at end of file From 4f725f81e69d378ab0e80390b752bb0ab307c79b Mon Sep 17 00:00:00 2001 From: yjf <2211675158@qq.com> Date: Wed, 13 Oct 2021 17:49:59 +0800 Subject: [PATCH 18/26] =?UTF-8?q?=E5=B9=BF=E5=8F=91=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tenwa/flow/fund/fundcollection/FundIncomeMethod.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java b/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java index 8bda14ba3..b16af881e 100644 --- a/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java +++ b/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java @@ -616,10 +616,16 @@ public String getContactId(JBOTransaction tx) throws SQLException, Exception{ BizObjectManager bm_own = JBOFactory.getBizObjectManager("jbo.com.tenwa.entity.comm.own.OWN_ACCOUNT", tx); BizObject bo_own = bm_own.createQuery("acc_name =:accName and account_purpose = 'default' and account_type = 'out_account' and state_ = '0010'") .setParameter("accName", subjectName).getSingleResult(false); + String payMode = "cgb"; + String bankName = bo_own.getAttribute("acc_bank").getString(); + if (bankName.indexOf("招商") > -1) { + payMode = "cmb"; + } JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LB_ACTUAL_PAYMENT_INFO_TEMP","update o set bank=:bank,account=:account,acc_number=:acc_number where flowunid = :flowunid ") - .setParameter("bank",bo_own.getAttribute("acc_bank").getString()) + .setParameter("bank",bankName) .setParameter("account",bo_own.getAttribute("acc_name").getString()) .setParameter("acc_number",bo_own.getAttribute("acc_number").getString()) + .setParameter("pay_mode",payMode) .setParameter("flowunid",flowunid) .executeUpdate(); } From 58ed70b1fd300783e49d2bff2a27d10c83ed17d7 Mon Sep 17 00:00:00 2001 From: yjf <2211675158@qq.com> Date: Wed, 13 Oct 2021 17:50:32 +0800 Subject: [PATCH 19/26] =?UTF-8?q?=E5=B9=BF=E5=8F=91=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/BusinessPaymentInfoHandler.java | 18 ++++++++++++++++++ .../fund/fundcollection/FundIncomeMethod.java | 9 +++++++++ 2 files changed, 27 insertions(+) create mode 100644 src_cmb/com/tenwa/cgb/handler/BusinessPaymentInfoHandler.java diff --git a/src_cmb/com/tenwa/cgb/handler/BusinessPaymentInfoHandler.java b/src_cmb/com/tenwa/cgb/handler/BusinessPaymentInfoHandler.java new file mode 100644 index 000000000..23fdfe9f7 --- /dev/null +++ b/src_cmb/com/tenwa/cgb/handler/BusinessPaymentInfoHandler.java @@ -0,0 +1,18 @@ +package com.tenwa.cgb.handler; + +import com.amarsoft.are.jbo.BizObject; +import com.amarsoft.are.jbo.JBOTransaction; +import com.amarsoft.awe.dw.handler.impl.CommonHandler; +import com.amarsoft.awe.util.SqlObject; +import com.amarsoft.awe.util.Transaction; + +public class BusinessPaymentInfoHandler extends CommonHandler { + + @Override + protected void afterUpdate(JBOTransaction tx, BizObject bo) throws Exception { + String flowunid = bo.getAttribute("flowunid").getString(); + Transaction sqlca = Transaction.createTransaction(tx); + sqlca.executeSQL(new SqlObject("update LC_FUND_INCOME_TEMP t1 JOIN LB_ACTUAL_PAYMENT_INFO_TEMP t2 on t1.flowunid = t2.flowunid " + + " set t1.account=t2.account,t1.acc_number=t2.acc_number,t1.bank=t2.bank where t2.flowunid =:flowunid ").setParameter("flowunid", flowunid)); + } +} diff --git a/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java b/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java index b16af881e..7d52d2ef5 100644 --- a/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java +++ b/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java @@ -9,6 +9,7 @@ import com.tenwa.comm.util.jboutil.DataOperatorUtil; import com.tenwa.flow.bussinessapprove.BussinessStatusAndDetailAction; import com.tenwa.util.MultiSubjectUtil; import jbo.app.tenwa.calc.*; +import jbo.com.tenwa.entity.comm.own.OWN_ACCOUNT; import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO; import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -441,6 +442,11 @@ public String getContactId(JBOTransaction tx) throws SQLException, Exception{ } public String createActualPayment(JBOTransaction tx) throws JBOException{ try{ + BizObject boOAT = JBOFactory.getBizObjectManager(OWN_ACCOUNT.CLASS_NAME,tx) + .createQuery("account_purpose='default' and state_='0010' and FbSdk='Y' and own_id='807001003' ").getSingleResult(false); + if (boOAT == null) { + throw new RuntimeException("未查询到对应的主体信息！"); + } for(String contractId : contractIds.split("@")){ @SuppressWarnings("unchecked") List bos = JBOFactory.getBizObjectManager(LC_FUND_INCOME.CLASS_NAME) @@ -461,6 +467,9 @@ public String getContactId(JBOTransaction tx) throws SQLException, Exception{ otherProperty.put("FlowUnid", flowunid); otherProperty.put("IS_FLOWING", "0"); otherProperty.put("ACCOUNTING_DATE", StringFunction.getTodayNow().split(" ")[0]); + otherProperty.put("BANK", boOAT.getAttribute("ACC_BANK").getString()); + otherProperty.put("ACCOUNT", boOAT.getAttribute("ACC_NAME").getString()); + otherProperty.put("ACC_NUMBER", boOAT.getAttribute("ACC_NUMBER").getString()); otherProperty.put("INCOME_ID", bo.getAttribute("ID").getString()); otherProperty.put(LC_FUND_INCOME.EBANK_STATUS, "03"); if("0020".equals(payType)||"0030".equals(payType)){ From ba6eedff34623a7da74adaf06a159e91c70a7352 Mon Sep 17 00:00:00 2001 From: tangfutang <3218982385@qq.com> Date: Wed, 13 Oct 2021 17:52:34 +0800 Subject: [PATCH 20/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9app=E4=B8=80=E5=90=88?= =?UTF-8?q?=E5=90=8C=E5=A4=9A=E8=BD=A6=E6=95=B0=E6=8D=AE=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../make/service/impl/ContractMakeServiceImpl.java | 8 ++++---- .../initiate/service/impl/ApplyChangeServiceImpl.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/service/impl/ContractMakeServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/service/impl/ContractMakeServiceImpl.java index 4a3389195..b504925ad 100644 --- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/service/impl/ContractMakeServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/service/impl/ContractMakeServiceImpl.java @@ -60,9 +60,9 @@ public class ContractMakeServiceImpl implements ContractMakeService{ String orgID = asUser.getOrgID(); String sql = ""; if("8006011".equals(orgID)){ - sql = "SELECT lpi.END_DATE AS startdate,lpi.id projectid, lpi.product_id, lpi.project_no, lpi.project_name, ci.customername, getItemName ('CertType', ci.certtype) certtype, ci.certid, getUserName (lpi.project_manage) AS project_manage, getOrgLevelName (lpi.project_dept) project_dept, ci.customertype,lpi.leas_form,lpi.CAR_TYPE,lpi.IS_NETCAR,psl.operationType,psl.signType,psl.sealType,lpi.subjectid,lpi.subjectname,lpc.CLEAN_LEASE_MONEY AS clean_lease_money,lpc.INCOME_NUMBER AS income_number,lec.MODEL AS model,lprp.RENT AS rent FROM LB_PROJECT_INFO lpi LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LB_CONTRACT_INFO lci ON lpi.id=lci.project_id LEFT JOIN LC_CONTRACT_CONDITION lcc ON lci.id=lcc.contract_id LEFT JOIN LB_UNION_LESSEE lult ON lpi.id = lult.project_id AND (lult.contract_id = '' OR lult.contract_id IS NULL) LEFT JOIN CUSTOMER_INFO ci ON lult.customer_id = ci.customerid LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id LEFT JOIN LB_EQUIPMENT_CAR lec ON lec.project_id=lpi.id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' WHERE lult.is_main = 'y' AND lpi.project_status = '13' AND((lci.contract_status = '21' AND lpc.equip_amt>lcc.equip_amt) OR ((lult.CONTRACT_ID='' OR lult.CONTRACT_ID IS NULL)AND (SELECT COUNT(*) FROM lb_contract_info WHERE project_id=lpi.id)=0)) AND lpi.INPUTORGID='"+orgID+"'"; + sql = "SELECT lpi.END_DATE AS startdate,lpi.id projectid, lpi.product_id, lpi.project_no, lpi.project_name, ci.customername, getItemName ('CertType', ci.certtype) certtype, ci.certid, getUserName (lpi.project_manage) AS project_manage, getOrgLevelName (lpi.project_dept) project_dept, ci.customertype,lpi.leas_form,lpi.CAR_TYPE,lpi.IS_NETCAR,psl.operationType,psl.signType,psl.sealType,lpi.subjectid,lpi.subjectname,lpc.CLEAN_LEASE_MONEY AS clean_lease_money,lpc.INCOME_NUMBER AS income_number,lec.MODEL AS model,lprp.RENT AS rent FROM LB_PROJECT_INFO lpi LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LB_CONTRACT_INFO lci ON lpi.id=lci.project_id LEFT JOIN LC_CONTRACT_CONDITION lcc ON lci.id=lcc.contract_id LEFT JOIN LB_UNION_LESSEE lult ON lpi.id = lult.project_id AND (lult.contract_id = '' OR lult.contract_id IS NULL) LEFT JOIN CUSTOMER_INFO ci ON lult.customer_id = ci.customerid LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id LEFT JOIN (SELECT GROUP_CONCAT(MODEL SEPARATOR ',') AS MODEL,project_id FROM LB_EQUIPMENT_CAR GROUP BY project_id) lec ON lec.project_id=lpi.id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' WHERE lult.is_main = 'y' AND lpi.project_status = '13' AND((lci.contract_status = '21' AND lpc.equip_amt>lcc.equip_amt) OR ((lult.CONTRACT_ID='' OR lult.CONTRACT_ID IS NULL)AND (SELECT COUNT(*) FROM lb_contract_info WHERE project_id=lpi.id)=0)) AND lpi.INPUTORGID='"+orgID+"'"; }else{ - sql="SELECT lpi.END_DATE AS startdate,lpi.id projectid, lpi.product_id, lpi.project_no, lpi.project_name, ci.customername, getItemName ('CertType', ci.certtype) certtype, ci.certid, getUserName (lpi.project_manage) AS project_manage, getOrgLevelName (lpi.project_dept) project_dept, ci.customertype,lpi.leas_form,lpi.CAR_TYPE,lpi.IS_NETCAR,psl.operationType,psl.signType,psl.sealType,lpi.subjectid,lpi.subjectname,lpc.CLEAN_LEASE_MONEY AS clean_lease_money,lpc.INCOME_NUMBER AS income_number,lec.MODEL AS model,lprp.RENT AS rent FROM LB_PROJECT_INFO lpi LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LB_CONTRACT_INFO lci ON lpi.id=lci.project_id LEFT JOIN LC_CONTRACT_CONDITION lcc ON lci.id=lcc.contract_id LEFT JOIN LB_UNION_LESSEE lult ON lpi.id = lult.project_id AND (lult.contract_id = '' OR lult.contract_id IS NULL) LEFT JOIN CUSTOMER_INFO ci ON lult.customer_id = ci.customerid LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id LEFT JOIN LB_EQUIPMENT_CAR lec ON lec.project_id=lpi.id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' WHERE lult.is_main = 'y' AND lpi.project_status = '13' AND((lci.contract_status = '21' AND lpc.equip_amt>lcc.equip_amt) OR ((lult.CONTRACT_ID='' OR lult.CONTRACT_ID IS NULL)AND (SELECT COUNT(*) FROM lb_contract_info WHERE project_id=lpi.id)=0)) AND lpi.PROJECT_MANAGE='"+userId+"'"; + sql="SELECT lpi.END_DATE AS startdate,lpi.id projectid, lpi.product_id, lpi.project_no, lpi.project_name, ci.customername, getItemName ('CertType', ci.certtype) certtype, ci.certid, getUserName (lpi.project_manage) AS project_manage, getOrgLevelName (lpi.project_dept) project_dept, ci.customertype,lpi.leas_form,lpi.CAR_TYPE,lpi.IS_NETCAR,psl.operationType,psl.signType,psl.sealType,lpi.subjectid,lpi.subjectname,lpc.CLEAN_LEASE_MONEY AS clean_lease_money,lpc.INCOME_NUMBER AS income_number,lec.MODEL AS model,lprp.RENT AS rent FROM LB_PROJECT_INFO lpi LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LB_CONTRACT_INFO lci ON lpi.id=lci.project_id LEFT JOIN LC_CONTRACT_CONDITION lcc ON lci.id=lcc.contract_id LEFT JOIN LB_UNION_LESSEE lult ON lpi.id = lult.project_id AND (lult.contract_id = '' OR lult.contract_id IS NULL) LEFT JOIN CUSTOMER_INFO ci ON lult.customer_id = ci.customerid LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id LEFT JOIN (SELECT GROUP_CONCAT(MODEL SEPARATOR ',') AS MODEL,project_id FROM LB_EQUIPMENT_CAR GROUP BY project_id) lec ON lec.project_id=lpi.id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' WHERE lult.is_main = 'y' AND lpi.project_status = '13' AND((lci.contract_status = '21' AND lpc.equip_amt>lcc.equip_amt) OR ((lult.CONTRACT_ID='' OR lult.CONTRACT_ID IS NULL)AND (SELECT COUNT(*) FROM lb_contract_info WHERE project_id=lpi.id)=0)) AND lpi.PROJECT_MANAGE='"+userId+"'"; } if(globaltext.length() ==0 ){ sql = sql+ " AND lpi.businesstype='1' ORDER BY lpi.END_DATE DESC "; @@ -480,9 +480,9 @@ public class ContractMakeServiceImpl implements ContractMakeService{ String orgID = asUser.getOrgID(); String sql = ""; if("8006011".equals(orgID)){ - sql = "SELECT lpi.END_DATE AS startdate,lci.id as contractid,lult.project_id as projectid,lci.product_id,lci.contract_no flowkey,lci.contract_number,lci.project_name,ci.customername,getItemName('CertType',ci.certtype) certtype,ci.certid,getUserName(lci.project_manage) AS project_manage,getOrgLevelName(lci.project_dept) project_dept,ci.customertype,lci.leas_form,lpi.CAR_TYPE,lpi.IS_NETCAR,psl.operationType,psl.sealType,psl.signType,lci.subjectid,lci.subjectname,lci.inputorgid,lpi.project_no as project_no,lpc.CLEAN_LEASE_MONEY AS clean_lease_money,lpc.INCOME_NUMBER AS income_number,lec.MODEL AS model,lprp.RENT AS rent FROM LB_CONTRACT_INFO lci LEFT JOIN LB_PROJECT_INFO lpi ON lpi.id = lci.project_id LEFT JOIN LB_UNION_LESSEE lult ON lci.id=lult.contract_id LEFT JOIN CUSTOMER_INFO ci ON lult.customer_id=ci.customerid LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid = lpi.product_id LEFT JOIN LB_EQUIPMENT_CAR lec ON lec.project_id=lpi.id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id WHERE lult.is_main='y' AND lci.businesstype='1' AND NOT EXISTS (SELECT 1 FROM LC_CALC_CONDITION_STATUS ccs WHERE ccs.contract_id=lci.id) AND contract_status='21' AND lci.inputorgid='"+orgID+"' "; + sql = "SELECT lpi.END_DATE AS startdate,lci.id as contractid,lult.project_id as projectid,lci.product_id,lci.contract_no flowkey,lci.contract_number,lci.project_name,ci.customername,getItemName('CertType',ci.certtype) certtype,ci.certid,getUserName(lci.project_manage) AS project_manage,getOrgLevelName(lci.project_dept) project_dept,ci.customertype,lci.leas_form,lpi.CAR_TYPE,lpi.IS_NETCAR,psl.operationType,psl.sealType,psl.signType,lci.subjectid,lci.subjectname,lci.inputorgid,lpi.project_no as project_no,lpc.CLEAN_LEASE_MONEY AS clean_lease_money,lpc.INCOME_NUMBER AS income_number,lec.MODEL AS model,lprp.RENT AS rent FROM LB_CONTRACT_INFO lci LEFT JOIN LB_PROJECT_INFO lpi ON lpi.id = lci.project_id LEFT JOIN LB_UNION_LESSEE lult ON lci.id=lult.contract_id LEFT JOIN CUSTOMER_INFO ci ON lult.customer_id=ci.customerid LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid = lpi.product_id LEFT JOIN (SELECT GROUP_CONCAT(MODEL SEPARATOR ',') AS MODEL,project_id FROM LB_EQUIPMENT_CAR GROUP BY project_id) lec ON lec.project_id=lpi.id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id WHERE lult.is_main='y' AND lci.businesstype='1' AND NOT EXISTS (SELECT 1 FROM LC_CALC_CONDITION_STATUS ccs WHERE ccs.contract_id=lci.id) AND contract_status='21' AND lci.inputorgid='"+orgID+"' "; }else{ - sql="SELECT lpi.END_DATE AS startdate,lci.id as contractid,lult.project_id as projectid,lci.product_id,lci.contract_no flowkey,lci.contract_number,lci.project_name,ci.customername,getItemName('CertType',ci.certtype) certtype,ci.certid,getUserName(lci.project_manage) AS project_manage,getOrgLevelName(lci.project_dept) project_dept,ci.customertype,lci.leas_form,lpi.CAR_TYPE,lpi.IS_NETCAR,psl.operationType,psl.sealType,psl.signType,lci.subjectid,lci.subjectname,lci.inputuserid,lpi.project_no as project_no,lpc.CLEAN_LEASE_MONEY AS clean_lease_money,lpc.INCOME_NUMBER AS income_number,lec.MODEL AS model,lprp.RENT AS rent FROM LB_CONTRACT_INFO lci LEFT JOIN LB_PROJECT_INFO lpi ON lpi.id = lci.project_id LEFT JOIN LB_UNION_LESSEE lult ON lci.id=lult.contract_id LEFT JOIN CUSTOMER_INFO ci ON lult.customer_id=ci.customerid LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid = lpi.product_id LEFT JOIN LB_EQUIPMENT_CAR lec ON lec.project_id=lpi.id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id WHERE lult.is_main='y' AND lci.businesstype='1' AND NOT EXISTS (SELECT 1 FROM LC_CALC_CONDITION_STATUS ccs WHERE ccs.contract_id=lci.id) AND contract_status='21' AND lci.inputuserid='"+userId+"' "; + sql="SELECT lpi.END_DATE AS startdate,lci.id as contractid,lult.project_id as projectid,lci.product_id,lci.contract_no flowkey,lci.contract_number,lci.project_name,ci.customername,getItemName('CertType',ci.certtype) certtype,ci.certid,getUserName(lci.project_manage) AS project_manage,getOrgLevelName(lci.project_dept) project_dept,ci.customertype,lci.leas_form,lpi.CAR_TYPE,lpi.IS_NETCAR,psl.operationType,psl.sealType,psl.signType,lci.subjectid,lci.subjectname,lci.inputuserid,lpi.project_no as project_no,lpc.CLEAN_LEASE_MONEY AS clean_lease_money,lpc.INCOME_NUMBER AS income_number,lec.MODEL AS model,lprp.RENT AS rent FROM LB_CONTRACT_INFO lci LEFT JOIN LB_PROJECT_INFO lpi ON lpi.id = lci.project_id LEFT JOIN LB_UNION_LESSEE lult ON lci.id=lult.contract_id LEFT JOIN CUSTOMER_INFO ci ON lult.customer_id=ci.customerid LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid = lpi.product_id LEFT JOIN (SELECT GROUP_CONCAT(MODEL SEPARATOR ',') AS MODEL,project_id FROM LB_EQUIPMENT_CAR GROUP BY project_id) lec ON lec.project_id=lpi.id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id WHERE lult.is_main='y' AND lci.businesstype='1' AND NOT EXISTS (SELECT 1 FROM LC_CALC_CONDITION_STATUS ccs WHERE ccs.contract_id=lci.id) AND contract_status='21' AND lci.inputuserid='"+userId+"' "; } if(globaltext.length() ==0 ){ sql = sql+ " ORDER BY lpi.END_DATE DESC "; diff --git a/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/service/impl/ApplyChangeServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/service/impl/ApplyChangeServiceImpl.java index dfe6f83d0..7935f238f 100644 --- a/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/service/impl/ApplyChangeServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/service/impl/ApplyChangeServiceImpl.java @@ -29,7 +29,7 @@ public class ApplyChangeServiceImpl implements ApplyChangeService{ String userId = fieldMap.get("userid") == null ? "" : fieldMap.get("userid").toString(); String globaltext = fieldMap.get("globaltext") == null ? "" : fieldMap.get("globaltext").toString(); //String sql = "select t.projectId,t.Product_Id,t.project_no,t.project_name,t.CUSTOMERNAME,t.Identity,t.certid,t.custkind,t.project_manage_name,t.project_dept,t.status_name,t.customer_Type,t.Car_type,t.leasform,t.operationType,t.certtype,t.SubjectId,t.subjectname,t.project_manage from (SELECT lpi.id as projectId,lpi.product_id as Product_Id,lpi.project_no as project_no,lpi.project_name as project_name,ci.customername as CUSTOMERNAME,getItemName('CertType',ci.certtype) as Identity,ci.certid as certid,getItemName('cust_kind',lpi.project_industry) as custkind,getUserName(project_manage) as project_manage_name,getOrgName(lpi.project_dept) as project_dept,lcs.status_name as status_name,ci.customertype as customer_Type,lpi.car_type as Car_type,lpi.leas_form as leasform,psl.operationType as operationType,ci.certtype as certtype,lpi.subjectid as SubjectId,lpi.subjectname as subjectname,lpi.project_manage as project_manage FROM LB_PROJECT_INFO lpi left join lb_contract_status lcs on lpi.project_status=lcs.status_code LEFT JOIN LB_UNION_LESSEE lult on lpi.id=lult.project_id and lult.is_main='y' and( lult.contract_id is null or lult.contract_id='') LEFT JOIN CUSTOMER_INFO ci on lult.customer_id=ci.customerid left join PRD_SPECIFIC_LIBRARY psl on psl.productid=lpi.product_id where lpi.project_status='13' and (SELECT COUNT(id) FROM lb_contract_info_temp WHERE project_id=lpi.ID)=0 and lpi.businesstype='1') t where project_manage='"+userId+"' "; - String sql = "select t.projectId,t.Product_Id,t.project_no,t.project_name,t.CUSTOMERNAME,t.Identity,t.certid,t.custkind,t.project_manage_name,t.project_dept,t.status_name,t.customer_Type,t.Car_type,t.leasform,t.operationType,t.certtype,t.SubjectId,t.subjectname,t.project_manage,t.clean_lease_money,t.income_number,t.MODEL,t.rent,t.startdate from (SELECT lpi.id as projectId,lpi.product_id as Product_Id,lpi.project_no as project_no,lpi.project_name as project_name,ci.customername as CUSTOMERNAME,getItemName('CertType',ci.certtype) as Identity,ci.certid as certid,getItemName('cust_kind',lpi.project_industry) as custkind,getUserName(project_manage) as project_manage_name,getOrgName(lpi.project_dept) as project_dept,lcs.status_name as status_name,ci.customertype as customer_Type,lpi.car_type as Car_type,lpi.leas_form as leasform,psl.operationType as operationType,ci.certtype as certtype,lpi.subjectid as SubjectId,lpi.subjectname as subjectname,lpi.project_manage as project_manage,lpc.CLEAN_LEASE_MONEY AS clean_lease_money,lpc.INCOME_NUMBER AS income_number,lec.MODEL AS model,lprp.RENT AS rent,lpi.END_DATE AS startdate FROM LB_PROJECT_INFO lpi left join lb_contract_status lcs on lpi.project_status=lcs.status_code LEFT JOIN LB_UNION_LESSEE lult on lpi.id=lult.project_id and lult.is_main='y' and( lult.contract_id is null or lult.contract_id='') LEFT JOIN CUSTOMER_INFO ci on lult.customer_id=ci.customerid left join PRD_SPECIFIC_LIBRARY psl on psl.productid=lpi.product_id LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LB_EQUIPMENT_CAR lec ON lec.project_id=lpi.id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' where lpi.project_status='13' and (SELECT COUNT(id) FROM lb_contract_info_temp WHERE project_id=lpi.ID)=0 and lpi.businesstype='1') t where project_manage='"+userId+"' "; + String sql = "select t.projectId,t.Product_Id,t.project_no,t.project_name,t.CUSTOMERNAME,t.Identity,t.certid,t.custkind,t.project_manage_name,t.project_dept,t.status_name,t.customer_Type,t.Car_type,t.leasform,t.operationType,t.certtype,t.SubjectId,t.subjectname,t.project_manage,t.clean_lease_money,t.income_number,t.MODEL,t.rent,t.startdate from (SELECT lpi.id as projectId,lpi.product_id as Product_Id,lpi.project_no as project_no,lpi.project_name as project_name,ci.customername as CUSTOMERNAME,getItemName('CertType',ci.certtype) as Identity,ci.certid as certid,getItemName('cust_kind',lpi.project_industry) as custkind,getUserName(project_manage) as project_manage_name,getOrgName(lpi.project_dept) as project_dept,lcs.status_name as status_name,ci.customertype as customer_Type,lpi.car_type as Car_type,lpi.leas_form as leasform,psl.operationType as operationType,ci.certtype as certtype,lpi.subjectid as SubjectId,lpi.subjectname as subjectname,lpi.project_manage as project_manage,lpc.CLEAN_LEASE_MONEY AS clean_lease_money,lpc.INCOME_NUMBER AS income_number,lec.MODEL AS model,lprp.RENT AS rent,lpi.END_DATE AS startdate FROM LB_PROJECT_INFO lpi left join lb_contract_status lcs on lpi.project_status=lcs.status_code LEFT JOIN LB_UNION_LESSEE lult on lpi.id=lult.project_id and lult.is_main='y' and( lult.contract_id is null or lult.contract_id='') LEFT JOIN CUSTOMER_INFO ci on lult.customer_id=ci.customerid left join PRD_SPECIFIC_LIBRARY psl on psl.productid=lpi.product_id LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN (SELECT GROUP_CONCAT(MODEL SEPARATOR ',') AS MODEL,project_id FROM LB_EQUIPMENT_CAR GROUP BY project_id) lec ON lec.project_id=lpi.id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' where lpi.project_status='13' and (SELECT COUNT(id) FROM lb_contract_info_temp WHERE project_id=lpi.ID)=0 and lpi.businesstype='1') t where project_manage='"+userId+"' "; if(globaltext.length() ==0 ){ sql = sql+ " ORDER BY t.project_no DESC "; }else{ From 51a14aadbb6b791749b2d2f76bd1784830f61f4a Mon Sep 17 00:00:00 2001 From: yjf <2211675158@qq.com> Date: Wed, 13 Oct 2021 18:49:53 +0800 Subject: [PATCH 21/26] =?UTF-8?q?=E5=B9=BF=E5=8F=91=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java b/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java index 7d52d2ef5..44b04418b 100644 --- a/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java +++ b/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java @@ -630,11 +630,12 @@ public String getContactId(JBOTransaction tx) throws SQLException, Exception{ if (bankName.indexOf("招商") > -1) { payMode = "cmb"; } - JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LB_ACTUAL_PAYMENT_INFO_TEMP","update o set bank=:bank,account=:account,acc_number=:acc_number where flowunid = :flowunid ") + JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LB_ACTUAL_PAYMENT_INFO_TEMP","update o set bank=:bank,account=:account," + + "acc_number=:acc_number,pay_mode=:payMode where flowunid = :flowunid ") .setParameter("bank",bankName) .setParameter("account",bo_own.getAttribute("acc_name").getString()) .setParameter("acc_number",bo_own.getAttribute("acc_number").getString()) - .setParameter("pay_mode",payMode) + .setParameter("payMode",payMode) .setParameter("flowunid",flowunid) .executeUpdate(); } From 944e1cabdb7209fa5bd87dfe2ab2a567ced8c643 Mon Sep 17 00:00:00 2001 From: tangfutang <3218982385@qq.com> Date: Fri, 15 Oct 2021 11:42:50 +0800 Subject: [PATCH 22/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9APP=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E3=80=81=E6=94=BE=E6=AC=BE=E5=90=8E=E7=9D=A3?= =?UTF-8?q?=E3=80=81=E5=AE=A1=E5=88=A4=E8=BF=9B=E5=BA=A6=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanSimulation/LCCalcSubsectionInfoTempList.jsp | 1 - .../change/center/service/impl/ApplyArchiveServiceImpl.java | 6 +++--- .../change/center/service/impl/ApplyOverseeServiceImpl.java | 4 ++-- .../change/center/service/impl/ApplyPaymentServiceImpl.java | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/WebContent/Accounting/LoanSimulation/LCCalcSubsectionInfoTempList.jsp b/WebContent/Accounting/LoanSimulation/LCCalcSubsectionInfoTempList.jsp index 22ef46869..0f062b7a8 100644 --- a/WebContent/Accounting/LoanSimulation/LCCalcSubsectionInfoTempList.jsp +++ b/WebContent/Accounting/LoanSimulation/LCCalcSubsectionInfoTempList.jsp @@ -24,7 +24,6 @@ }else if (discountCalcMethod.equals("3")){//固定值，对应的值改为只读 doTemp.setReadOnly("DISCOUNT_RATE",true); doTemp.setReadOnly("FINANCING_RATE",true); - doTemp.setReadOnly("INCOME_NUMBER",true); doTemp.setReadOnly("DISCOUNT_INTEREST",true); } } diff --git a/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java index 84001cff5..26a203cbe 100644 --- a/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java @@ -360,7 +360,7 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ String userId = fieldMap.get("userid") == null ? "" : fieldMap.get("userid").toString(); String globaltext = fieldMap.get("globaltext") == null ? "" : fieldMap.get("globaltext").toString(); String sql = ""; - sql = "SELECT O.OBJECTTYPE,di.distributor_name,O.OBJECTNO,cpt.CUSTOMER_NAME,O.PHASETYPE,O.APPLYTYPE,O.FLOWNO,O.PHASENO,O.OBJDESCRIBE,O.OBJATTRIBUTE1,O.OBJATTRIBUTE2,O.OBJATTRIBUTE3,O.OBJATTRIBUTE4,O.OBJATTRIBUTE5,O.ORGID,O.USERID,O.USERNAME,O.INPUTDATE,O.ARCHIVETIME,O.PROCESSINSTNO,O.PROCESSTASKNO,ft.SERIALNO,ci.customertype,psl.signType,lpi.car_type,O.FLOWSTATE,O.ARCHIVE,O.VERSION,O.BASEFLOWNO,bo.flow_unid,bo.proj_id,bo.contract_id,bo.InputUserID,getUserName(bo.InputUserID) AS InputUserIDName,bo.UpdateUserID,bo.UpdateTime,bo.flow_key,lpi.PROJECT_NO,bo.proj_name,lci.CONTRACT_NUMBER,O.FLOWNAME ,O.phasename,bo.InputTime,'' AS ACTION,lcc.CLEAN_LEASE_MONEY,lec.MODEL FROM FLOW_OBJECT O LEFT JOIN FLOW_BUSSINESS_OBJECT bo ON O.ObjectNo = bo.flow_unid LEFT JOIN (SELECT car_type,PROJECT_NO,FLOWUNID,product_id,distributor_id FROM LB_PROJECT_INFO_TEMP) lpi ON lpi.FLOWUNID= bo.FLOW_UNID LEFT JOIN (SELECT CUSTOMER_ID,FLOWUNID,CUSTOMER_NAME,project_id FROM LB_UNION_LESSEE_TEMP GROUP BY project_id) cpt ON cpt.project_id = bo.proj_id LEFT JOIN DISTRIBUTOR_INFO di ON lpi.distributor_id = di.distributor_no LEFT JOIN LB_CONTRACT_INFO_TEMP lci ON O.ObjectNo = lci.FLOWUNID LEFT JOIN (SELECT project_id,model FROM LB_EQUIPMENT_CAR_temp GROUP BY project_id) lec ON lec.project_id=bo.proj_id LEFT JOIN LC_CALC_CONDITION_TEMP lcc ON lcc.flowunid=O.objectno LEFT JOIN (SELECT objectno,serialno FROM flow_task GROUP BY objectno) ft ON ft.objectno=o.objectno LEFT JOIN customer_info ci ON ci.customerid=cpt.CUSTOMER_ID LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id WHERE 1 = 1 AND O.ObjectType IN ('ProductDefaultObject','FlowDefaultObject') AND O.PhaseType='1010' AND O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','BusinessChangeApply','BusinessCancelApply','MortgageFileMailApply','MortgageFileApply','FundPaymentCarApply') AND O.UserID='"+userId+"' "; + sql = "SELECT O.OBJECTTYPE,di.distributor_name,O.OBJECTNO,cpt.CUSTOMER_NAME,O.PHASETYPE,O.APPLYTYPE,O.FLOWNO,O.PHASENO,O.OBJDESCRIBE,O.OBJATTRIBUTE1,O.OBJATTRIBUTE2,O.OBJATTRIBUTE3,O.OBJATTRIBUTE4,O.OBJATTRIBUTE5,O.ORGID,O.USERID,O.USERNAME,O.INPUTDATE,O.ARCHIVETIME,O.PROCESSINSTNO,O.PROCESSTASKNO,ft.SERIALNO,ci.customertype,psl.signType,lpi.car_type,O.FLOWSTATE,O.ARCHIVE,O.VERSION,O.BASEFLOWNO,bo.flow_unid,bo.proj_id,bo.contract_id,bo.InputUserID,getUserName(bo.InputUserID) AS InputUserIDName,bo.UpdateUserID,bo.UpdateTime,bo.flow_key,lpi.PROJECT_NO,bo.proj_name,lci.CONTRACT_NUMBER,O.FLOWNAME ,O.phasename,bo.InputTime,'' AS ACTION,lcc.CLEAN_LEASE_MONEY,lec.MODEL FROM FLOW_OBJECT O LEFT JOIN FLOW_BUSSINESS_OBJECT bo ON O.ObjectNo = bo.flow_unid LEFT JOIN (SELECT car_type,PROJECT_NO,FLOWUNID,product_id,distributor_id FROM LB_PROJECT_INFO_TEMP) lpi ON lpi.FLOWUNID= bo.FLOW_UNID LEFT JOIN (SELECT CUSTOMER_ID,FLOWUNID,CUSTOMER_NAME,project_id FROM LB_UNION_LESSEE_TEMP GROUP BY project_id) cpt ON cpt.project_id = bo.proj_id LEFT JOIN DISTRIBUTOR_INFO di ON lpi.distributor_id = di.distributor_no LEFT JOIN LB_CONTRACT_INFO_TEMP lci ON O.ObjectNo = lci.FLOWUNID LEFT JOIN (SELECT FLOWUNID,GROUP_CONCAT(MODEL SEPARATOR ',') AS model FROM LB_EQUIPMENT_CAR_temp GROUP BY FLOWUNID) lec ON lec.FLOWUNID=bo.flow_unid LEFT JOIN LC_CALC_CONDITION_TEMP lcc ON lcc.flowunid=O.objectno LEFT JOIN (SELECT objectno,serialno FROM flow_task GROUP BY objectno) ft ON ft.objectno=o.objectno LEFT JOIN customer_info ci ON ci.customerid=cpt.CUSTOMER_ID LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id WHERE 1 = 1 AND O.ObjectType IN ('ProductDefaultObject','FlowDefaultObject') AND O.PhaseType='1010' AND O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','BusinessChangeApply','BusinessCancelApply','MortgageFileMailApply','MortgageFileApply','FundPaymentCarApply') AND O.UserID='"+userId+"' "; //sql = "SELECT O.OBJECTTYPE,di.distributor_name,O.objectNo,fl.taskNo,ft.serialNo,cpt.CUSTOMER_NAME,cpt.CUSTOMER_NAME AS CUSTOMERNAME,ci.customertype,ci.certtype,lpi.project_no AS FlowKey,bo.proj_id AS projectId,lpi.SUBJECTID,ps.leasform,lpi.CAR_TYPE AS carAttributes,O.PHASETYPE,O.APPLYTYPE,O.FLOWNO,O.PHASENO,O.OBJDESCRIBE,O.OBJATTRIBUTE1,O.OBJATTRIBUTE2,O.OBJATTRIBUTE3,O.OBJATTRIBUTE4,O.OBJATTRIBUTE5,O.ORGID,O.USERID,O.USERNAME,O.INPUTDATE,O.ARCHIVETIME,O.PROCESSINSTNO,O.PROCESSTASKNO,O.SERIALNO,O.FLOWSTATE,O.ARCHIVE,O.VERSION,O.BASEFLOWNO,bo.flow_unid,bo.flow_unid AS flowUnid,bo.proj_id,bo.contract_id,bo.InputUserID,getUserName(bo.InputUserID) AS InputUserIDName,bo.UpdateUserID,bo.UpdateTime,bo.flow_key,lpi.PROJECT_NO,bo.proj_name,lci.CONTRACT_NUMBER,O.FLOWNAME ,O.phasename,bo.InputTime,'' AS ACTION,lpc.CLEAN_LEASE_MONEY,lec.MODEL FROM FLOW_OBJECT O LEFT JOIN FLOW_BUSSINESS_OBJECT bo ON O.ObjectNo = bo.flow_unid LEFT JOIN LB_PROJECT_INFO_TEMP lpi ON bo.flow_unid = lpi.FLOWUNID LEFT JOIN LB_UNION_LESSEE_TEMP cpt ON cpt.FLOWUNID = bo.flow_unid LEFT JOIN DISTRIBUTOR_INFO di ON lpi.distributor_id = di.distributor_no LEFT JOIN LB_CONTRACT_INFO_TEMP lci ON O.ObjectNo = lci.FLOWUNID LEFT JOIN LB_EQUIPMENT_CAR lec ON lec.project_id=bo.proj_id LEFT JOIN LC_PROJ_CONDITION lpc ON bo.proj_id=lpc.project_id LEFT JOIN customer_info ci ON ci.customerid=cpt.CUSTOMER_ID LEFT JOIN flow_task ft ON ft.objectno=o.objectno LEFT JOIN flow_log fl ON fl.flowunid=ft.objectno LEFT JOIN PRD_SPECIFIC_LIBRARY ps ON ps.productid=lpi.product_id WHERE 1 = 1 AND O.ObjectType = 'ProductDefaultObject' AND O.PhaseType='1010' AND O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','ProjectApproalApply','BusinessChangeApply','BusinessCancelApply') AND O.UserID='"+userId+"' ORDER BY bo.InputTime DESC "; if(globaltext.length() ==0 ){ sql = sql+ " ORDER BY bo.InputTime DESC "; @@ -385,7 +385,7 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ String userId = fieldMap.get("userid") == null ? "" : fieldMap.get("userid").toString(); String globaltext = fieldMap.get("globaltext") == null ? "" : fieldMap.get("globaltext").toString(); String sql = ""; - sql = "SELECT O.OBJECTTYPE,di.distributor_name,O.OBJECTNO,cpt.CUSTOMER_NAME,O.PHASETYPE,O.APPLYTYPE,O.FLOWNO,O.PHASENO,O.OBJDESCRIBE,O.OBJATTRIBUTE1,O.OBJATTRIBUTE2,O.OBJATTRIBUTE3,O.OBJATTRIBUTE4,O.OBJATTRIBUTE5,O.ORGID,O.USERID,O.USERNAME,O.INPUTDATE,O.ARCHIVETIME,O.PROCESSINSTNO,O.PROCESSTASKNO,ft.SERIALNO,ci.customertype,psl.signType,lpi.car_type,O.FLOWSTATE,O.ARCHIVE,O.VERSION,O.BASEFLOWNO,bo.flow_unid,bo.proj_id,bo.contract_id,bo.InputUserID,getUserName(bo.InputUserID) AS InputUserIDName,bo.UpdateUserID,bo.UpdateTime,bo.flow_key,lpi.PROJECT_NO,bo.proj_name,lci.CONTRACT_NUMBER,O.FLOWNAME ,O.phasename,bo.InputTime,'' AS ACTION,lcc.CLEAN_LEASE_MONEY,lec.MODEL FROM FLOW_OBJECT O LEFT JOIN FLOW_BUSSINESS_OBJECT bo ON O.ObjectNo = bo.flow_unid LEFT JOIN (SELECT car_type,PROJECT_NO,FLOWUNID,product_id,distributor_id FROM LB_PROJECT_INFO_TEMP ) lpi ON lpi.FLOWUNID= bo.FLOW_UNID LEFT JOIN (SELECT CUSTOMER_ID,FLOWUNID,CUSTOMER_NAME,project_id FROM LB_UNION_LESSEE_TEMP GROUP BY project_id) cpt ON cpt.project_id = bo.proj_id LEFT JOIN DISTRIBUTOR_INFO di ON lpi.distributor_id = di.distributor_no LEFT JOIN LB_CONTRACT_INFO_TEMP lci ON O.ObjectNo = lci.FLOWUNID LEFT JOIN (SELECT project_id,model FROM LB_EQUIPMENT_CAR_temp GROUP BY project_id) lec ON lec.project_id=bo.proj_id LEFT JOIN LC_CALC_CONDITION_TEMP lcc ON lcc.flowunid=O.objectno LEFT JOIN (SELECT objectno,serialno FROM flow_task GROUP BY objectno) ft ON ft.objectno=o.objectno LEFT JOIN customer_info ci ON ci.customerid=cpt.CUSTOMER_ID LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id WHERE 1 = 1 AND O.ObjectType IN ('ProductDefaultObject','FlowDefaultObject') AND O.PhaseType='1020' AND O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','BusinessChangeApply','BusinessCancelApply','MortgageFileMailApply','MortgageFileApply','FundPaymentCarApply') AND O.UserID='"+userId+"' "; + sql = "SELECT O.OBJECTTYPE,di.distributor_name,O.OBJECTNO,cpt.CUSTOMER_NAME,O.PHASETYPE,O.APPLYTYPE,O.FLOWNO,O.PHASENO,O.OBJDESCRIBE,O.OBJATTRIBUTE1,O.OBJATTRIBUTE2,O.OBJATTRIBUTE3,O.OBJATTRIBUTE4,O.OBJATTRIBUTE5,O.ORGID,O.USERID,O.USERNAME,O.INPUTDATE,O.ARCHIVETIME,O.PROCESSINSTNO,O.PROCESSTASKNO,ft.SERIALNO,ci.customertype,psl.signType,lpi.car_type,O.FLOWSTATE,O.ARCHIVE,O.VERSION,O.BASEFLOWNO,bo.flow_unid,bo.proj_id,bo.contract_id,bo.InputUserID,getUserName(bo.InputUserID) AS InputUserIDName,bo.UpdateUserID,bo.UpdateTime,bo.flow_key,lpi.PROJECT_NO,bo.proj_name,lci.CONTRACT_NUMBER,O.FLOWNAME ,O.phasename,bo.InputTime,'' AS ACTION,lcc.CLEAN_LEASE_MONEY,lec.MODEL FROM FLOW_OBJECT O LEFT JOIN FLOW_BUSSINESS_OBJECT bo ON O.ObjectNo = bo.flow_unid LEFT JOIN (SELECT car_type,PROJECT_NO,FLOWUNID,product_id,distributor_id FROM LB_PROJECT_INFO_TEMP ) lpi ON lpi.FLOWUNID= bo.FLOW_UNID LEFT JOIN (SELECT CUSTOMER_ID,FLOWUNID,CUSTOMER_NAME,project_id FROM LB_UNION_LESSEE_TEMP GROUP BY project_id) cpt ON cpt.project_id = bo.proj_id LEFT JOIN DISTRIBUTOR_INFO di ON lpi.distributor_id = di.distributor_no LEFT JOIN LB_CONTRACT_INFO_TEMP lci ON O.ObjectNo = lci.FLOWUNID LEFT JOIN (SELECT FLOWUNID,GROUP_CONCAT(MODEL SEPARATOR ',') AS model FROM LB_EQUIPMENT_CAR_temp GROUP BY FLOWUNID) lec ON lec.FLOWUNID=bo.FLOW_UNID LEFT JOIN LC_CALC_CONDITION_TEMP lcc ON lcc.flowunid=O.objectno LEFT JOIN (SELECT objectno,serialno FROM flow_task GROUP BY objectno) ft ON ft.objectno=o.objectno LEFT JOIN customer_info ci ON ci.customerid=cpt.CUSTOMER_ID LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id WHERE 1 = 1 AND O.ObjectType IN ('ProductDefaultObject','FlowDefaultObject') AND O.PhaseType='1020' AND O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','BusinessChangeApply','BusinessCancelApply','MortgageFileMailApply','MortgageFileApply','FundPaymentCarApply') AND O.UserID='"+userId+"' "; if(globaltext.length() ==0 ){ sql = sql+ " ORDER BY bo.InputTime DESC "; }else{ @@ -409,7 +409,7 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{ String userId = fieldMap.get("userid") == null ? "" : fieldMap.get("userid").toString(); String globaltext = fieldMap.get("globaltext") == null ? "" : fieldMap.get("globaltext").toString(); String sql = ""; - sql = "SELECT O.OBJECTTYPE,di.distributor_name,O.OBJECTNO,cpt.CUSTOMER_NAME,O.PHASETYPE,O.APPLYTYPE,O.FLOWNO,O.PHASENO,O.OBJDESCRIBE,O.OBJATTRIBUTE1,O.OBJATTRIBUTE2,O.OBJATTRIBUTE3,O.OBJATTRIBUTE4,O.OBJATTRIBUTE5,O.ORGID,O.USERID,O.USERNAME,O.INPUTDATE,O.ARCHIVETIME,O.PROCESSINSTNO,O.PROCESSTASKNO,ft.SERIALNO,ci.customertype,psl.signType,lpi.car_type,O.FLOWSTATE,O.ARCHIVE,O.VERSION,O.BASEFLOWNO,bo.flow_unid,bo.proj_id,bo.contract_id,bo.InputUserID,getUserName(bo.InputUserID) as InputUserIDName,bo.UpdateUserID,bo.UpdateTime,bo.flow_key,lpi.PROJECT_NO,bo.proj_name,lci.CONTRACT_NUMBER,O.FLOWNAME ,O.phasename,bo.InputTime,'' as ACTION,lpc.CLEAN_LEASE_MONEY,lec.MODEL,O.phasename FROM FLOW_OBJECT O LEFT JOIN FLOW_BUSSINESS_OBJECT bo ON O.ObjectNo = bo.flow_unid LEFT JOIN (SELECT car_type,PROJECT_NO,FLOWUNID,product_id,distributor_id FROM LB_PROJECT_INFO_TEMP ) lpi ON lpi.FLOWUNID= bo.FLOW_UNID LEFT JOIN (SELECT CUSTOMER_ID,FLOWUNID,CUSTOMER_NAME,project_id FROM LB_UNION_LESSEE_TEMP GROUP BY project_id) cpt ON cpt.project_id = bo.proj_id LEFT JOIN DISTRIBUTOR_INFO di ON lpi.distributor_id = di.distributor_no LEFT JOIN LB_CONTRACT_INFO_TEMP lci ON O.ObjectNo = lci.FLOWUNID LEFT JOIN LB_EQUIPMENT_CAR lec ON lec.project_id=bo.proj_id LEFT JOIN LC_PROJ_CONDITION lpc ON bo.proj_id=lpc.project_id LEFT JOIN (SELECT objectno,serialno FROM flow_task GROUP BY objectno) ft ON ft.objectno=o.objectno LEFT JOIN customer_info ci ON ci.customerid=cpt.CUSTOMER_ID LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id WHERE 1 = 1 and O.ObjectType IN ('ProductDefaultObject','FlowDefaultObject') and O.PhaseType IN ('1040','1050') and O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','BusinessChangeApply','BusinessCancelApply','MortgageFileMailApply','MortgageFileApply','FundPaymentCarApply') and O.UserID='"+userId+"' "; + sql = "SELECT O.OBJECTTYPE,di.distributor_name,O.OBJECTNO,cpt.CUSTOMER_NAME,O.PHASETYPE,O.APPLYTYPE,O.FLOWNO,O.PHASENO,O.OBJDESCRIBE,O.OBJATTRIBUTE1,O.OBJATTRIBUTE2,O.OBJATTRIBUTE3,O.OBJATTRIBUTE4,O.OBJATTRIBUTE5,O.ORGID,O.USERID,O.USERNAME,O.INPUTDATE,O.ARCHIVETIME,O.PROCESSINSTNO,O.PROCESSTASKNO,ft.SERIALNO,ci.customertype,psl.signType,lpi.car_type,O.FLOWSTATE,O.ARCHIVE,O.VERSION,O.BASEFLOWNO,bo.flow_unid,bo.proj_id,bo.contract_id,bo.InputUserID,getUserName(bo.InputUserID) as InputUserIDName,bo.UpdateUserID,bo.UpdateTime,bo.flow_key,lpi.PROJECT_NO,bo.proj_name,lci.CONTRACT_NUMBER,O.FLOWNAME ,O.phasename,bo.InputTime,'' as ACTION,lpc.CLEAN_LEASE_MONEY,lec.MODEL,O.phasename FROM FLOW_OBJECT O LEFT JOIN FLOW_BUSSINESS_OBJECT bo ON O.ObjectNo = bo.flow_unid LEFT JOIN (SELECT car_type,PROJECT_NO,FLOWUNID,product_id,distributor_id FROM LB_PROJECT_INFO_TEMP ) lpi ON lpi.FLOWUNID= bo.FLOW_UNID LEFT JOIN (SELECT CUSTOMER_ID,FLOWUNID,CUSTOMER_NAME,project_id FROM LB_UNION_LESSEE_TEMP GROUP BY project_id) cpt ON cpt.project_id = bo.proj_id LEFT JOIN DISTRIBUTOR_INFO di ON lpi.distributor_id = di.distributor_no LEFT JOIN LB_CONTRACT_INFO_TEMP lci ON O.ObjectNo = lci.FLOWUNID LEFT JOIN (SELECT project_id,GROUP_CONCAT(MODEL SEPARATOR ',') AS model FROM LB_EQUIPMENT_CAR GROUP BY project_id) lec ON lec.project_id=bo.proj_id LEFT JOIN LC_PROJ_CONDITION lpc ON bo.proj_id=lpc.project_id LEFT JOIN (SELECT objectno,serialno FROM flow_task GROUP BY objectno) ft ON ft.objectno=o.objectno LEFT JOIN customer_info ci ON ci.customerid=cpt.CUSTOMER_ID LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id WHERE 1 = 1 and O.ObjectType IN ('ProductDefaultObject','FlowDefaultObject') and O.PhaseType IN ('1040','1050') and O.ApplyType IN ('BusinessApplyApply','BContractChangeApply','BContractCancelApply','BContractApproveApply','BusinessChangeApply','BusinessCancelApply','MortgageFileMailApply','MortgageFileApply','FundPaymentCarApply') and O.UserID='"+userId+"' "; if(globaltext.length() ==0 ){ sql = sql+ " ORDER BY bo.InputTime DESC "; }else{ diff --git a/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyOverseeServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyOverseeServiceImpl.java index c6f18145f..8443a406d 100644 --- a/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyOverseeServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyOverseeServiceImpl.java @@ -35,9 +35,9 @@ public class ApplyOverseeServiceImpl implements ApplyOverseeService{ String orgID = asUser.getOrgID(); String sql = ""; if("8006011".equals(orgID)){ - sql = "select lci.id as contract_id,lci.project_id as PROJECT_ID,lci.product_id as PRODUCT_ID,lci.contract_number as CONTRACT_NUMBER,lci.project_name as PROJECT_NAME,lpi.project_no as project_no,lul.customer_name as customer_name,ci.customertype as customertype,lfi.fact_money,lec.model,lec.frame_number,lpc.income_number,lprp.rent,lfi.fact_date AS END_DATE from lb_contract_info lci left join lb_project_info lpi on lci.project_id=lpi.id left join lb_union_lessee lul on lci.id=lul.contract_id AND lul.IS_MAIN='Y' LEFT JOIN CUSTOMER_INFO ci ON lul.customer_id = ci.customerid left join LB_EQUIPMENT_CAR lec ON lci.id=lec.contract_id LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' LEFT JOIN lc_fund_income lfi ON lfi.contract_id=lci.id AND lfi.plan_list='1' AND lfi.fee_type='feetype10' AND lfi.pay_status='have_paid' AND lfi.pay_type='pay_type_out' AND (lfi.settle_method='settlemethod6' or lfi.settle_method='settlemethod13') AND lfi.ROLL_BACK='0' AND ebank_status='05' WHERE (lci.contract_status>=31 and lci.contract_status<100) AND lci.BUSINESSTYPE='1' AND lci.id NOT IN (SELECT contract_id FROM LB_FILE_ARCHIVING_INFO where contract_id IS NOT NULL) AND lci.inputorgid='"+orgID+"' "; + sql = "select lci.id as contract_id,lci.project_id as PROJECT_ID,lci.product_id as PRODUCT_ID,lci.contract_number as CONTRACT_NUMBER,lci.project_name as PROJECT_NAME,lpi.project_no as project_no,lul.customer_name as customer_name,ci.customertype as customertype,lfi.fact_money,lec.model,lec.frame_number,lpc.income_number,lprp.rent,lfi.fact_date AS END_DATE from lb_contract_info lci left join lb_project_info lpi on lci.project_id=lpi.id left join lb_union_lessee lul on lci.id=lul.contract_id AND lul.IS_MAIN='Y' LEFT JOIN CUSTOMER_INFO ci ON lul.customer_id = ci.customerid left join (SELECT CONTRACT_ID,GROUP_CONCAT(MODEL SEPARATOR ',') AS model,GROUP_CONCAT(frame_number SEPARATOR ',') AS frame_number FROM LB_EQUIPMENT_CAR GROUP BY CONTRACT_ID) lec ON lci.id=lec.contract_id LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' LEFT JOIN lc_fund_income lfi ON lfi.contract_id=lci.id AND lfi.plan_list='1' AND lfi.fee_type='feetype10' AND lfi.pay_status='have_paid' AND lfi.pay_type='pay_type_out' AND (lfi.settle_method='settlemethod6' or lfi.settle_method='settlemethod13') AND lfi.ROLL_BACK='0' AND ebank_status='05' WHERE (lci.contract_status>=31 and lci.contract_status<100) AND lci.BUSINESSTYPE='1' AND lci.id NOT IN (SELECT contract_id FROM LB_FILE_ARCHIVING_INFO where contract_id IS NOT NULL) AND lci.inputorgid='"+orgID+"' "; }else{ - sql = "select lci.id as contract_id,lci.project_id as PROJECT_ID,lci.product_id as PRODUCT_ID,lci.contract_number as CONTRACT_NUMBER,lci.project_name as PROJECT_NAME,lpi.project_no as project_no,lul.customer_name as customer_name,ci.customertype as customertype,lfi.fact_money,lec.model,lec.frame_number,lpc.income_number,lprp.rent,lfi.fact_date AS END_DATE from lb_contract_info lci left join lb_project_info lpi on lci.project_id=lpi.id left join lb_union_lessee lul on lci.id=lul.contract_id AND lul.IS_MAIN='Y' LEFT JOIN CUSTOMER_INFO ci ON lul.customer_id = ci.customerid left join LB_EQUIPMENT_CAR lec ON lci.id=lec.contract_id LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' LEFT JOIN lc_fund_income lfi ON lfi.contract_id=lci.id AND lfi.plan_list='1' AND lfi.fee_type='feetype10' AND lfi.pay_status='have_paid' AND lfi.pay_type='pay_type_out' AND (lfi.settle_method='settlemethod6' or lfi.settle_method='settlemethod13') AND lfi.ROLL_BACK='0' AND ebank_status='05' WHERE (lci.contract_status>=31 and lci.contract_status<100) AND lci.BUSINESSTYPE='1' AND lci.id NOT IN (SELECT contract_id FROM LB_FILE_ARCHIVING_INFO where contract_id IS NOT NULL ) AND lci.project_manage='"+userId+"' "; + sql = "select lci.id as contract_id,lci.project_id as PROJECT_ID,lci.product_id as PRODUCT_ID,lci.contract_number as CONTRACT_NUMBER,lci.project_name as PROJECT_NAME,lpi.project_no as project_no,lul.customer_name as customer_name,ci.customertype as customertype,lfi.fact_money,lec.model,lec.frame_number,lpc.income_number,lprp.rent,lfi.fact_date AS END_DATE from lb_contract_info lci left join lb_project_info lpi on lci.project_id=lpi.id left join lb_union_lessee lul on lci.id=lul.contract_id AND lul.IS_MAIN='Y' LEFT JOIN CUSTOMER_INFO ci ON lul.customer_id = ci.customerid left join (SELECT CONTRACT_ID,GROUP_CONCAT(MODEL SEPARATOR ',') AS model,GROUP_CONCAT(frame_number SEPARATOR ',') AS frame_number FROM LB_EQUIPMENT_CAR GROUP BY CONTRACT_ID) lec ON lci.id=lec.contract_id LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' LEFT JOIN lc_fund_income lfi ON lfi.contract_id=lci.id AND lfi.plan_list='1' AND lfi.fee_type='feetype10' AND lfi.pay_status='have_paid' AND lfi.pay_type='pay_type_out' AND (lfi.settle_method='settlemethod6' or lfi.settle_method='settlemethod13') AND lfi.ROLL_BACK='0' AND ebank_status='05' WHERE (lci.contract_status>=31 and lci.contract_status<100) AND lci.BUSINESSTYPE='1' AND lci.id NOT IN (SELECT contract_id FROM LB_FILE_ARCHIVING_INFO where contract_id IS NOT NULL ) AND lci.project_manage='"+userId+"' "; } if(globaltext.length() ==0 ){ sql = sql+ " ORDER BY lfi.fact_date DESC "; diff --git a/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyPaymentServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyPaymentServiceImpl.java index 2fe80c46d..3fef22da8 100644 --- a/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyPaymentServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyPaymentServiceImpl.java @@ -35,9 +35,9 @@ public class ApplyPaymentServiceImpl implements ApplyPaymentService{ String orgID = asUser.getOrgID(); String sql = ""; if(orgID=="8006011"){ - sql = "select contract_id,CONTRACT_NUMBER,CONTRACT_NO,PROJECT_ID,PRODUCT_ID,PROJECT_NAME,customerid,customername,total,usedlines,relines,plan_money,afact_money,allfact_money,fee_adjust,overmoney,username,customertype,CAR_TYPE,END_DATE,certid,model,frame_number,income_number,rent from (SELECT lci.ID as contract_id,lci.CONTRACT_NUMBER,lci.CONTRACT_NO,lci.PROJECT_ID,lci.PRODUCT_ID,lci.PROJECT_NAME,lul.customerid,lul.customername,di.total,di.usedlines,di.relines,vlfp.plan_money,IFNULL(lfi.allfact_money, 0) AS afact_money,vlfp.allfact_money,vlfp.fee_adjust,vlfp.overmoney,ui.username,lul.customertype,lci.CAR_TYPE,lpi.END_DATE,lul.certid,lec.model,lec.frame_number,lpc.income_number,lprp.rent FROM LB_CONTRACT_INFO AS lci LEFT JOIN (SELECT lu.contract_id,lu.PROJECT_ID,ci.customerid,ci.customername,ci.customertype,ci.certid FROM LB_UNION_LESSEE lu,CUSTOMER_INFO ci WHERE lu.CUSTOMER_ID = ci.customerid AND is_main = 'y') AS lul ON lul.CONTRACT_ID = lci.ID LEFT JOIN (SELECT vl.contract_id,SUM(vl.plan_money) plan_money,SUM(vl.allfact_money) allfact_money,SUM(vl.fee_adjust) fee_adjust,SUM(vl.overmoney) overmoney FROM vi_lc_fund_plan vl WHERE vl.pay_type = 'pay_type_out' AND vl.fee_type NOT IN ('feetype16', 'feetype17') GROUP BY vl.contract_id) vlfp ON vlfp.contract_id = lci.ID LEFT JOIN (SELECT contract_id,SUM(IFNULL(fact_money, 0)) + SUM(IFNULL(fee_adjust, 0)) AS allfact_money FROM lc_fund_income WHERE pay_type = 'pay_type_out' AND roll_back = '0' AND pay_status = 'apply_pass' GROUP BY contract_id) AS lfi ON lfi.contract_id = lci.ID LEFT JOIN user_info AS ui ON lci.PROJECT_MANAGE = ui.userid left join vi_distributor_lines di on lci.distributor_id=di.distributor_no left join LB_PROJECT_INFO lpi on lpi.id=lul.project_id left join LB_EQUIPMENT_CAR lec ON lci.id=lec.contract_id LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' WHERE (lci.contract_status = '21' OR lci.contract_status = '25' OR lci.contract_status = '26')AND lci.BUSINESSTYPE='1' AND lci.INPUTORGID='"+orgID+"' "; + sql = "select contract_id,CONTRACT_NUMBER,CONTRACT_NO,PROJECT_ID,PRODUCT_ID,PROJECT_NAME,customerid,customername,total,usedlines,relines,plan_money,afact_money,allfact_money,fee_adjust,overmoney,username,customertype,CAR_TYPE,END_DATE,certid,model,frame_number,income_number,rent from (SELECT lci.ID as contract_id,lci.CONTRACT_NUMBER,lci.CONTRACT_NO,lci.PROJECT_ID,lci.PRODUCT_ID,lci.PROJECT_NAME,lul.customerid,lul.customername,di.total,di.usedlines,di.relines,vlfp.plan_money,IFNULL(lfi.allfact_money, 0) AS afact_money,vlfp.allfact_money,vlfp.fee_adjust,vlfp.overmoney,ui.username,lul.customertype,lci.CAR_TYPE,lpi.END_DATE,lul.certid,lec.model,lec.frame_number,lpc.income_number,lprp.rent FROM LB_CONTRACT_INFO AS lci LEFT JOIN (SELECT lu.contract_id,lu.PROJECT_ID,ci.customerid,ci.customername,ci.customertype,ci.certid FROM LB_UNION_LESSEE lu,CUSTOMER_INFO ci WHERE lu.CUSTOMER_ID = ci.customerid AND is_main = 'y') AS lul ON lul.CONTRACT_ID = lci.ID LEFT JOIN (SELECT vl.contract_id,SUM(vl.plan_money) plan_money,SUM(vl.allfact_money) allfact_money,SUM(vl.fee_adjust) fee_adjust,SUM(vl.overmoney) overmoney FROM vi_lc_fund_plan vl WHERE vl.pay_type = 'pay_type_out' AND vl.fee_type NOT IN ('feetype16', 'feetype17') GROUP BY vl.contract_id) vlfp ON vlfp.contract_id = lci.ID LEFT JOIN (SELECT contract_id,SUM(IFNULL(fact_money, 0)) + SUM(IFNULL(fee_adjust, 0)) AS allfact_money FROM lc_fund_income WHERE pay_type = 'pay_type_out' AND roll_back = '0' AND pay_status = 'apply_pass' GROUP BY contract_id) AS lfi ON lfi.contract_id = lci.ID LEFT JOIN user_info AS ui ON lci.PROJECT_MANAGE = ui.userid left join vi_distributor_lines di on lci.distributor_id=di.distributor_no left join LB_PROJECT_INFO lpi on lpi.id=lul.project_id left join (SELECT GROUP_CONCAT(MODEL SEPARATOR ',') AS MODEL,contract_id,GROUP_CONCAT(frame_number SEPARATOR ',') AS frame_number FROM LB_EQUIPMENT_CAR GROUP BY contract_id) lec ON lci.id=lec.contract_id LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' WHERE (lci.contract_status = '21' OR lci.contract_status = '25' OR lci.contract_status = '26')AND lci.BUSINESSTYPE='1' AND lci.INPUTORGID='"+orgID+"' "; }else{ - sql = "select contract_id,CONTRACT_NUMBER,CONTRACT_NO,PROJECT_ID,PRODUCT_ID,PROJECT_NAME,customerid,customername,total,usedlines,relines,plan_money,afact_money,allfact_money,fee_adjust,overmoney,username,customertype,CAR_TYPE,END_DATE,certid,model,frame_number,income_number,rent from (SELECT lci.ID as contract_id,lci.CONTRACT_NUMBER,lci.CONTRACT_NO,lci.PROJECT_ID,lci.PRODUCT_ID,lci.PROJECT_NAME,lul.customerid,lul.customername,di.total,di.usedlines,di.relines,vlfp.plan_money,IFNULL(lfi.allfact_money, 0) AS afact_money,vlfp.allfact_money,vlfp.fee_adjust,vlfp.overmoney,ui.username,lul.customertype,lci.CAR_TYPE,lpi.END_DATE,lul.certid,lec.model,lec.frame_number,lpc.income_number,lprp.rent FROM LB_CONTRACT_INFO AS lci LEFT JOIN (SELECT lu.contract_id,lu.PROJECT_ID,ci.customerid,ci.customername,ci.customertype,ci.certid FROM LB_UNION_LESSEE lu,CUSTOMER_INFO ci WHERE lu.CUSTOMER_ID = ci.customerid AND is_main = 'y') AS lul ON lul.CONTRACT_ID = lci.ID LEFT JOIN (SELECT vl.contract_id,SUM(vl.plan_money) plan_money,SUM(vl.allfact_money) allfact_money,SUM(vl.fee_adjust) fee_adjust,SUM(vl.overmoney) overmoney FROM vi_lc_fund_plan vl WHERE vl.pay_type = 'pay_type_out' AND vl.fee_type NOT IN ('feetype16', 'feetype17') GROUP BY vl.contract_id) vlfp ON vlfp.contract_id = lci.ID LEFT JOIN (SELECT contract_id,fact_money,SUM(IFNULL(fact_money, 0)) + SUM(IFNULL(fee_adjust, 0)) AS allfact_money FROM lc_fund_income WHERE pay_type = 'pay_type_out' AND roll_back = '0' AND pay_status = 'apply_pass' GROUP BY contract_id) AS lfi ON lfi.contract_id = lci.ID LEFT JOIN user_info AS ui ON lci.PROJECT_MANAGE = ui.userid left join vi_distributor_lines di on lci.distributor_id=di.distributor_no left join LB_PROJECT_INFO lpi on lpi.id=lul.project_id left join LB_EQUIPMENT_CAR lec ON lci.id=lec.contract_id LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' WHERE (lci.contract_status = '21' OR lci.contract_status = '25' OR lci.contract_status = '26')AND lci.BUSINESSTYPE='1' AND lci.PROJECT_MANAGE='"+userId+"' "; + sql = "select contract_id,CONTRACT_NUMBER,CONTRACT_NO,PROJECT_ID,PRODUCT_ID,PROJECT_NAME,customerid,customername,total,usedlines,relines,plan_money,afact_money,allfact_money,fee_adjust,overmoney,username,customertype,CAR_TYPE,END_DATE,certid,model,frame_number,income_number,rent from (SELECT lci.ID as contract_id,lci.CONTRACT_NUMBER,lci.CONTRACT_NO,lci.PROJECT_ID,lci.PRODUCT_ID,lci.PROJECT_NAME,lul.customerid,lul.customername,di.total,di.usedlines,di.relines,vlfp.plan_money,IFNULL(lfi.allfact_money, 0) AS afact_money,vlfp.allfact_money,vlfp.fee_adjust,vlfp.overmoney,ui.username,lul.customertype,lci.CAR_TYPE,lpi.END_DATE,lul.certid,lec.model,lec.frame_number,lpc.income_number,lprp.rent FROM LB_CONTRACT_INFO AS lci LEFT JOIN (SELECT lu.contract_id,lu.PROJECT_ID,ci.customerid,ci.customername,ci.customertype,ci.certid FROM LB_UNION_LESSEE lu,CUSTOMER_INFO ci WHERE lu.CUSTOMER_ID = ci.customerid AND is_main = 'y') AS lul ON lul.CONTRACT_ID = lci.ID LEFT JOIN (SELECT vl.contract_id,SUM(vl.plan_money) plan_money,SUM(vl.allfact_money) allfact_money,SUM(vl.fee_adjust) fee_adjust,SUM(vl.overmoney) overmoney FROM vi_lc_fund_plan vl WHERE vl.pay_type = 'pay_type_out' AND vl.fee_type NOT IN ('feetype16', 'feetype17') GROUP BY vl.contract_id) vlfp ON vlfp.contract_id = lci.ID LEFT JOIN (SELECT contract_id,fact_money,SUM(IFNULL(fact_money, 0)) + SUM(IFNULL(fee_adjust, 0)) AS allfact_money FROM lc_fund_income WHERE pay_type = 'pay_type_out' AND roll_back = '0' AND pay_status = 'apply_pass' GROUP BY contract_id) AS lfi ON lfi.contract_id = lci.ID LEFT JOIN user_info AS ui ON lci.PROJECT_MANAGE = ui.userid left join vi_distributor_lines di on lci.distributor_id=di.distributor_no left join LB_PROJECT_INFO lpi on lpi.id=lul.project_id left join (SELECT GROUP_CONCAT(MODEL SEPARATOR ',') AS MODEL,contract_id,GROUP_CONCAT(frame_number SEPARATOR ',') AS frame_number FROM LB_EQUIPMENT_CAR GROUP BY contract_id) lec ON lci.id=lec.contract_id LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' WHERE (lci.contract_status = '21' OR lci.contract_status = '25' OR lci.contract_status = '26')AND lci.BUSINESSTYPE='1' AND lci.PROJECT_MANAGE='"+userId+"' "; } if(globaltext.length() ==0 ){ sql = sql+ " AND IFNULL(lfi.allfact_money, 0) < vlfp.plan_money AND lci.ID NOT IN (SELECT contract_id FROM flow_bussiness_object fbo,flow_object fo WHERE fbo.flow_unid = fo.objectno AND fbo.flow_name = '资金付款' AND fo.phaseno NOT IN ('1000', '8000'))) tab where tab.overmoney>0 "; From 427e847ee9a6c003fdb8e2c4fae4cc63c3029151 Mon Sep 17 00:00:00 2001 From: maliang Date: Tue, 26 Oct 2021 09:48:07 +0800 Subject: [PATCH 23/26] =?UTF-8?q?fix:=E5=90=88=E5=90=8C=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../util/MakeOneCodeAndContractModel.java | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/src_tenwa/com/tenwa/makeContract/util/MakeOneCodeAndContractModel.java b/src_tenwa/com/tenwa/makeContract/util/MakeOneCodeAndContractModel.java index d8d671933..5353de626 100644 --- a/src_tenwa/com/tenwa/makeContract/util/MakeOneCodeAndContractModel.java +++ b/src_tenwa/com/tenwa/makeContract/util/MakeOneCodeAndContractModel.java @@ -346,7 +346,8 @@ public class MakeOneCodeAndContractModel { under10.addImage(img); } - if(pages>10&&"02".equals(leasform)&&("乘用车手签".equals(docName)||"商用车手签".equals(docName))){ + if(pages>10&&"02".equals(leasform)&&("乘用车手签".equals(docName)||"商用车手签".equals(docName) + ||"乘用车电子签约".equals(docName)||"商用车电子签约".equals(docName))){ //车辆交接单水印 PdfContentByte under5 = stamp.getUnderContent(5); img.scaleAbsolute(180, 32); @@ -364,23 +365,23 @@ public class MakeOneCodeAndContractModel { under9.addImage(img); } - if(pages>7&&"02".equals(leasform)&&("乘用车电子签约".equals(docName)||"商用车电子签约".equals(docName))){ - //车辆交接单水印 - PdfContentByte under5 = stamp.getUnderContent(5); - img.scaleAbsolute(180, 32); - img.setAbsolutePosition(400, 800); - under5.addImage(img); - - PdfContentByte under7 = stamp.getUnderContent(6); - img.scaleAbsolute(180, 32); - img.setAbsolutePosition(400, 800); - under7.addImage(img); - //租金支付表水印 - PdfContentByte under9 = stamp.getUnderContent(8); - img.scaleAbsolute(180, 32); - img.setAbsolutePosition(400, 800); - under9.addImage(img); - } +// if(pages>7&&"02".equals(leasform)&&("乘用车电子签约".equals(docName)||"商用车电子签约".equals(docName))){ +// //车辆交接单水印 +// PdfContentByte under5 = stamp.getUnderContent(5); +// img.scaleAbsolute(180, 32); +// img.setAbsolutePosition(400, 800); +// under5.addImage(img); +// +// PdfContentByte under7 = stamp.getUnderContent(6); +// img.scaleAbsolute(180, 32); +// img.setAbsolutePosition(400, 800); +// under7.addImage(img); +// //租金支付表水印 +// PdfContentByte under9 = stamp.getUnderContent(8); +// img.scaleAbsolute(180, 32); +// img.setAbsolutePosition(400, 800); +// under9.addImage(img); +// } stamp.close();// 关闭 File tempfile = new File(InPdfFile); //删除原文件 From 3827b4ce522d8e569b5b13e20b2510ff8493f602 Mon Sep 17 00:00:00 2001 From: "chaojie.li" Date: Tue, 26 Oct 2021 14:59:30 +0800 Subject: [PATCH 24/26] =?UTF-8?q?chore:=E4=BC=98=E5=8C=96=E7=A7=9F?= =?UTF-8?q?=E9=87=91=E6=A0=B8=E9=94=80=E9=80=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src_sql/procedure/proc_insert_hexiao.sql | 951 +++++++++++++++-------- 1 file changed, 615 insertions(+), 336 deletions(-) diff --git a/src_sql/procedure/proc_insert_hexiao.sql b/src_sql/procedure/proc_insert_hexiao.sql index 613318714..63e8c376e 100644 --- a/src_sql/procedure/proc_insert_hexiao.sql +++ b/src_sql/procedure/proc_insert_hexiao.sql @@ -1,338 +1,617 @@ -DELIMITER $$ +create + definer = apzl@`%` procedure proc_insert_hexiao(IN ln_contract_id varchar(200), IN ln_plan_date varchar(200), IN in_rent varchar(200), + IN in_hire_list varchar(200), IN in_type varchar(2)) +BEGIN + -- 如果in_type=1就是手工核销 + IF in_type = 1 THEN + INSERT INTO LC_RENT_INCOME (ID, + QUOT_ID, + CUST_ID, + PROJECT_ID, + PROJECT_PLAN_NUMBER, + CONTRACT_ID, + CONTRACT_PLAN_NUMBER, + PAYMENT_NUMBER, + EBANK_NUMBER, + PLAN_ID, + PLAN_LIST, + INTEREST_ADJUST, + SETTLE_METHOD, + HIRE_LIST, + HIRE_DATE, + RENT, + CORPUS, + INTEREST, + PENALTY, + CORPUS_ADJUST, + PENALTY_ADJUST, + ROLL_BACK, + COIN, + hire_number, + hire_bank, + hire_account, + own_bank, + own_account, + own_number, + charge_way) + ( + SELECT REPLACE(UUID(), '-', '') AS id, + LCP2.QUOT_ID, + LCP2.CUST_ID, + LCP2.PROJECT_ID, + LCP2.PROJECT_PLAN_NUMBER, + LCP2.CONTRACT_ID, + LCP2.CONTRACT_PLAN_NUMBER, + LCP2.PAYMENT_NUMBER, + '' AS EBANK_NUMBER, + LCP2.PLAN_ID, + LCP2.PLAN_LIST, + '0' AS INTEREST_ADJUST, + 'settlemethod6' AS SETTLE_METHOD, + in_hire_list AS HIRE_LIST, + DATE_FORMAT(CURDATE(), '%Y/%m/%d') AS HIRE_DATE, + LCP2.rent_over AS RENT, + LCP2.corpus_over AS CORPUS, + LCP2.interest_over AS INTEREST, + ( + in_rent - LCP2.corpus_over - LCP2.interest_over + ) AS PENALTY, + '0' AS CORPUS_ADJUST, + '0' AS PENALTY_ADJUST, + '0' AS ROLL_BACK, + LCP2.COIN AS COIN, + ca.acc_number, + ca.bank_name, + ca.account, + oa.acc_bank, + lci.subjectname, + oa.acc_number, + 'AutoBuckle' + FROM ( + SELECT LCP.QUOT_ID, + LCP.CUST_ID, + LCP.PROJECT_ID, + LCP.PROJECT_PLAN_NUMBER, + LCP.CONTRACT_ID, + LCP.CONTRACT_PLAN_NUMBER, + LCP.PAYMENT_NUMBER, + LCP.id AS PLAN_ID, + LCP.PLAN_LIST, + LCP.COIN, + (LCP.RENT - (ifnull(LRI.rent, 0) + ifnull(lcfi.rent, 0))) AS rent_over, + (LCP.CORPUS - (((ifnull(LRI.corpus, 0) + ifnull(lcfi.corpus, 0)) + ifnull(LRI.corpus_adjust, 0)) + + ifnull(lcfi.corpus_adjust, 0))) AS corpus_over, + (LCP.INTEREST - (((ifnull(LRI.interest, 0) + ifnull(lcfi.interest, 0)) + ifnull(LRI.interest_adjust, 0)) + + ifnull(lcfi.interest_adjust, 0))) AS interest_over, + round((getRentPenalty(LCP.PAYMENT_NUMBER, LCP.PLAN_LIST, date_format(now(), '%Y/%m/%d')) - + ((ifnull(LRI.penalty, 0) + ifnull(lcfi.penalty, 0)) + + (ifnull(LRI.penalty_adjust, 0) + ifnull(lcfi.penalty_adjust, 0)))), + 2) AS penalty_over + FROM LC_RENT_PLAN LCP + LEFT JOIN ( + select LRI.PAYMENT_NUMBER AS payment_number, + LRI.PLAN_LIST AS plan_list, + sum(LRI.RENT) AS rent, + sum(LRI.CORPUS) AS corpus, + sum(LRI.INTEREST) AS interest, + sum(LRI.PENALTY) AS penalty, + sum(LRI.CORPUS_ADJUST) AS corpus_adjust, + sum(LRI.INTEREST_ADJUST) AS interest_adjust, + sum(LRI.PENALTY_ADJUST) AS penalty_adjust + from lc_rent_income LRI + where LRI.ROLL_BACK = '0' + AND LRI.contract_id = ln_contract_id + group by LRI.PAYMENT_NUMBER, LRI.PLAN_LIST + ) LRI ON LCP.PAYMENT_NUMBER = LRI.payment_number AND LCP.PLAN_LIST = LRI.plan_list + left join lc_rent_income_temp_transfer lcfi + on LCP.PAYMENT_NUMBER = lcfi.payment_number and LCP.PLAN_LIST = lcfi.plan_list + WHERE LCP.contract_id = ln_contract_id + AND LCP.plan_date = ln_plan_date + ) LCP2 + LEFT JOIN customer_account ca ON ca.contract_id = LCP2.contract_id + LEFT JOIN lb_contract_info lci ON LCP2.contract_id = lci.id + LEFT JOIN code_library cl ON cl.codeno = 'ManySubject' AND lci.subjectid = cl.itemno + LEFT JOIN own_account oa ON oa.own_id = cl.bankno AND oa.account_purpose = 'default' AND oa.state_ = '0010' AND + (oa.account_type = 'in_account' OR oa.account_type = 'inAndOut_account') AND oa.acc_type = '0010' + ); + -- in_type = 2为银联卡口手动刷新核销数据 + ELSEIF in_type = 2 THEN + INSERT INTO LC_RENT_INCOME (ID, + QUOT_ID, + CUST_ID, + PROJECT_ID, + PROJECT_PLAN_NUMBER, + CONTRACT_ID, + CONTRACT_PLAN_NUMBER, + PAYMENT_NUMBER, + EBANK_NUMBER, + PLAN_ID, + PLAN_LIST, + INTEREST_ADJUST, + SETTLE_METHOD, + HIRE_LIST, + HIRE_DATE, + RENT, + CORPUS, + INTEREST, + PENALTY, + CORPUS_ADJUST, + PENALTY_ADJUST, + ROLL_BACK, + COIN, + hire_number, + hire_bank, + hire_account, + own_bank, + own_account, + own_number, + charge_way) + ( + SELECT REPLACE(UUID(), '-', '') AS id, + LCP2.QUOT_ID, + LCP2.CUST_ID, + LCP2.PROJECT_ID, + LCP2.PROJECT_PLAN_NUMBER, + LCP2.CONTRACT_ID, + LCP2.CONTRACT_PLAN_NUMBER, + LCP2.PAYMENT_NUMBER, + '' AS EBANK_NUMBER, + LCP2.PLAN_ID, + LCP2.PLAN_LIST, + '0' AS INTEREST_ADJUST, + 'settlemethod6' AS SETTLE_METHOD, + in_hire_list AS HIRE_LIST, + DATE_FORMAT(CURDATE(), '%Y/%m/%d') AS HIRE_DATE, + CASE + WHEN in_rent >= LCP2.corpus_over + LCP2.interest_over + LCP2.penalty_over THEN LCP2.rent_over + WHEN in_rent < LCP2.corpus_over + LCP2.interest_over + LCP2.penalty_over AND + in_rent >= LCP2.interest_over + LCP2.penalty_over + THEN in_rent - LCP2.penalty_over + WHEN in_rent < LCP2.interest_over + LCP2.penalty_over AND in_rent > LCP2.penalty_over THEN in_rent - LCP2.penalty_over + ELSE '0' + END RENT, + CASE + WHEN in_rent >= LCP2.corpus_over + LCP2.interest_over + LCP2.penalty_over THEN LCP2.corpus_over + WHEN in_rent < LCP2.corpus_over + LCP2.interest_over + LCP2.penalty_over AND + in_rent >= LCP2.interest_over + LCP2.penalty_over + THEN in_rent - (LCP2.penalty_over + LCP2.interest_over) + WHEN in_rent < LCP2.interest_over + LCP2.penalty_over AND in_rent >= LCP2.penalty_over THEN '0' + ELSE '0' + END CORPUS, + CASE + WHEN in_rent >= LCP2.corpus_over + LCP2.interest_over + LCP2.penalty_over THEN LCP2.interest_over + WHEN in_rent < LCP2.corpus_over + LCP2.interest_over + LCP2.penalty_over AND + in_rent >= LCP2.interest_over + LCP2.penalty_over + THEN LCP2.interest_over + WHEN in_rent < LCP2.interest_over + LCP2.penalty_over AND in_rent >= LCP2.penalty_over THEN in_rent - LCP2.penalty_over + ELSE '0' + END INTEREST, + CASE + WHEN in_rent >= LCP2.corpus_over + LCP2.interest_over + LCP2.penalty_over THEN LCP2.penalty_over + WHEN in_rent < LCP2.corpus_over + LCP2.interest_over + LCP2.penalty_over AND + in_rent >= LCP2.interest_over + LCP2.penalty_over + THEN LCP2.penalty_over + WHEN in_rent < LCP2.interest_over + LCP2.penalty_over AND in_rent >= LCP2.penalty_over THEN LCP2.penalty_over + ELSE in_rent + END AS PENALTY, + '0' AS CORPUS_ADJUST, + '0' AS PENALTY_ADJUST, + '0' AS ROLL_BACK, + LCP2.COIN AS COIN, + ca.acc_number, + ca.bank_name, + ca.account, + oa.acc_bank, + lci.subjectname, + oa.acc_number, + 'AutoBuckle' + FROM ( + SELECT LCP.QUOT_ID, + LCP.CUST_ID, + LCP.PROJECT_ID, + LCP.PROJECT_PLAN_NUMBER, + LCP.CONTRACT_ID, + LCP.CONTRACT_PLAN_NUMBER, + LCP.PAYMENT_NUMBER, + LCP.id AS PLAN_ID, + LCP.PLAN_LIST, + LCP.COIN, + (LCP.RENT - (ifnull(LRI.rent, 0) + ifnull(lcfi.rent, 0))) AS rent_over, + (LCP.CORPUS - (((ifnull(LRI.corpus, 0) + ifnull(lcfi.corpus, 0)) + ifnull(LRI.corpus_adjust, 0)) + + ifnull(lcfi.corpus_adjust, 0))) AS corpus_over, + (LCP.INTEREST - (((ifnull(LRI.interest, 0) + ifnull(lcfi.interest, 0)) + ifnull(LRI.interest_adjust, 0)) + + ifnull(lcfi.interest_adjust, 0))) AS interest_over, + round((getRentPenalty(LCP.PAYMENT_NUMBER, LCP.PLAN_LIST, date_format(now(), '%Y/%m/%d')) - + ((ifnull(LRI.penalty, 0) + ifnull(lcfi.penalty, 0)) + + (ifnull(LRI.penalty_adjust, 0) + ifnull(lcfi.penalty_adjust, 0)))), + 2) AS penalty_over + FROM LC_RENT_PLAN LCP + LEFT JOIN ( + select LRI.PAYMENT_NUMBER AS payment_number, + LRI.PLAN_LIST AS plan_list, + sum(LRI.RENT) AS rent, + sum(LRI.CORPUS) AS corpus, + sum(LRI.INTEREST) AS interest, + sum(LRI.PENALTY) AS penalty, + sum(LRI.CORPUS_ADJUST) AS corpus_adjust, + sum(LRI.INTEREST_ADJUST) AS interest_adjust, + sum(LRI.PENALTY_ADJUST) AS penalty_adjust + from lc_rent_income LRI + where LRI.ROLL_BACK = '0' + AND LRI.contract_id = ln_contract_id + group by LRI.PAYMENT_NUMBER, LRI.PLAN_LIST + ) LRI ON LCP.PAYMENT_NUMBER = LRI.payment_number AND LCP.PLAN_LIST = LRI.plan_list + left join lc_rent_income_temp_transfer lcfi + on LCP.PAYMENT_NUMBER = lcfi.payment_number and LCP.PLAN_LIST = lcfi.plan_list + WHERE LCP.contract_id = ln_contract_id + AND LCP.plan_date = ln_plan_date + ) LCP2 + LEFT JOIN customer_account ca ON ca.contract_id = LCP2.contract_id + LEFT JOIN lb_contract_info lci ON LCP2.contract_id = lci.id + LEFT JOIN code_library cl ON cl.codeno = 'ManySubject' AND lci.subjectid = cl.itemno + LEFT JOIN own_account oa ON oa.own_id = cl.bankno AND oa.account_purpose = 'default' AND oa.state_ = '0010' AND + (oa.account_type = 'in_account' OR oa.account_type = 'inAndOut_account') AND oa.acc_type = '0010' + ); -USE `apzl`$$ + -- 如果in_type=3就是经销商保证金代偿，in_hire_list为核销罚息金额 + ELSEIF in_type = 3 THEN + INSERT INTO LC_RENT_INCOME (ID, + QUOT_ID, + CUST_ID, + PROJECT_ID, + PROJECT_PLAN_NUMBER, + CONTRACT_ID, + CONTRACT_PLAN_NUMBER, + PAYMENT_NUMBER, + EBANK_NUMBER, + PLAN_ID, + PLAN_LIST, + INTEREST_ADJUST, + SETTLE_METHOD, + HIRE_LIST, + HIRE_DATE, + RENT, + CORPUS, + INTEREST, + PENALTY, + CORPUS_ADJUST, + PENALTY_ADJUST, + ROLL_BACK, + COIN, + hire_number, + hire_bank, + hire_account, + own_bank, + own_account, + own_number, + charge_way) + ( + SELECT REPLACE(UUID(), '-', '') AS id, + LCP2.QUOT_ID, + LCP2.CUST_ID, + LCP2.PROJECT_ID, + LCP2.PROJECT_PLAN_NUMBER, + LCP2.CONTRACT_ID, + LCP2.CONTRACT_PLAN_NUMBER, + LCP2.PAYMENT_NUMBER, + '' AS EBANK_NUMBER, + LCP2.PLAN_ID, + LCP2.PLAN_LIST, + '0' AS INTEREST_ADJUST, + 'settlemethod6' AS SETTLE_METHOD, + in_hire_list AS HIRE_LIST, + DATE_FORMAT(CURDATE(), '%Y/%m/%d') AS HIRE_DATE, + LCP2.rent_over AS RENT, + LCP2.corpus_over AS CORPUS, + LCP2.interest_over AS INTEREST, + in_hire_list AS PENALTY, + '0' AS CORPUS_ADJUST, + penalty_over - in_hire_list AS PENALTY_ADJUST, + '0' AS ROLL_BACK, + LCP2.COIN, + ca.acc_number, + ca.bank_name, + ca.account, + oa.acc_bank, + lci.subjectname, + oa.acc_number, + 'AutoBuckle' + FROM ( + SELECT LCP.QUOT_ID, + LCP.CUST_ID, + LCP.PROJECT_ID, + LCP.PROJECT_PLAN_NUMBER, + LCP.CONTRACT_ID, + LCP.CONTRACT_PLAN_NUMBER, + LCP.PAYMENT_NUMBER, + LCP.id AS PLAN_ID, + LCP.PLAN_LIST, + LCP.COIN, + (LCP.RENT - (ifnull(LRI.rent, 0) + ifnull(lcfi.rent, 0))) AS rent_over, + (LCP.CORPUS - (((ifnull(LRI.corpus, 0) + ifnull(lcfi.corpus, 0)) + ifnull(LRI.corpus_adjust, 0)) + + ifnull(lcfi.corpus_adjust, 0))) AS corpus_over, + (LCP.INTEREST - (((ifnull(LRI.interest, 0) + ifnull(lcfi.interest, 0)) + ifnull(LRI.interest_adjust, 0)) + + ifnull(lcfi.interest_adjust, 0))) AS interest_over, + round((getRentPenalty(LCP.PAYMENT_NUMBER, LCP.PLAN_LIST, date_format(now(), '%Y/%m/%d')) - + ((ifnull(LRI.penalty, 0) + ifnull(lcfi.penalty, 0)) + + (ifnull(LRI.penalty_adjust, 0) + ifnull(lcfi.penalty_adjust, 0)))), + 2) AS penalty_over + FROM LC_RENT_PLAN LCP + LEFT JOIN ( + select LRI.PAYMENT_NUMBER AS payment_number, + LRI.PLAN_LIST AS plan_list, + sum(LRI.RENT) AS rent, + sum(LRI.CORPUS) AS corpus, + sum(LRI.INTEREST) AS interest, + sum(LRI.PENALTY) AS penalty, + sum(LRI.CORPUS_ADJUST) AS corpus_adjust, + sum(LRI.INTEREST_ADJUST) AS interest_adjust, + sum(LRI.PENALTY_ADJUST) AS penalty_adjust + from lc_rent_income LRI + where LRI.ROLL_BACK = '0' + AND LRI.contract_id = ln_contract_id + group by LRI.PAYMENT_NUMBER, LRI.PLAN_LIST + ) LRI ON LCP.PAYMENT_NUMBER = LRI.payment_number AND LCP.PLAN_LIST = LRI.plan_list + left join lc_rent_income_temp_transfer lcfi + on LCP.PAYMENT_NUMBER = lcfi.payment_number and LCP.PLAN_LIST = lcfi.plan_list + WHERE LCP.contract_id = ln_contract_id + AND LCP.plan_date = ln_plan_date + ) LCP2 + LEFT JOIN customer_account ca ON ca.contract_id = LCP2.contract_id + LEFT JOIN lb_contract_info lci ON LCP2.contract_id = lci.id + LEFT JOIN code_library cl ON cl.codeno = 'ManySubject' AND lci.subjectid = cl.itemno + LEFT JOIN own_account oa ON oa.own_id = cl.bankno AND oa.account_purpose = 'default' AND oa.state_ = '0010' AND + (oa.account_type = 'in_account' OR oa.account_type = 'inAndOut_account') AND oa.acc_type = '0010' + ); -DROP PROCEDURE IF EXISTS `proc_insert_hexiao`$$ - -CREATE DEFINER=`apzl`@`%` PROCEDURE `proc_insert_hexiao`(IN ln_contract_id VARCHAR(200), IN ln_plan_date VARCHAR(200), - IN in_rent VARCHAR(200), IN in_hire_list VARCHAR(200), - IN in_type VARCHAR(2)) -BEGIN - -- 如果in_type=1就是手工核销 - IF in_type = 1 THEN - INSERT INTO LC_RENT_INCOME ( - ID, - QUOT_ID, - CUST_ID, - PROJECT_ID, - PROJECT_PLAN_NUMBER, - CONTRACT_ID, - CONTRACT_PLAN_NUMBER, - PAYMENT_NUMBER, - EBANK_NUMBER, - PLAN_ID, - PLAN_LIST, - INTEREST_ADJUST, - SETTLE_METHOD, - HIRE_LIST, - HIRE_DATE, - RENT, - CORPUS, - INTEREST, - PENALTY, - CORPUS_ADJUST, - PENALTY_ADJUST, - ROLL_BACK, - COIN, - hire_number, - hire_bank, - hire_account, - own_bank, - own_account, - own_number, - charge_way -) - (SELECT - REPLACE (UUID(), '-', '') AS id, - O.QUOT_ID AS QUOT_ID, - O.CUST_ID AS CUST_ID, - O.PROJECT_ID AS PROJECT_ID, - O.PROJECT_PLAN_NUMBER AS PROJECT_PLAN_NUMBER, - O.CONTRACT_ID AS CONTRACT_ID, - O.CONTRACT_PLAN_NUMBER AS CONTRACT_PLAN_NUMBER, - O.PAYMENT_NUMBER AS PAYMENT_NUMBER, - '' AS EBANK_NUMBER, - O.id AS PLAN_ID, - O.PLAN_LIST AS PLAN_LIST, - '0' AS INTEREST_ADJUST, - 'settlemethod6' AS SETTLE_METHOD, - in_hire_list AS HIRE_LIST, - DATE_FORMAT (CURDATE(),'%Y/%m/%d') AS HIRE_DATE, - vl.rent_over AS RENT, - vl.corpus_over AS CORPUS, - vl.interest_over AS INTEREST, - ( - in_rent - vl.corpus_over - vl.interest_over - ) AS PENALTY, - '0' AS CORPUS_ADJUST, - '0' AS PENALTY_ADJUST, - '0' AS ROLL_BACK, - O.COIN AS COIN , - ca.acc_number, - ca.bank_name, - ca.account, - oa.acc_bank, - lci.subjectname, - oa.acc_number, - 'AutoBuckle' - FROM - LC_RENT_PLAN O, - VI_LC_RENT_PLAN vl - LEFT JOIN customer_account ca ON ca.contract_id=vl.contract_id - LEFT JOIN lb_contract_info lci ON vl.contract_id=lci.id - LEFT JOIN code_library cl ON cl.codeno='ManySubject' AND lci.subjectid=cl.itemno - LEFT JOIN own_account oa ON oa.own_id=cl.bankno AND account_purpose='default' AND state_='0010' AND (account_type='in_account' OR account_type='inAndOut_account') - WHERE O.id = vl.id - AND vl.contract_id =ln_contract_id - AND vl.plan_date = ln_plan_date - GROUP BY oa.own_id) ; - -- in_type = 2为银联卡口手动刷新核销数据 -ELSEIF in_type = 2 THEN -INSERT INTO LC_RENT_INCOME ( - ID, - QUOT_ID, - CUST_ID, - PROJECT_ID, - PROJECT_PLAN_NUMBER, - CONTRACT_ID, - CONTRACT_PLAN_NUMBER, - PAYMENT_NUMBER, - EBANK_NUMBER, - PLAN_ID, - PLAN_LIST, - INTEREST_ADJUST, - SETTLE_METHOD, - HIRE_LIST, - HIRE_DATE, - RENT, - CORPUS, - INTEREST, - PENALTY, - CORPUS_ADJUST, - PENALTY_ADJUST, - ROLL_BACK, - COIN, - hire_number, - hire_bank, - hire_account, - own_bank, - own_account, - own_number, - charge_way -) -(SELECT - REPLACE (UUID (), '-', '') AS id, - O.QUOT_ID AS QUOT_ID, - O.CUST_ID AS CUST_ID, - O.PROJECT_ID AS PROJECT_ID, - O.PROJECT_PLAN_NUMBER AS PROJECT_PLAN_NUMBER, - O.CONTRACT_ID AS CONTRACT_ID, - O.CONTRACT_PLAN_NUMBER AS CONTRACT_PLAN_NUMBER, - O.PAYMENT_NUMBER AS PAYMENT_NUMBER, - '' AS EBANK_NUMBER, - O.id AS PLAN_ID, - O.PLAN_LIST AS PLAN_LIST, - '0' AS INTEREST_ADJUST, - 'settlemethod6' AS SETTLE_METHOD, - in_hire_list AS HIRE_LIST, - DATE_FORMAT (CURDATE(),'%Y/%m/%d') AS HIRE_DATE, -CASE WHEN in_rent>=vl.corpus_over+vl.interest_over+vl.penalty_over THEN vl.rent_over - WHEN in_rent=vl.interest_over+vl.penalty_over THEN in_rent-vl.penalty_over - WHEN in_rentvl.penalty_over THEN in_rent-vl.penalty_over - ELSE '0' - END RENT, -CASE WHEN in_rent>=vl.corpus_over+vl.interest_over+vl.penalty_over THEN vl.corpus_over - WHEN in_rent=vl.interest_over+vl.penalty_over THEN in_rent-(vl.penalty_over+vl.interest_over) - WHEN in_rent=vl.penalty_over THEN '0' - ELSE '0' - END CORPUS, -CASE WHEN in_rent>=vl.corpus_over+vl.interest_over+vl.penalty_over THEN vl.interest_over - WHEN in_rent=vl.interest_over+vl.penalty_over THEN vl.interest_over - WHEN in_rent=vl.penalty_over THEN in_rent-vl.penalty_over - ELSE '0' - END INTEREST, - CASE WHEN in_rent>=vl.corpus_over+vl.interest_over+vl.penalty_over THEN vl.penalty_over - WHEN in_rent=vl.interest_over+vl.penalty_over THEN vl.penalty_over - WHEN in_rent=vl.penalty_over THEN vl.penalty_over - ELSE in_rent - END AS PENALTY, -'0' AS CORPUS_ADJUST, - '0' AS PENALTY_ADJUST, - '0' AS ROLL_BACK, - O.COIN AS COIN , - ca.acc_number, - ca.bank_name, - ca.account, - oa.acc_bank, - lci.subjectname, - oa.acc_number, - 'AutoBuckle' -FROM - LC_RENT_PLAN O, - VI_LC_RENT_PLAN vl - LEFT JOIN customer_account ca ON ca.contract_id=vl.contract_id - LEFT JOIN lb_contract_info lci ON vl.contract_id=lci.id - LEFT JOIN code_library cl ON cl.codeno='ManySubject' AND lci.subjectid=cl.itemno - LEFT JOIN own_account oa ON oa.own_id=cl.bankno AND account_purpose='default' AND state_='0010' AND (account_type='in_account' OR account_type='inAndOut_account') - WHERE O.id = vl.id - AND vl.contract_id =ln_contract_id - AND vl.plan_date = ln_plan_date - GROUP BY oa.own_id) ; - - -- 如果in_type=3就是经销商保证金代偿，in_hire_list为核销罚息金额 - ELSEIF in_type = 3 THEN - INSERT INTO LC_RENT_INCOME ( - ID, - QUOT_ID, - CUST_ID, - PROJECT_ID, - PROJECT_PLAN_NUMBER, - CONTRACT_ID, - CONTRACT_PLAN_NUMBER, - PAYMENT_NUMBER, - EBANK_NUMBER, - PLAN_ID, - PLAN_LIST, - INTEREST_ADJUST, - SETTLE_METHOD, - HIRE_LIST, - HIRE_DATE, - RENT, - CORPUS, - INTEREST, - PENALTY, - CORPUS_ADJUST, - PENALTY_ADJUST, - ROLL_BACK, - COIN, - hire_number, - hire_bank, - hire_account, - own_bank, - own_account, - own_number, - charge_way -) - (SELECT - REPLACE (UUID(), '-', '') AS id, - O.QUOT_ID AS QUOT_ID, - O.CUST_ID AS CUST_ID, - O.PROJECT_ID AS PROJECT_ID, - O.PROJECT_PLAN_NUMBER AS PROJECT_PLAN_NUMBER, - O.CONTRACT_ID AS CONTRACT_ID, - O.CONTRACT_PLAN_NUMBER AS CONTRACT_PLAN_NUMBER, - O.PAYMENT_NUMBER AS PAYMENT_NUMBER, - '' AS EBANK_NUMBER, - O.id AS PLAN_ID, - O.PLAN_LIST AS PLAN_LIST, - '0' AS INTEREST_ADJUST, - 'settlemethod6' AS SETTLE_METHOD, - '1' AS HIRE_LIST, - DATE_FORMAT (CURDATE(),'%Y/%m/%d') AS HIRE_DATE, - vl.rent_over AS RENT, - vl.corpus_over AS CORPUS, - vl.interest_over AS INTEREST, - in_hire_list AS PENALTY, - '0' AS CORPUS_ADJUST, - penalty_over-in_hire_list AS PENALTY_ADJUST, - '0' AS ROLL_BACK, - O.COIN AS COIN , - ca.acc_number, - ca.bank_name, - ca.account, - oa.acc_bank, - lci.subjectname, - oa.acc_number, - 'AutoBuckle' - FROM - LC_RENT_PLAN O, - VI_LC_RENT_PLAN vl - LEFT JOIN customer_account ca ON ca.contract_id=vl.contract_id - LEFT JOIN lb_contract_info lci ON vl.contract_id=lci.id - LEFT JOIN code_library cl ON cl.codeno='ManySubject' AND lci.subjectid=cl.itemno - LEFT JOIN own_account oa ON oa.own_id=cl.bankno AND account_purpose='default' AND state_='0010' AND (account_type='in_account' OR account_type='inAndOut_account') - WHERE O.id = vl.id - AND vl.contract_id =ln_contract_id - AND vl.plan_date = ln_plan_date - GROUP BY oa.own_id ) ; - - -- in_type = 4 为微信还款 -ELSEIF in_type = 4 THEN - INSERT INTO LC_RENT_INCOME ( - ID, - QUOT_ID, - CUST_ID, - PROJECT_ID, - PROJECT_PLAN_NUMBER, - CONTRACT_ID, - CONTRACT_PLAN_NUMBER, - PAYMENT_NUMBER, - EBANK_NUMBER, - PLAN_ID, - PLAN_LIST, - INTEREST_ADJUST, - SETTLE_METHOD, - HIRE_LIST, - HIRE_DATE, - RENT, - CORPUS, - INTEREST, - PENALTY, - CORPUS_ADJUST, - PENALTY_ADJUST, - ROLL_BACK, - COIN, - hire_number, - hire_bank, - hire_account, - own_bank, - own_account, - own_number, - charge_way -) - (SELECT - REPLACE (UUID(), '-', '') AS id, - O.QUOT_ID AS QUOT_ID, - O.CUST_ID AS CUST_ID, - O.PROJECT_ID AS PROJECT_ID, - O.PROJECT_PLAN_NUMBER AS PROJECT_PLAN_NUMBER, - O.CONTRACT_ID AS CONTRACT_ID, - O.CONTRACT_PLAN_NUMBER AS CONTRACT_PLAN_NUMBER, - O.PAYMENT_NUMBER AS PAYMENT_NUMBER, - '' AS EBANK_NUMBER, - O.id AS PLAN_ID, - O.PLAN_LIST AS PLAN_LIST, - '0' AS INTEREST_ADJUST, - 'settlemethod6' AS SETTLE_METHOD, - '1' AS HIRE_LIST, - DATE_FORMAT (CURDATE(),'%Y/%m/%d') AS HIRE_DATE, - vl.rent_over AS RENT, - vl.corpus_over AS CORPUS, - vl.interest_over AS INTEREST, - ( - in_rent - vl.corpus_over - vl.interest_over - ) AS PENALTY, - '0' AS CORPUS_ADJUST, - '0' AS PENALTY_ADJUST, - '0' AS ROLL_BACK, - O.COIN AS COIN , - '', - '', - '', - CASE ln_plan_date WHEN '微信支付' THEN '中国银行股份有限公司北京潘家园支行' ELSE '上海浦东发展银行股份有限公司深圳文锦支行' END, - CASE ln_plan_date WHEN '微信支付' THEN '北京安鹏昌达资产管理有限公司' ELSE '安鹏国际融资租赁（深圳）有限公司' END, - CASE ln_plan_date WHEN '微信支付' THEN '344167318076' ELSE '79220155300000518' END, - CASE ln_plan_date WHEN '微信支付' THEN 'WXPay' ELSE 'WXUnionPay' END - FROM - LC_RENT_PLAN O, - VI_LC_RENT_PLAN vl - LEFT JOIN customer_account ca ON ca.contract_id=vl.contract_id - WHERE O.id = vl.id - AND vl.contract_id =ln_contract_id - AND vl.plan_list = in_hire_list ) ; - ELSE - SELECT 1; -END IF; -END$$ - -DELIMITER ; \ No newline at end of file + -- in_type = 4 为微信还款 + ELSEIF in_type = 4 THEN + INSERT INTO LC_RENT_INCOME (ID, + QUOT_ID, + CUST_ID, + PROJECT_ID, + PROJECT_PLAN_NUMBER, + CONTRACT_ID, + CONTRACT_PLAN_NUMBER, + PAYMENT_NUMBER, + EBANK_NUMBER, + PLAN_ID, + PLAN_LIST, + INTEREST_ADJUST, + SETTLE_METHOD, + HIRE_LIST, + HIRE_DATE, + RENT, + CORPUS, + INTEREST, + PENALTY, + CORPUS_ADJUST, + PENALTY_ADJUST, + ROLL_BACK, + COIN, + hire_number, + hire_bank, + hire_account, + own_bank, + own_account, + own_number, + charge_way) + ( + SELECT REPLACE(UUID(), '-', '') AS id, + LCP2.QUOT_ID, + LCP2.CUST_ID, + LCP2.PROJECT_ID, + LCP2.PROJECT_PLAN_NUMBER, + LCP2.CONTRACT_ID, + LCP2.CONTRACT_PLAN_NUMBER, + LCP2.PAYMENT_NUMBER, + '' AS EBANK_NUMBER, + LCP2.PLAN_ID, + LCP2.PLAN_LIST, + '0' AS INTEREST_ADJUST, + 'settlemethod6' AS SETTLE_METHOD, + in_hire_list AS HIRE_LIST, + DATE_FORMAT(CURDATE(), '%Y/%m/%d') AS HIRE_DATE, + LCP2.rent_over AS RENT, + LCP2.corpus_over AS CORPUS, + LCP2.interest_over AS INTEREST, + ( + in_rent - LCP2.corpus_over - LCP2.interest_over + ) AS PENALTY, + '0' AS CORPUS_ADJUST, + '0' AS PENALTY_ADJUST, + '0' AS ROLL_BACK, + LCP2.COIN, + '', + '', + '', + CASE ln_plan_date WHEN 'WXPay' THEN '中国银行股份有限公司北京潘家园支行' ELSE lms.bank_name END, + CASE ln_plan_date WHEN 'WXPay' THEN '北京安鹏昌达资产管理有限公司' ELSE lms.acc_name END, + CASE ln_plan_date WHEN 'WXPay' THEN '344167318076' ELSE lms.acc_number END, + CASE ln_plan_date WHEN 'WXPay' THEN 'WXPay' ELSE 'WXUnionPay' END + FROM ( + SELECT LCP.QUOT_ID, + LCP.CUST_ID, + LCP.PROJECT_ID, + LCP.PROJECT_PLAN_NUMBER, + LCP.CONTRACT_ID, + LCP.CONTRACT_PLAN_NUMBER, + LCP.PAYMENT_NUMBER, + LCP.id AS PLAN_ID, + LCP.PLAN_LIST, + LCP.COIN, + (LCP.RENT - (ifnull(LRI.rent, 0) + ifnull(lcfi.rent, 0))) AS rent_over, + (LCP.CORPUS - (((ifnull(LRI.corpus, 0) + ifnull(lcfi.corpus, 0)) + ifnull(LRI.corpus_adjust, 0)) + + ifnull(lcfi.corpus_adjust, 0))) AS corpus_over, + (LCP.INTEREST - (((ifnull(LRI.interest, 0) + ifnull(lcfi.interest, 0)) + ifnull(LRI.interest_adjust, 0)) + + ifnull(lcfi.interest_adjust, 0))) AS interest_over, + round((getRentPenalty(LCP.PAYMENT_NUMBER, LCP.PLAN_LIST, date_format(now(), '%Y/%m/%d')) - + ((ifnull(LRI.penalty, 0) + ifnull(lcfi.penalty, 0)) + + (ifnull(LRI.penalty_adjust, 0) + ifnull(lcfi.penalty_adjust, 0)))), + 2) AS penalty_over + FROM LC_RENT_PLAN LCP + LEFT JOIN ( + select LRI.PAYMENT_NUMBER AS payment_number, + LRI.PLAN_LIST AS plan_list, + sum(LRI.RENT) AS rent, + sum(LRI.CORPUS) AS corpus, + sum(LRI.INTEREST) AS interest, + sum(LRI.PENALTY) AS penalty, + sum(LRI.CORPUS_ADJUST) AS corpus_adjust, + sum(LRI.INTEREST_ADJUST) AS interest_adjust, + sum(LRI.PENALTY_ADJUST) AS penalty_adjust + from lc_rent_income LRI + where LRI.ROLL_BACK = '0' + AND LRI.contract_id = ln_contract_id + group by LRI.PAYMENT_NUMBER, LRI.PLAN_LIST + ) LRI ON LCP.PAYMENT_NUMBER = LRI.payment_number AND LCP.PLAN_LIST = LRI.plan_list + left join lc_rent_income_temp_transfer lcfi + on LCP.PAYMENT_NUMBER = lcfi.payment_number and LCP.PLAN_LIST = lcfi.plan_list + WHERE LCP.contract_id = ln_contract_id + AND LCP.plan_date = ln_plan_date + ) LCP2 + LEFT JOIN lb_contract_info lci ON LCP2.contract_id = lci.id + LEFT JOIN LB_MANY_SUBJECT lms ON lms.subject_id = LCI.subjectid AND lms.is_enable = 'Y' + ); + -- in_type = 5为通联扣款 + ELSEIF in_type = 5 THEN + INSERT INTO LC_RENT_INCOME (ID, + QUOT_ID, + CUST_ID, + PROJECT_ID, + PROJECT_PLAN_NUMBER, + CONTRACT_ID, + CONTRACT_PLAN_NUMBER, + PAYMENT_NUMBER, + EBANK_NUMBER, + PLAN_ID, + PLAN_LIST, + INTEREST_ADJUST, + SETTLE_METHOD, + HIRE_LIST, + HIRE_DATE, + RENT, + CORPUS, + INTEREST, + PENALTY, + CORPUS_ADJUST, + PENALTY_ADJUST, + ROLL_BACK, + COIN, + hire_number, + hire_bank, + hire_account, + own_bank, + own_account, + own_number, + charge_way) + ( + SELECT REPLACE(UUID(), '-', '') AS id, + LCP2.QUOT_ID, + LCP2.CUST_ID, + LCP2.PROJECT_ID, + LCP2.PROJECT_PLAN_NUMBER, + LCP2.CONTRACT_ID, + LCP2.CONTRACT_PLAN_NUMBER, + LCP2.PAYMENT_NUMBER, + '' AS EBANK_NUMBER, + LCP2.PLAN_ID, + LCP2.PLAN_LIST, + '0' AS INTEREST_ADJUST, + 'settlemethod6' AS SETTLE_METHOD, + in_hire_list AS HIRE_LIST, + DATE_FORMAT(CURDATE(), '%Y/%m/%d') AS HIRE_DATE, + CASE + WHEN in_rent >= LCP2.corpus_over + LCP2.interest_over + LCP2.penalty_over THEN LCP2.rent_over + WHEN in_rent < LCP2.corpus_over + LCP2.interest_over + LCP2.penalty_over AND + in_rent >= LCP2.interest_over + LCP2.penalty_over + THEN in_rent - LCP2.penalty_over + WHEN in_rent < LCP2.interest_over + LCP2.penalty_over AND in_rent > LCP2.penalty_over THEN in_rent - LCP2.penalty_over + ELSE '0' + END RENT, + CASE + WHEN in_rent >= LCP2.corpus_over + LCP2.interest_over + LCP2.penalty_over THEN LCP2.corpus_over + WHEN in_rent < LCP2.corpus_over + LCP2.interest_over + LCP2.penalty_over AND + in_rent >= LCP2.interest_over + LCP2.penalty_over + THEN in_rent - (LCP2.penalty_over + LCP2.interest_over) + WHEN in_rent < LCP2.interest_over + LCP2.penalty_over AND in_rent >= LCP2.penalty_over THEN '0' + ELSE '0' + END CORPUS, + CASE + WHEN in_rent >= LCP2.corpus_over + LCP2.interest_over + LCP2.penalty_over THEN LCP2.interest_over + WHEN in_rent < LCP2.corpus_over + LCP2.interest_over + LCP2.penalty_over AND + in_rent >= LCP2.interest_over + LCP2.penalty_over + THEN LCP2.interest_over + WHEN in_rent < LCP2.interest_over + LCP2.penalty_over AND in_rent >= LCP2.penalty_over THEN in_rent - LCP2.penalty_over + ELSE '0' + END INTEREST, + CASE + WHEN in_rent >= LCP2.corpus_over + LCP2.interest_over + LCP2.penalty_over THEN LCP2.penalty_over + WHEN in_rent < LCP2.corpus_over + LCP2.interest_over + LCP2.penalty_over AND + in_rent >= LCP2.interest_over + LCP2.penalty_over + THEN LCP2.penalty_over + WHEN in_rent < LCP2.interest_over + LCP2.penalty_over AND in_rent >= LCP2.penalty_over THEN LCP2.penalty_over + ELSE in_rent + END AS PENALTY, + '0' AS CORPUS_ADJUST, + '0' AS PENALTY_ADJUST, + '0' AS ROLL_BACK, + LCP2.COIN AS COIN, + ca.acc_number, + ca.bank_name, + ca.account, + oa.acc_bank, + lci.subjectname, + oa.acc_number, + 'TLCollect' + FROM ( + SELECT LCP.QUOT_ID, + LCP.CUST_ID, + LCP.PROJECT_ID, + LCP.PROJECT_PLAN_NUMBER, + LCP.CONTRACT_ID, + LCP.CONTRACT_PLAN_NUMBER, + LCP.PAYMENT_NUMBER, + LCP.id AS PLAN_ID, + LCP.PLAN_LIST, + LCP.COIN, + (LCP.RENT - (ifnull(LRI.rent, 0) + ifnull(lcfi.rent, 0))) AS rent_over, + (LCP.CORPUS - (((ifnull(LRI.corpus, 0) + ifnull(lcfi.corpus, 0)) + ifnull(LRI.corpus_adjust, 0)) + + ifnull(lcfi.corpus_adjust, 0))) AS corpus_over, + (LCP.INTEREST - (((ifnull(LRI.interest, 0) + ifnull(lcfi.interest, 0)) + ifnull(LRI.interest_adjust, 0)) + + ifnull(lcfi.interest_adjust, 0))) AS interest_over, + round((getRentPenalty(LCP.PAYMENT_NUMBER, LCP.PLAN_LIST, date_format(now(), '%Y/%m/%d')) - + ((ifnull(LRI.penalty, 0) + ifnull(lcfi.penalty, 0)) + + (ifnull(LRI.penalty_adjust, 0) + ifnull(lcfi.penalty_adjust, 0)))), + 2) AS penalty_over + FROM LC_RENT_PLAN LCP + LEFT JOIN ( + select LRI.PAYMENT_NUMBER AS payment_number, + LRI.PLAN_LIST AS plan_list, + sum(LRI.RENT) AS rent, + sum(LRI.CORPUS) AS corpus, + sum(LRI.INTEREST) AS interest, + sum(LRI.PENALTY) AS penalty, + sum(LRI.CORPUS_ADJUST) AS corpus_adjust, + sum(LRI.INTEREST_ADJUST) AS interest_adjust, + sum(LRI.PENALTY_ADJUST) AS penalty_adjust + from lc_rent_income LRI + where LRI.ROLL_BACK = '0' + AND LRI.contract_id = ln_plan_date + group by LRI.PAYMENT_NUMBER, LRI.PLAN_LIST + ) LRI ON LCP.PAYMENT_NUMBER = LRI.payment_number AND LCP.PLAN_LIST = LRI.plan_list + left join lc_rent_income_temp_transfer lcfi + on LCP.PAYMENT_NUMBER = lcfi.payment_number and LCP.PLAN_LIST = lcfi.plan_list + WHERE LCP.contract_id = ln_contract_id + AND LCP.plan_date = ln_plan_date + ) LCP2 + LEFT JOIN customer_account ca ON ca.contract_id = LCP2.contract_id + LEFT JOIN lb_contract_info lci ON LCP2.contract_id = lci.id + LEFT JOIN code_library cl ON cl.codeno = 'ManySubject' AND lci.subjectid = cl.itemno + LEFT JOIN own_account oa ON oa.own_id = cl.bankno AND oa.account_purpose = 'default' AND oa.state_ = '0010' AND + (oa.account_type = 'in_account' OR oa.account_type = 'inAndOut_account') AND oa.acc_type = '0010' + ); + ELSE + SELECT 1; + END IF; +END; \ No newline at end of file From f7460e67a86c7a97f5f4b2b5201d9b3bd83f0bad Mon Sep 17 00:00:00 2001 From: "chaojie.li" Date: Tue, 26 Oct 2021 15:19:53 +0800 Subject: [PATCH 25/26] =?UTF-8?q?chore:=E4=BC=98=E5=8C=96=E7=A7=9F?= =?UTF-8?q?=E9=87=91=E6=A0=B8=E9=94=80=E9=80=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src_sql/procedure/proc_insert_hexiao.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src_sql/procedure/proc_insert_hexiao.sql b/src_sql/procedure/proc_insert_hexiao.sql index 63e8c376e..970f9e771 100644 --- a/src_sql/procedure/proc_insert_hexiao.sql +++ b/src_sql/procedure/proc_insert_hexiao.sql @@ -597,7 +597,7 @@ BEGIN sum(LRI.PENALTY_ADJUST) AS penalty_adjust from lc_rent_income LRI where LRI.ROLL_BACK = '0' - AND LRI.contract_id = ln_plan_date + AND LRI.contract_id = ln_contract_id group by LRI.PAYMENT_NUMBER, LRI.PLAN_LIST ) LRI ON LCP.PAYMENT_NUMBER = LRI.payment_number AND LCP.PLAN_LIST = LRI.plan_list left join lc_rent_income_temp_transfer lcfi From 0c0e5118181a5fabbcbcb82292bfb2dcd1872a7f Mon Sep 17 00:00:00 2001 From: maliang Date: Thu, 28 Oct 2021 15:04:44 +0800 Subject: [PATCH 26/26] =?UTF-8?q?fix:2021=E5=90=88=E5=90=8C=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E8=B0=83=E6=95=B4=E4=B8=8A=E7=BA=BFsql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src_sql/鎶曚骇SQL/dailyfix/maliang20211028.sql | 201 +++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 src_sql/鎶曚骇SQL/dailyfix/maliang20211028.sql diff --git a/src_sql/鎶曚骇SQL/dailyfix/maliang20211028.sql b/src_sql/鎶曚骇SQL/dailyfix/maliang20211028.sql new file mode 100644 index 000000000..0ddf82f81 --- /dev/null +++ b/src_sql/鎶曚骇SQL/dailyfix/maliang20211028.sql @@ -0,0 +1,201 @@ + +--新增对应模板配置信息（合同模板） + +SELECT + * +FROM + BF_TEMPLATE +WHERE + id IN ( + 'f57aa80567853aa37fd6dd902021a', + 'f57aa80567853aa37fd6dd902021b', + 'f57aa80567853aa37fd6dd902021c', + 'f57aa80567853aa37fd6dd902021d'); + +--新增对应的签章配置信息 + +select * from lb_contract_sign_stamper where temp_id IN ( + 'f57aa80567853aa37fd6dd902021a', + 'f57aa80567853aa37fd6dd902021b', + 'f57aa80567853aa37fd6dd902021c', + 'f57aa80567853aa37fd6dd902021d'); +--新增该模板对应的word导出标签配置信息 + select * from bf_templatelable where TEMPLATEID IN ( + 'f57aa80567853aa37fd6dd902021a', + 'f57aa80567853aa37fd6dd902021b', + 'f57aa80567853aa37fd6dd902021c', + 'f57aa80567853aa37fd6dd902021d'); +--新增产品配置对应的下拉框选项 +select * from code_library where codeno = 'operationType' ORDER BY SORTNO; + + +---电子签约确认函 +SELECT * FROM `apzl`.`awe_do_catalog` WHERE dono='ElectronicSigningConfirmation'; +SELECT * FROM `apzl`.`awe_do_library` WHERE dono='ElectronicSigningConfirmation'; + +select * from BF_LABLECONFIG where TAGNAME like '%confirmation%' + +select * from BF_TEMPLATE where id='69f0423f984a46128292fbd8768fcd2f' + +INSERT INTO `apzl`.`code_library`(`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('operationType', 'CYCSQ', '乘用车手签', '', '0005', '1', '', '', '', '', '', '', '', '', '', '', '', 'SYS_Designer', NULL, '2019/04/08 14:49:25', 'SYS_Designer', '2019/04/08 14:50:15', '', ''); +INSERT INTO `apzl`.`code_library`(`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('operationType', 'CYCDZQ', '乘用车电子签约', '', '0006', '1', '', '', '', '', '', '', '', '', '', '', '', 'SYS_Designer', NULL, '2019/04/08 14:49:25', 'SYS_Designer', '2019/04/08 14:50:15', '', ''); +INSERT INTO `apzl`.`code_library`(`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('operationType', 'SYCSQ', '商用车手签', '', '0007', '1', '', '', '', '', '', '', '', '', '', '', '', 'SYS_Designer', NULL, '2019/04/08 14:49:25', 'SYS_Designer', '2019/04/08 14:50:15', '', ''); +INSERT INTO `apzl`.`code_library`(`codeno`, `itemno`, `itemname`, `bankno`, `sortno`, `isinuse`, `itemdescribe`, `itemattribute`, `relativecode`, `attribute1`, `attribute2`, `attribute3`, `attribute4`, `attribute5`, `attribute6`, `attribute7`, `attribute8`, `inputuser`, `inputorg`, `inputtime`, `updateuser`, `updatetime`, `remark`, `helptext`) VALUES ('operationType', 'SYCDZQ', '商用车电子签约', '', '0008', '1', '', '', '', '', '', '', '', '', '', '', '', 'SYS_Designer', NULL, '2019/04/08 14:49:25', 'SYS_Designer', '2019/04/08 14:50:15', '', ''); + +INSERT INTO `apzl`.`bf_template`(`ID`, `SERIALNO`, `SORTNUMBER`, `TEMPLATENAME`, `TEMPLATESHOWNAME`, `TEMPLATEPATH`, `TEMPLATETYPE`, `OPERATETYPE`, `CALLBACK`, `CREATEMETHOD`, `DOCTYPE`, `ONECLASSIFY`, `TWOCLASSIFY`, `THREECLASSIFY`, `FOURCLASSIFY`, `TEMPLATEVERSION`, `STATUS`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`, `CREATECONDITION`, `CREATESHEETCONDITION`) VALUES ('f57aa80567853aa37fd6dd902021a', NULL, '', '乘用车手签', '乘用车手签{contractNo}.docx', '乘用车手签模板.docx', 'word', 'create', '', NULL, '030', '030002', '', '', '', '1', '', '天津', 'administrator', '8009001', '2019/12/02 19:48:10', 'administrator', '8009001', '2021/10/28 12:00:18', '', ''); +INSERT INTO `apzl`.`bf_template`(`ID`, `SERIALNO`, `SORTNUMBER`, `TEMPLATENAME`, `TEMPLATESHOWNAME`, `TEMPLATEPATH`, `TEMPLATETYPE`, `OPERATETYPE`, `CALLBACK`, `CREATEMETHOD`, `DOCTYPE`, `ONECLASSIFY`, `TWOCLASSIFY`, `THREECLASSIFY`, `FOURCLASSIFY`, `TEMPLATEVERSION`, `STATUS`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`, `CREATECONDITION`, `CREATESHEETCONDITION`) VALUES ('f57aa80567853aa37fd6dd902021b', NULL, '', '乘用车电子签约', '乘用车电子签约{contractNo}.docx', '乘用车电子签约.docx', 'word', 'create', '', NULL, '030', '030002', '', '', '', '1', '', '天津', 'administrator', '8009001', '2019/12/02 19:48:10', 'administrator', '8009001', '2021/10/28 10:23:25', '', ''); +INSERT INTO `apzl`.`bf_template`(`ID`, `SERIALNO`, `SORTNUMBER`, `TEMPLATENAME`, `TEMPLATESHOWNAME`, `TEMPLATEPATH`, `TEMPLATETYPE`, `OPERATETYPE`, `CALLBACK`, `CREATEMETHOD`, `DOCTYPE`, `ONECLASSIFY`, `TWOCLASSIFY`, `THREECLASSIFY`, `FOURCLASSIFY`, `TEMPLATEVERSION`, `STATUS`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`, `CREATECONDITION`, `CREATESHEETCONDITION`) VALUES ('f57aa80567853aa37fd6dd902021c', NULL, '', '商用车手签', '商用车手签{contractNo}.docx', '商用车手签.docx', 'word', 'create', '', NULL, '030', '030002', '', '', '', '1', '', '天津', 'administrator', '8009001', '2019/12/02 19:48:10', 'administrator', '8009001', '2021/10/28 09:50:17', '', ''); +INSERT INTO `apzl`.`bf_template`(`ID`, `SERIALNO`, `SORTNUMBER`, `TEMPLATENAME`, `TEMPLATESHOWNAME`, `TEMPLATEPATH`, `TEMPLATETYPE`, `OPERATETYPE`, `CALLBACK`, `CREATEMETHOD`, `DOCTYPE`, `ONECLASSIFY`, `TWOCLASSIFY`, `THREECLASSIFY`, `FOURCLASSIFY`, `TEMPLATEVERSION`, `STATUS`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`, `CREATECONDITION`, `CREATESHEETCONDITION`) VALUES ('f57aa80567853aa37fd6dd902021d', NULL, '', '商用车电子签约', '商用车电子签约{contractNo}.docx', '商用车电子签.docx', 'word', 'create', '', NULL, '030', '030002', '', '', '', '1', '', '天津', 'administrator', '8009001', '2019/12/02 19:48:10', 'administrator', '8009001', '2021/10/28 09:57:16', '', ''); + +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqerqwr01', 'f57aa80567853aa37fd6dd902021a', '乘用车手签', 'COMPANY', 'PARENT_COMPANY', '甲方（出租人）：（公章）', '-0.1', '-0.09', '1', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqerqwr02', 'f57aa80567853aa37fd6dd902021a', '乘用车手签', 'COMPANY', 'PARENT_COMPANY', '甲方：安鹏融资租赁（天津）有限公司', '-0.2', '-0.08', '1', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqerqwr03', 'f57aa80567853aa37fd6dd902021a', '乘用车手签', 'COMPANY', 'PARENT_COMPANY', '出租人（公章）', '-0.1', '-0.08', '1', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqerqwr04', 'f57aa80567853aa37fd6dd902021a', '乘用车手签', 'COMPANY', 'PARENT_COMPANY', '甲方:', '-0.01', '-0.08', '1', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqsdfd01', 'f57aa80567853aa37fd6dd902021b', '乘用车电子签约', 'COMPANY', 'PARENT_COMPANY', '甲方（出租人）：（公章）', '-0.12', '-0.1', '1', 'COMPANY', 'PARENT_COMPANY', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqsdfd02', 'f57aa80567853aa37fd6dd902021b', '乘用车电子签约', 'COMPANY', 'PARENT_COMPANY', '甲方：安鹏融资租赁（天津）有限公司', '-0.25', '-0.05', '1', 'COMPANY', 'PARENT_COMPANY', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqsdfd05', 'f57aa80567853aa37fd6dd902021b', '乘用车电子签约', 'TIMESTAMP', 'PARENT_COMPANY', '签署日期：', '-0.01', '-0.012', '1', 'TIMESTAMP', 'PARENT_COMPANY', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqsdfd06', 'f57aa80567853aa37fd6dd902021b', '乘用车电子签约', 'COMPANY', 'PARENT_COMPANY', '甲方:', '-0.01', '-0.08', '1', 'COMPANY', 'PARENT_COMPANY', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqsdfd07', 'f57aa80567853aa37fd6dd902021b', '乘用车电子签约', 'COMPANY', 'PARENT_COMPANY', '出租人（公章）', '-0.13', '-0.04', '1', 'COMPANY', 'PARENT_COMPANY', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqsdfd08', 'f57aa80567853aa37fd6dd902021b', '乘用车电子签约', 'PERSONAL', 'PERSONAL_CZ', '乙方（承租人）：', '-0.05', '-0.01', '1', 'PERSONAL', 'PERSONAL_CZ', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqsdfd09', 'f57aa80567853aa37fd6dd902021b', '乘用车电子签约', 'PERSONAL', 'PERSONAL_CZ', '乙方：', '-0.05', '0.0', '1', 'PERSONAL', 'PERSONAL_CZ', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqsdfd10', 'f57aa80567853aa37fd6dd902021b', '乘用车电子签约', 'PERSONAL', 'PERSONAL_CZ', '（本人签字并按手印/公司公章）', '-0.43', '0.0', '1', 'PERSONAL', 'PERSONAL_CZ', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqsdfd12', 'f57aa80567853aa37fd6dd902021b', '乘用车电子签约', 'PERSONAL', 'PERSONAL_CZ', '承租人：', '-0.001', '-0.01', '1', 'PERSONAL', 'PERSONAL_CZ', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqsdfd13', 'f57aa80567853aa37fd6dd902021b', '乘用车电子签约', 'PERSONAL', 'PERSONAL_CZ', '承租人（自然人签字并按印）/（法人签字并盖章）：', '-0.01', '-0.006', '1', 'PERSONAL', 'PERSONAL_CZ', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqsdfd14', 'f57aa80567853aa37fd6dd902021b', '乘用车电子签约', 'TIMESTAMP', 'PARENT_COMPANY', '甲乙双方经协商一致，于', '0.02', '-0.0025', '1', 'TIMESTAMP', 'PERSONAL_CZ', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqsdfd15', 'f57aa80567853aa37fd6dd902021b', '乘用车电子签约', 'TIMESTAMP', 'PARENT_COMPANY', '租赁物已于', '0.025', '-0.0025', '1', 'TIMESTAMP', 'PERSONAL_CZ', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqsdfd16', 'f57aa80567853aa37fd6dd902021b', '乘用车电子签约', 'TIMESTAMP', 'PARENT_COMPANY', '乙方：', '-0.03', '-0.03', '1', 'TIMESTAMP', 'PERSONAL_CZ', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqsdfd17', 'f57aa80567853aa37fd6dd902021b', '乘用车电子签约', 'TIMESTAMP', 'PARENT_COMPANY', '承租人（自然人签字并按印）/（法人签字并盖章）：', '0.18', '-0.0006', '1', 'TIMESTAMP', 'PERSONAL_CZ', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqsdfd18', 'f57aa80567853aa37fd6dd902021b', '乘用车电子签约', 'TIMESTAMP', 'PARENT_COMPANY', '（本人签字并按手印/公司公章）', '-0.35', '-0.03', '1', 'TIMESTAMP', 'PERSONAL_CZ', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqsdfd20', 'f57aa80567853aa37fd6dd902021b', '乘用车电子签约', 'PERSONAL', 'PERSONAL_GT', '（共同承租人）', '-0.05', '-0.01', '1', 'PERSONAL', 'PERSONAL_GT', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqsdfd21', 'f57aa80567853aa37fd6dd902021b', '乘用车电子签约', 'PERSONAL', 'PERSONAL_GT', '(共同承租人)(若有)', '-0.35', '0.0', '1', 'PERSONAL', 'PERSONAL_GT', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqsdfd22', 'f57aa80567853aa37fd6dd902021b', '乘用车电子签约', 'PERSONAL', 'PERSONAL_GT', '（共同承租人）（若有）：', '-0.01', '-0.03', '1', 'PERSONAL', 'PERSONAL_GT', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqsdfd23', 'f57aa80567853aa37fd6dd902021b', '乘用车电子签约', 'TIMESTAMP', 'PARENT_COMPANY', '(共同承租人)(若有)', '-0.25', '-0.03', '1', 'TIMESTAMP', 'PERSONAL_GT', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqsdfd24', 'f57aa80567853aa37fd6dd902021b', '乘用车电子签约', 'TIMESTAMP', 'PARENT_COMPANY', '（共同承租人）（若有）：', '0.18', '-0.0006', '1', 'TIMESTAMP', 'PERSONAL_GT', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqsdfd25', 'f57aa80567853aa37fd6dd902021b', '乘用车电子签约', 'PERSONAL', 'PERSONAL_DBONE', '丙方 1（保证人）：', '-0.05', '-0.01', '1', 'PERSONAL', 'PERSONAL_DBONE', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqsdfd26', 'f57aa80567853aa37fd6dd902021b', '乘用车电子签约', 'PERSONAL', 'PERSONAL_DBTWO', '丙方 2（保证人）：', '-0.05', '-0.01', '1', 'PERSONAL', 'PERSONAL_DBTWO', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqsdfd27', 'f57aa80567853aa37fd6dd902021b', '乘用车电子签约', 'PERSONAL', 'PERSONAL_CZ', '（本人签字/公司公章）', '-0.4', '0.0', '1', 'PERSONAL', 'PERSONAL_CZ', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqsdfd28', 'f57aa80567853aa37fd6dd902021b', '乘用车电子签约', 'TIMESTAMP', 'PARENT_COMPANY', '（本人签字/公司公章）', '-0.35', '-0.03', '1', 'TIMESTAMP', 'PERSONAL_CZ', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqsdfd29', 'f57aa80567853aa37fd6dd902021b', '乘用车电子签约', 'PERSONAL', 'PERSONAL_GT', '（共 同承租人）（若有）', '-0.43', '0.0', '1', 'PERSONAL', 'PERSONAL_GT', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('cycsqsdfd30', 'f57aa80567853aa37fd6dd902021b', '乘用车电子签约', 'TIMESTAMP', 'PARENT_COMPANY', '（共 同承租人）（若有）', '-0.35', '-0.03', '1', 'TIMESTAMP', 'PERSONAL_GT', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycdzqsdfd01', 'f57aa80567853aa37fd6dd902021d', '商用车电子签约', 'COMPANY', 'PARENT_COMPANY', '甲方（出租人）：（公章）', '-0.12', '-0.1', '1', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycdzqsdfd02', 'f57aa80567853aa37fd6dd902021d', '商用车电子签约', 'COMPANY', 'PARENT_COMPANY', '甲方：安鹏融资租赁（天津）有限公司', '-0.25', '-0.05', '1', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycdzqsdfd05', 'f57aa80567853aa37fd6dd902021d', '商用车电子签约', 'TIMESTAMP', 'PARENT_COMPANY', '签署日期：', '-0.01', '-0.012', '1', 'PARENT_COMPANY', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycdzqsdfd06', 'f57aa80567853aa37fd6dd902021d', '商用车电子签约', 'COMPANY', 'PARENT_COMPANY', '甲方:', '-0.01', '-0.08', '1', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycdzqsdfd07', 'f57aa80567853aa37fd6dd902021d', '商用车电子签约', 'COMPANY', 'PARENT_COMPANY', '出租人（公章）', '-0.13', '-0.04', '1', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycdzqsdfd08', 'f57aa80567853aa37fd6dd902021d', '商用车电子签约', 'PERSONAL', 'PERSONAL_CZ', '乙方（承租人）：', '-0.05', '-0.01', '1', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycdzqsdfd09', 'f57aa80567853aa37fd6dd902021d', '商用车电子签约', 'PERSONAL', 'PERSONAL_CZ', '乙方：', '-0.05', '0.0', '1', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycdzqsdfd10', 'f57aa80567853aa37fd6dd902021d', '商用车电子签约', 'PERSONAL', 'PERSONAL_CZ', '（本人签字并按手印/公司公章）', '-0.43', '0.0', '1', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycdzqsdfd12', 'f57aa80567853aa37fd6dd902021d', '商用车电子签约', 'PERSONAL', 'PERSONAL_CZ', '承租人：', '-0.001', '-0.01', '1', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycdzqsdfd13', 'f57aa80567853aa37fd6dd902021d', '商用车电子签约', 'PERSONAL', 'PERSONAL_CZ', '承租人（自然人签字并按印）/（法人签字并盖章）：', '-0.01', '-0.006', '1', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycdzqsdfd14', 'f57aa80567853aa37fd6dd902021d', '商用车电子签约', 'TIMESTAMP', 'PARENT_COMPANY', '甲乙双方经协商一致，于', '0.02', '-0.0025', '1', 'PERSONAL_CZ', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycdzqsdfd15', 'f57aa80567853aa37fd6dd902021d', '商用车电子签约', 'TIMESTAMP', 'PARENT_COMPANY', '租赁物已于', '0.025', '-0.0025', '1', 'PERSONAL_CZ', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycdzqsdfd16', 'f57aa80567853aa37fd6dd902021d', '商用车电子签约', 'TIMESTAMP', 'PARENT_COMPANY', '乙方：', '-0.03', '-0.03', '1', 'PERSONAL_CZ', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycdzqsdfd17', 'f57aa80567853aa37fd6dd902021d', '商用车电子签约', 'TIMESTAMP', 'PARENT_COMPANY', '承租人（自然人签字并按印）/（法人签字并盖章）：', '0.18', '-0.0006', '1', 'PERSONAL_CZ', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycdzqsdfd18', 'f57aa80567853aa37fd6dd902021d', '商用车电子签约', 'TIMESTAMP', 'PARENT_COMPANY', '（本人签字并按手印/公司公章）', '-0.35', '-0.03', '1', 'PERSONAL_CZ', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycdzqsdfd20', 'f57aa80567853aa37fd6dd902021d', '商用车电子签约', 'PERSONAL', 'PERSONAL_GT', '（共同承租人）', '-0.05', '-0.01', '1', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycdzqsdfd21', 'f57aa80567853aa37fd6dd902021d', '商用车电子签约', 'PERSONAL', 'PERSONAL_GT', '(共同承租人)(若有)', '-0.35', '0.0', '1', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycdzqsdfd22', 'f57aa80567853aa37fd6dd902021d', '商用车电子签约', 'PERSONAL', 'PERSONAL_GT', '（共同承租人）（若有）：', '-0.01', '-0.03', '1', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycdzqsdfd23', 'f57aa80567853aa37fd6dd902021d', '商用车电子签约', 'TIMESTAMP', 'PARENT_COMPANY', '(共同承租人)(若有)', '-0.25', '-0.03', '1', 'PERSONAL_GT', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycdzqsdfd24', 'f57aa80567853aa37fd6dd902021d', '商用车电子签约', 'TIMESTAMP', 'PARENT_COMPANY', '（共同承租人）（若有）：', '0.18', '-0.0006', '1', 'PERSONAL_GT', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycdzqsdfd25', 'f57aa80567853aa37fd6dd902021d', '商用车电子签约', 'PERSONAL', 'PERSONAL_DBONE', '丙方 1（保证人）：', '-0.05', '-0.01', '1', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycdzqsdfd26', 'f57aa80567853aa37fd6dd902021d', '商用车电子签约', 'PERSONAL', 'PERSONAL_DBTWO', '丙方 2（保证人）：', '-0.05', '-0.01', '1', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycdzqsdfd27', 'f57aa80567853aa37fd6dd902021d', '商用车电子签约', 'PERSONAL', 'PERSONAL_CZ', '（本人签字/公司公章）', '-0.4', '0.0', '1', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycdzqsdfd28', 'f57aa80567853aa37fd6dd902021d', '商用车电子签约', 'TIMESTAMP', 'PARENT_COMPANY', '（本人签字/公司公章）', '-0.35', '-0.03', '1', 'PERSONAL_CZ', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycdzqsdfd29', 'f57aa80567853aa37fd6dd902021d', '商用车电子签约', 'PERSONAL', 'PERSONAL_GT', '（共 同承租人）（若有）', '-0.43', '0.0', '1', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycdzqsdfd30', 'f57aa80567853aa37fd6dd902021d', '商用车电子签约', 'TIMESTAMP', 'PARENT_COMPANY', '（共 同承租人）（若有）', '-0.35', '-0.03', '1', 'PERSONAL_GT', NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycsqerqwr01', 'f57aa80567853aa37fd6dd902021c', '商用车手签', 'COMPANY', 'PARENT_COMPANY', '甲方（出租人）：（公章）', '-0.1', '-0.09', '1', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycsqerqwr02', 'f57aa80567853aa37fd6dd902021c', '商用车手签', 'COMPANY', 'PARENT_COMPANY', '甲方：安鹏融资租赁（天津）有限公司', '-0.2', '-0.08', '1', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycsqerqwr03', 'f57aa80567853aa37fd6dd902021c', '商用车手签', 'COMPANY', 'PARENT_COMPANY', '出租人（公章）', '-0.1', '-0.08', '1', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`lb_contract_sign_stamper`(`id`, `temp_id`, `temp_name`, `stamper_type`, `stamper_sub_type`, `keyword`, `offsetX`, `offsetY`, `keywordIndex`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`) VALUES ('sycsqerqwr04', 'f57aa80567853aa37fd6dd902021c', '商用车手签', 'COMPANY', 'PARENT_COMPANY', '甲方:', '0.01', '-0.08', '1', NULL, NULL, NULL, NULL, NULL, NULL); + +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('0e757fb2205a4574910feac228f2de30', '9ba1a7844e4447fe9cb115323a37736f', 'f57aa80567853aa37fd6dd902021a', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('1d5999a472aa4185b031aeac6ca1a3de', '05bfac208cb145e1966d77a1243d726b', 'f57aa80567853aa37fd6dd902021a', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('2683403c16a44fd5b863eda5ddb90dad', '90588f4c92f44532825543028ccf7b0f', 'f57aa80567853aa37fd6dd902021a', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('2fd59ae6c50642adb0556c39af77f73e', '42223908127047f8ab57142dbb8d97a0', 'f57aa80567853aa37fd6dd902021a', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('343914693af943c782875b270ffb1205', 'd203ba8c8eca482f8fd9fc04368678af', 'f57aa80567853aa37fd6dd902021a', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('754d7acd2de84d22867edabdccfacb33', '85b0e57f11194a33a8bd5611aec4267f', 'f57aa80567853aa37fd6dd902021a', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('89dc780c93bb47cea24c1d489ed38e58', '975294b526544d83b806e3fc2f99cd16', 'f57aa80567853aa37fd6dd902021a', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('ab1d3c13b7864905b174852481ae68dc', '9fd06315c45842699cabed15ed2ed7f9', 'f57aa80567853aa37fd6dd902021a', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('ac3edcd366bd492a87d9c4358e353a18', 'e234e46e755f4c629445c8ca2882d6d6', 'f57aa80567853aa37fd6dd902021a', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('ae9c5b754d364f20baca10a1dc1b4f42', '755698c1c27a43efa6c23310757c6163', 'f57aa80567853aa37fd6dd902021a', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('b090e2eaf94b47e69ccde5c592790a3b', 'bbe36e81f17542078489f223239e658a', 'f57aa80567853aa37fd6dd902021a', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('bd27f9bb09ad4192979f9885b61af21e', 'ced1455267d64183ba1b270a9eda6089', 'f57aa80567853aa37fd6dd902021a', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('c62268cd8da74b7c8e93cd79863e648e', '87e832695708478ead2acd3bcdb7a9a9', 'f57aa80567853aa37fd6dd902021a', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('cycdzqwwsdjklsd01', '05bfac208cb145e1966d77a1243d726b', 'f57aa80567853aa37fd6dd902021b', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('cycdzqwwsdjklsd02', '9fd06315c45842699cabed15ed2ed7f9', 'f57aa80567853aa37fd6dd902021b', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('cycdzqwwsdjklsd03', 'd203ba8c8eca482f8fd9fc04368678af', 'f57aa80567853aa37fd6dd902021b', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('cycdzqwwsdjklsd04', 'e234e46e755f4c629445c8ca2882d6d6', 'f57aa80567853aa37fd6dd902021b', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('cycdzqwwsdjklsd05', '484815c4a7a14cf6bdbf69939e5b060e', 'f57aa80567853aa37fd6dd902021b', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('cycdzqwwsdjklsd06', '2554c750b4dd49398dfa0324f9e8403d', 'f57aa80567853aa37fd6dd902021b', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('cycdzqwwsdjklsd07', '67d304d3354211eba8ef00163e0e11e6', 'f57aa80567853aa37fd6dd902021b', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('cycdzqwwsdjklsd08', '42223908127047f8ab57142dbb8d97a0', 'f57aa80567853aa37fd6dd902021b', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('cycdzqwwsdjklsd09', 'bbe36e81f17542078489f223239e658a', 'f57aa80567853aa37fd6dd902021b', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('cycdzqwwsdjklsd10', '87e832695708478ead2acd3bcdb7a9a9', 'f57aa80567853aa37fd6dd902021b', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('cycdzqwwsdjklsd11', 'ced1455267d64183ba1b270a9eda6089', 'f57aa80567853aa37fd6dd902021b', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('cycdzqwwsdjklsd12', '975294b526544d83b806e3fc2f99cd16', 'f57aa80567853aa37fd6dd902021b', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('cycdzqwwsdjklsd13', '90588f4c92f44532825543028ccf7b0f', 'f57aa80567853aa37fd6dd902021b', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('cycdzqwwsdjklsd14', '85b0e57f11194a33a8bd5611aec4267f', 'f57aa80567853aa37fd6dd902021b', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('cycdzqwwsdjklsd15', '755698c1c27a43efa6c23310757c6163', 'f57aa80567853aa37fd6dd902021b', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('cycdzqwwsdjklsd16', '9ba1a7844e4447fe9cb115323a37736f', 'f57aa80567853aa37fd6dd902021b', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('e87b79e9d3ca46b9a9103bdf89f6f260', '67d304d3354211eba8ef00163e0e11e6', 'f57aa80567853aa37fd6dd902021a', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('f16880e134ee4848a7612ba84f5ba477', '2554c750b4dd49398dfa0324f9e8403d', 'f57aa80567853aa37fd6dd902021a', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('f3d5de7605e4422c9da5499d100326d4', '484815c4a7a14cf6bdbf69939e5b060e', 'f57aa80567853aa37fd6dd902021a', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqfnmkykiiik01', '67d304d3354211eba8ef00163e0e11e6', 'f57aa80567853aa37fd6dd902021d', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqfnmkykiiik02', '85b0e57f11194a33a8bd5611aec4267f', 'f57aa80567853aa37fd6dd902021d', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqfnmkykiiik03', 'd203ba8c8eca482f8fd9fc04368678af', 'f57aa80567853aa37fd6dd902021d', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqfnmkykiiik04', '42223908127047f8ab57142dbb8d97a0', 'f57aa80567853aa37fd6dd902021d', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqfnmkykiiik05', '9ba1a7844e4447fe9cb115323a37736f', 'f57aa80567853aa37fd6dd902021d', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqfnmkykiiik06', '8aea3b116bfd49ce8bc154c1d944c9df', 'f57aa80567853aa37fd6dd902021d', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqfnmkykiiik07', 'bbe36e81f17542078489f223239e658a', 'f57aa80567853aa37fd6dd902021d', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqfnmkykiiik08', 'f981104c63354958b45812e7fa0d9aeb', 'f57aa80567853aa37fd6dd902021d', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqfnmkykiiik09', '9fd06315c45842699cabed15ed2ed7f9', 'f57aa80567853aa37fd6dd902021d', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqfnmkykiiik10', '51c22ce70e134fbe999ac75b97d02d7d', 'f57aa80567853aa37fd6dd902021d', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqfnmkykiiik11', '2554c750b4dd49398dfa0324f9e8403d', 'f57aa80567853aa37fd6dd902021d', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqfnmkykiiik12', '484815c4a7a14cf6bdbf69939e5b060e', 'f57aa80567853aa37fd6dd902021d', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqfnmkykiiik13', '870f11068af6485d8ae0b2a859da3811', 'f57aa80567853aa37fd6dd902021d', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqfnmkykiiik14', '3eca9a300ba543eea8b6092a59d32e76', 'f57aa80567853aa37fd6dd902021d', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqfnmkykiiik15', '755698c1c27a43efa6c23310757c6163', 'f57aa80567853aa37fd6dd902021d', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqfnmkykiiik16', 'e234e46e755f4c629445c8ca2882d6d6', 'f57aa80567853aa37fd6dd902021d', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqfnmkykiiik17', '05bfac208cb145e1966d77a1243d726b', 'f57aa80567853aa37fd6dd902021d', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqfnmkykiiik18', 'bd438a80a3704ff4a213a35ebca9d56c', 'f57aa80567853aa37fd6dd902021d', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqfnmkykiiik19', '975294b526544d83b806e3fc2f99cd16', 'f57aa80567853aa37fd6dd902021d', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqfnmkykiiik20', 'ced1455267d64183ba1b270a9eda6089', 'f57aa80567853aa37fd6dd902021d', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqfnmkykiiik21', '87e832695708478ead2acd3bcdb7a9a9', 'f57aa80567853aa37fd6dd902021d', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqwwsdwwjklsd01', '67d304d3354211eba8ef00163e0e11e6', 'f57aa80567853aa37fd6dd902021c', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqwwsdwwjklsd02', '85b0e57f11194a33a8bd5611aec4267f', 'f57aa80567853aa37fd6dd902021c', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqwwsdwwjklsd03', 'd203ba8c8eca482f8fd9fc04368678af', 'f57aa80567853aa37fd6dd902021c', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqwwsdwwjklsd04', '42223908127047f8ab57142dbb8d97a0', 'f57aa80567853aa37fd6dd902021c', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqwwsdwwjklsd05', '9ba1a7844e4447fe9cb115323a37736f', 'f57aa80567853aa37fd6dd902021c', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqwwsdwwjklsd06', '8aea3b116bfd49ce8bc154c1d944c9df', 'f57aa80567853aa37fd6dd902021c', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqwwsdwwjklsd07', 'bbe36e81f17542078489f223239e658a', 'f57aa80567853aa37fd6dd902021c', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqwwsdwwjklsd08', 'f981104c63354958b45812e7fa0d9aeb', 'f57aa80567853aa37fd6dd902021c', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqwwsdwwjklsd09', '9fd06315c45842699cabed15ed2ed7f9', 'f57aa80567853aa37fd6dd902021c', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqwwsdwwjklsd10', '51c22ce70e134fbe999ac75b97d02d7d', 'f57aa80567853aa37fd6dd902021c', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqwwsdwwjklsd11', '2554c750b4dd49398dfa0324f9e8403d', 'f57aa80567853aa37fd6dd902021c', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqwwsdwwjklsd12', '484815c4a7a14cf6bdbf69939e5b060e', 'f57aa80567853aa37fd6dd902021c', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqwwsdwwjklsd13', '870f11068af6485d8ae0b2a859da3811', 'f57aa80567853aa37fd6dd902021c', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqwwsdwwjklsd14', '3eca9a300ba543eea8b6092a59d32e76', 'f57aa80567853aa37fd6dd902021c', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqwwsdwwjklsd15', '755698c1c27a43efa6c23310757c6163', 'f57aa80567853aa37fd6dd902021c', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqwwsdwwjklsd16', 'e234e46e755f4c629445c8ca2882d6d6', 'f57aa80567853aa37fd6dd902021c', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqwwsdwwjklsd17', '05bfac208cb145e1966d77a1243d726b', 'f57aa80567853aa37fd6dd902021c', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqwwsdwwjklsd18', 'bd438a80a3704ff4a213a35ebca9d56c', 'f57aa80567853aa37fd6dd902021c', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqwwsdwwjklsd19', '975294b526544d83b806e3fc2f99cd16', 'f57aa80567853aa37fd6dd902021c', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqwwsdwwjklsd20', 'ced1455267d64183ba1b270a9eda6089', 'f57aa80567853aa37fd6dd902021c', NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('sycdzqwwsdwwjklsd21', '87e832695708478ead2acd3bcdb7a9a9', 'f57aa80567853aa37fd6dd902021c', NULL, NULL, NULL, NULL, NULL, NULL); + + + +INSERT INTO `apzl`.`awe_do_catalog`(`dono`, `doname`, `dodescribe`, `dotype`, `doclass`, `isinuse`, `colcount`, `modeid`, `jboclass`, `jbofrom`, `jbowhere`, `jbogroup`, `jboorder`, `businessprocess`, `exportflag`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `remark`, `isvalidate`, `parent`) VALUES ('ElectronicSigningConfirmation', '电子签约确认函', NULL, '30', NULL, '1', '1', 'default', 'jbo.com.tenwa.lease.comm.LB_PROJECT_INFO', 'O LEFT JOIN jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO_TEMP lci ON O.id = lci.project_id LEFT JOIN jbo.com.tenwa.lease.comm.LB_UNION_LESSEE lult ON O.id = lult.project_id AND (lult.contract_id = \'\' OR lult.contract_id IS NULL ) LEFT JOIN jbo.app.tenwa.customer.CUSTOMER_INFO ci ON lult.customer_id = ci.customerid LEFT JOIN jbo.app.tenwa.customer.DISTRIBUTOR_INFO di ON lci.distributor_id = di.distributor_no', 'lult.is_main = \'y\' AND O.project_status = \'13\' AND ((lci.contract_status = \'21\') OR (lult.CONTRACT_ID=\'\' OR lult.CONTRACT_ID IS NULL)) AND O.businesstype = \'1\'', NULL, '', NULL, NULL, 'SYS_Designer', '2018/12/12 10:42:17', 'SYS_Designer', '2018/12/21 15:24:35', NULL, '1', NULL); +INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('ElectronicSigningConfirmation', '1010', '1010', '1', 'lult', 'CUSTOMER_NAME', 'CUSTOMER_NAME', 'String', NULL, '承租人名称', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '200', '1', '0', '0', '1', '1', 0, NULL, NULL, NULL, 'SYS_Designer', '2018/12/12 11:00:03', 'administrator', '2021/09/02 13:05:47', NULL, NULL, '1', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('ElectronicSigningConfirmation', '1020', '1020', '1', 'di', 'DISTRIBUTOR_NAME', 'DISTRIBUTOR_NAME', 'String', NULL, '经销商名称', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '32', '1', '0', '0', '1', '1', 0, NULL, NULL, NULL, 'SYS_Designer', '2018/12/12 11:00:04', 'administrator', '2021/09/02 13:05:47', NULL, NULL, '1', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('ElectronicSigningConfirmation', '1030', '1030', '1', 'lci', 'CONTRACT_NUMBER', 'CONTRACT_NUMBER', 'String', NULL, '合同号', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '50', '1', '0', '0', '1', '1', 0, NULL, NULL, NULL, 'SYS_Designer', '2018/12/12 11:00:04', 'administrator', '2021/09/02 13:05:47', NULL, NULL, '1', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('ElectronicSigningConfirmation', '1033', '1033', '1', 'ci', 'customername', 'customername', 'String', '', '客户名称', '', '1', 'Text', '1', '1', '', '', '', '50', '1', '0', '0', '1', '1', 0, NULL, '', '', 'SYS_Designer', '2018/12/12 11:00:04', 'administrator', '2021/09/02 13:05:47', NULL, '', '1', '', '', '', NULL); +INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('ElectronicSigningConfirmation', '1035', '1035', '1', 'ci', 'CERTID', 'CERTID', 'String', '', '身份证号', '', '1', 'Text', '1', '1', '', '', '', '50', '1', '0', '0', '1', '1', 0, NULL, '', '', 'SYS_Designer', '2018/12/12 11:00:04', 'administrator', '2021/09/02 13:05:47', NULL, '', '1', '', '', '', NULL); +INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('ElectronicSigningConfirmation', '1040', '1040', '1', 'lci', 'ID', 'ID', 'String', NULL, '标识', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '32', '0', '0', '0', '1', '0', 0, NULL, NULL, NULL, 'SYS_Designer', '2018/12/12 11:04:55', 'administrator', '2021/09/02 13:05:47', NULL, NULL, '1', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('ElectronicSigningConfirmation', '1050', '1050', '1', 'lult', 'PROJECT_ID', 'PROJECT_ID', 'String', NULL, '项目编号', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '32', '0', '0', '0', '1', '0', 0, NULL, NULL, NULL, 'SYS_Designer', '2018/12/12 11:04:55', 'administrator', '2021/09/02 13:05:47', NULL, NULL, '1', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('ElectronicSigningConfirmation', '1060', '1060', '1', 'lult', 'CONTRACT_ID', 'CONTRACT_ID', 'String', NULL, '合同编号', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '32', '0', '0', '0', '1', '0', 0, NULL, NULL, NULL, 'SYS_Designer', '2018/12/12 11:04:55', 'administrator', '2021/09/02 13:05:47', NULL, NULL, '1', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('ElectronicSigningConfirmation', '1090', '1090', '1', NULL, 'com.tenwa.officetempalte.controller.FindNotifyAction.findFileNameConfirmation(PROJECT_ID)', 'FILENAME', 'String', NULL, '文件名称', NULL, '1', 'Text', '1', '1', NULL, NULL, 'style={width:200px;}', NULL, '1', '0', '0', '1', '0', 0, NULL, NULL, NULL, 'SYS_Designer', '2018/12/12 11:38:18', 'administrator', '2021/09/02 13:05:47', NULL, NULL, '1', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('ElectronicSigningConfirmation', '1100', '1100', '1', NULL, 'com.tenwa.officetempalte.controller.FindNotifyAction.findCreatimeConfirmation(PROJECT_ID)', 'creatime', 'String', NULL, '生成日期', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, NULL, '1', '0', '0', '1', '0', 0, NULL, NULL, NULL, 'SYS_Designer', '2018/12/12 11:38:18', 'administrator', '2021/09/02 13:05:47', NULL, NULL, '1', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('ElectronicSigningConfirmation', '1110', '1110', '1', NULL, 'com.tenwa.officetempalte.controller.FindNotifyAction.findAttributeidConfirmation(PROJECT_ID)', 'attrid', 'String', NULL, 'attrid', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, NULL, '0', '0', '0', '1', '0', 0, NULL, NULL, NULL, 'SYS_Designer', '2018/12/13 10:05:23', 'administrator', '2021/09/02 13:05:47', NULL, NULL, '1', NULL, NULL, NULL, NULL); +INSERT INTO `apzl`.`bf_lableconfig`(`ID`, `TAGNUMBER`, `TAGNAME`, `TITLE`, `TAGTYPE`, `VALUETYPE`, `VALUEFIELD`, `VALUEMETHOD`, `THOUSANDSFIELD`, `ISSHOEINDEX`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`, `OPERATORCLASS`) VALUES ('975294b526544d83b806e3fc2f9958', '1000258', 'confirmation', '电子签约确认书', 'tag_type2', 'value_type3', 'CUSTOMERNAME,CERTID,CONTRACT_NUMBER', ' SELECT ci.CUSTOMERNAME,ci.CERTID,lci.CONTRACT_NUMBER\r\nFROM\r\n LB_PROJECT_INFO o\r\n LEFT JOIN LB_CONTRACT_INFO_temp lci ON o.id = lci.project_id\r\n LEFT JOIN LB_UNION_LESSEE lult ON o.id = lult.project_id \r\n LEFT JOIN CUSTOMER_INFO ci ON lult.customer_id = ci.customerid\r\n where o.ID=:{PROJECTID}', NULL, 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'word_default_class'); +INSERT INTO `apzl`.`bf_template`(`ID`, `SERIALNO`, `SORTNUMBER`, `TEMPLATENAME`, `TEMPLATESHOWNAME`, `TEMPLATEPATH`, `TEMPLATETYPE`, `OPERATETYPE`, `CALLBACK`, `CREATEMETHOD`, `DOCTYPE`, `ONECLASSIFY`, `TWOCLASSIFY`, `THREECLASSIFY`, `FOURCLASSIFY`, `TEMPLATEVERSION`, `STATUS`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`, `CREATECONDITION`, `CREATESHEETCONDITION`) VALUES ('69f0423f984a46128292fbd8768fcd2f', NULL, '', '电子签约确认书', '电子签约确认书{contractNo}.docx', '1电子签约确认书.docx', 'word', 'create', '', NULL, '030', '030002', '', '', '', '1', '', '', 'administrator', '8009001', '2021/05/17 15:09:11', 'administrator', '8009001', '2021/09/02 13:43:41', '', '');