From c9d0ee7ff0bcd36ce52c9eba0ddcbc2aa5c6ffb9 Mon Sep 17 00:00:00 2001
From: liuzhao <liuzhao@DESKTOP-NULDTFM>
Date: Wed, 1 Aug 2018 15:52:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=A1=AE=E8=AE=A4=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConfirmInvoice/invoice_confirm.xml        | 335 +++++++++---------
 1 file changed, 168 insertions(+), 167 deletions(-)

diff --git a/WebContent/Tenwa/Core/InvoiceManager/TablesXML/ConfirmInvoice/invoice_confirm.xml b/WebContent/Tenwa/Core/InvoiceManager/TablesXML/ConfirmInvoice/invoice_confirm.xml
index d842954e4..1882cded3 100644
--- a/WebContent/Tenwa/Core/InvoiceManager/TablesXML/ConfirmInvoice/invoice_confirm.xml
+++ b/WebContent/Tenwa/Core/InvoiceManager/TablesXML/ConfirmInvoice/invoice_confirm.xml
@@ -9,172 +9,173 @@
     <MYSQL>
       <table_sql> 
 	        <![CDATA[
-select id,contractnumber,paymentnumber,customername,planlist,plandate,planmoney,factdate,factmoney,invoicemoney,feetype,
-invoicetype,invoiceobject,taxregcode,taxbank,taxacc,invoicephone,invoiceadd,tab.invoicestatus,leaseform,feetypecode from (
-	SELECT 
-		lfii.id AS id,
-		lci.contract_number AS contractnumber,
-		lfp.payment_number as paymentnumber,
-		lul.customer_name AS customername,
-		lfp.plan_list AS planlist,
-		lfp.plan_date AS plandate,
-		format(lfp.plan_money,2) AS planmoney,
-		'' AS factdate,
-		'' AS factmoney,
-		FORMAT(lfii.invoice_money-lfii.temporary_noinvoice-lfii.noinvoice-IFNULL(lfidi.suminvoicedmoney,0.00),2) AS invoicemoney,
-		feecode.itemname AS feetype,
-		invoicecode.itemname AS invoicetype,
-		lfii.invoice_object AS invoiceobject,
-		lfii.tax_reg_code AS taxregcode,
-		lfii.tax_bank AS taxbank,
-		lfii.tax_acc AS taxacc,
-		lfii.invoice_phone AS invoicephone,
-		lfii.invoice_add AS invoiceadd,
-		CASE lfii.invoice_status WHEN '0' THEN '未申请' WHEN '1' THEN '已申请' WHEN '2' THEN '已退回' WHEN '3' THEN '部分未申请' WHEN '4' THEN '暂不开票' WHEN '5' THEN '已开票'  END AS invoicestatus,
-		leasecode.itemname AS leaseform,
-		'fund' as feetypecode
-	FROM 
-		LI_FUND_INVOICE_INFO lfii
-		LEFT JOIN LC_FUND_PLAN lfp ON lfp.id=lfii.plan_id
-		LEFT JOIN lb_contract_info lci ON lfp.contract_id=lci.id
-		LEFT JOIN LB_UNION_LESSEE lul ON lul.contract_id=lci.id AND lul.is_main='Y'
-		LEFT JOIN (SELECT FUND_INVOICE_ID,SUM(INVOICE_MONEY) AS suminvoicedmoney FROM LI_FUND_INVOICE_DOWNLOAD_INFO GROUP BY FUND_INVOICE_ID)lfidi ON lfidi.FUND_INVOICE_ID=lfii.id 
-		LEFT JOIN code_library feecode ON feecode.itemno=lfp.fee_type AND feecode.codeno='FeeType'
-		LEFT JOIN code_library leasecode ON leasecode.itemno=lci.lease_form AND leasecode.codeno='leas_form'
-		LEFT JOIN code_library invoicecode ON invoicecode.itemno=lfii.invoice_type AND invoicecode.codeno='invoice_type'
-		WHERE lfii.income_id IS NULL AND lfii.plan_id IS NOT NULL AND lfii.bill_type='invoice'
-UNION ALL
-	SELECT 
-		lfii.id AS id,
-		lci.contract_number AS contractnumber,
-		lfi.payment_number as paymentnumber,
-		lul.customer_name AS customername,
-		lfi.charge_list AS planlist,
-		lfp.plan_date AS plandate,
-		format(lfp.plan_money,2) AS planmoney,
-		lfi.fact_date AS factdate,
-		format(lfi.fact_money,2) AS factmoney,
-		FORMAT(lfii.invoice_money-lfii.temporary_noinvoice-lfii.noinvoice-IFNULL(lfidi.suminvoicedmoney,0.00),2) AS invoicemoney,
-		feecode.itemname AS feetype,
-		invoicecode.itemname AS invoicetype,
-		lfii.invoice_object AS invoiceobject,
-		lfii.tax_reg_code AS taxregcode,
-		lfii.tax_bank AS taxbank,
-		lfii.tax_acc AS taxacc,
-		lfii.invoice_phone AS invoicephone,
-		lfii.invoice_add AS invoiceadd,
-		CASE lfii.invoice_status WHEN '0' THEN '未申请' WHEN '1' THEN '已申请' WHEN '2' THEN '已退回' WHEN '3' THEN '部分未申请' WHEN '4' THEN '暂不开票' WHEN '5' THEN '已开票'  END AS invoicestatus,
-		leasecode.itemname AS leaseform,
-		'fund' as feetypecode
-	FROM 
-		LI_FUND_INVOICE_INFO lfii
-		LEFT JOIN LC_FUND_INCOME lfi ON lfii.income_id=lfi.id
-		LEFT JOIN LC_FUND_PLAN lfp ON lfp.id=lfi.plan_id
-		LEFT JOIN lb_contract_info lci ON lfi.contract_id=lci.id
-		LEFT JOIN LB_UNION_LESSEE lul ON lul.contract_id=lci.id AND lul.is_main='Y'
-		LEFT JOIN (SELECT FUND_INVOICE_ID,SUM(INVOICE_MONEY) AS suminvoicedmoney FROM LI_FUND_INVOICE_DOWNLOAD_INFO GROUP BY FUND_INVOICE_ID)lfidi ON lfidi.FUND_INVOICE_ID=lfii.id 
-		LEFT JOIN code_library feecode ON feecode.itemno=lfi.fee_type AND feecode.codeno='FeeType'
-		LEFT JOIN code_library leasecode ON leasecode.itemno=lci.lease_form AND leasecode.codeno='leas_form'
-		LEFT JOIN code_library invoicecode ON invoicecode.itemno=lfii.invoice_type AND invoicecode.codeno='invoice_type'
-		WHERE lfii.income_id IS NOT NULL AND lfii.plan_id IS NULL AND lfii.bill_type='invoice'
-UNION ALL
-	SELECT
-		lrii.id AS id,
-		lci.contract_number AS contractnumber,
-		lrp.payment_number as paymentnumber,
-		lul.customer_name AS customername,
-		lrp.plan_list AS planlist,
-		lrp.plan_date AS plandate,
-		format(CASE lrii.tax_type WHEN 'rent' THEN lrp.rent WHEN 'corpus' THEN lrp.corpus WHEN 'interest' THEN lrp.interest END,2) AS planmoney,
-		'' AS factdate,
-		'' AS factmoney,
-		FORMAT(lrii.invoice_money-lrii.temporary_noinvoice-lrii.noinvoice-IFNULL(lridi.suminvoicedmoney,0.00),2) AS invoicemoney,
-		CASE lrii.tax_type WHEN 'rent' THEN '租金' WHEN 'corpus' THEN '本金' WHEN 'interest' THEN '利息' END AS feetype,
-		invoicecode.itemname AS invoicetype,
-		lrii.invoice_object AS invoiceobject,
-		lrii.tax_reg_code AS taxregcode,
-		lrii.tax_bank AS taxbank,
-		lrii.tax_acc AS taxacc,
-		lrii.invoice_phone AS invoicephone,
-		lrii.invoice_add AS invoiceadd,
-		CASE lrii.invoice_status WHEN '0' THEN '未申请' WHEN '1' THEN '已申请' WHEN '2' THEN '已退回' WHEN '3' THEN '部分未申请' WHEN '4' THEN '暂不开票' WHEN '5' THEN '已开票'  END AS invoicestatus,
-		leasecode.itemname AS leaseform,
-		lrii.tax_type as feetypecode
-	FROM 
-		LI_RENT_INVOICE_INFO lrii
-		LEFT JOIN LC_RENT_PLAN lrp ON lrp.id=lrii.plan_id
-		LEFT JOIN lb_contract_info lci ON lrp.contract_id=lci.id
-		LEFT JOIN LB_UNION_LESSEE lul ON lul.contract_id=lci.id AND lul.is_main='Y'
-		LEFT JOIN (SELECT RENT_INVOICE_ID,SUM(INVOICE_MONEY) AS suminvoicedmoney FROM LI_RENT_INVOICE_DOWNLOAD_INFO GROUP BY RENT_INVOICE_ID)lridi ON lridi.RENT_INVOICE_ID=lrii.id 
-		LEFT JOIN code_library leasecode ON leasecode.itemno=lci.lease_form AND leasecode.codeno='leas_form'
-		LEFT JOIN code_library invoicecode ON invoicecode.itemno=lrii.invoice_type AND invoicecode.codeno='invoice_type'
-		WHERE lrii.income_id IS NULL AND lrii.plan_id IS NOT NULL AND lrii.bill_type='invoice'
-UNION ALL
-	SELECT
-		lrii.id AS id,
-		lci.contract_number AS contractnumber,
-		lri.payment_number as paymentnumber,
-		lul.customer_name AS customername,
-		lri.hire_list AS planlist,
-		vlrp.plan_date AS plandate,
-		format(CASE lrii.tax_type WHEN 'rent' THEN vlrp.rent WHEN 'corpus' THEN vlrp.corpus WHEN 'interest' THEN vlrp.interest WHEN 'penalty' THEN vlrp.penalty END,2) AS planmoney,
-		lri.hire_date AS factdate,
-		format(CASE lrii.tax_type WHEN 'rent' THEN lri.rent WHEN 'corpus' THEN lri.corpus WHEN 'interest' THEN lri.interest WHEN 'penalty' THEN lri.penalty END,2) AS factmoney,
-		FORMAT(lrii.invoice_money-lrii.temporary_noinvoice-lrii.noinvoice-IFNULL(lridi.suminvoicedmoney,0.00),2) AS invoicemoney,
-		CASE lrii.tax_type WHEN 'rent' THEN '租金' WHEN 'corpus' THEN '本金' WHEN 'interest' THEN '利息' WHEN 'penalty' THEN '罚息' END AS feetype,
-		invoicecode.itemname AS invoicetype,
-		lrii.invoice_object AS invoiceobject,
-		lrii.tax_reg_code AS taxregcode,
-		lrii.tax_bank AS taxbank,
-		lrii.tax_acc AS taxacc,
-		lrii.invoice_phone AS invoicephone,
-		lrii.invoice_add AS invoiceadd,
-		CASE lrii.invoice_status WHEN '0' THEN '未申请' WHEN '1' THEN '已申请' WHEN '2' THEN '已退回' WHEN '3' THEN '部分未申请' WHEN '4' THEN '暂不开票' WHEN '5' THEN '已开票'  END AS invoicestatus,
-		leasecode.itemname AS leaseform,
-		lrii.tax_type as feetypecode
-	FROM 
-		LI_RENT_INVOICE_INFO lrii
-		LEFT JOIN LC_RENT_INCOME lri ON lri.id=lrii.income_id
-		LEFT JOIN VI_LC_RENT_PLAN vlrp ON vlrp.id=lri.plan_id
-		LEFT JOIN lb_contract_info lci ON lri.contract_id=lci.id
-		LEFT JOIN LB_UNION_LESSEE lul ON lul.contract_id=lci.id AND lul.is_main='Y'		
-		LEFT JOIN (SELECT RENT_INVOICE_ID,SUM(INVOICE_MONEY) AS suminvoicedmoney FROM LI_RENT_INVOICE_DOWNLOAD_INFO GROUP BY RENT_INVOICE_ID)lridi ON lridi.RENT_INVOICE_ID=lrii.id 
-		LEFT JOIN code_library leasecode ON leasecode.itemno=lci.lease_form AND leasecode.codeno='leas_form'
-		LEFT JOIN code_library invoicecode ON invoicecode.itemno=lrii.invoice_type AND invoicecode.codeno='invoice_type'
-		WHERE lrii.income_id IS NOT NULL AND lrii.plan_id IS NULL AND lrii.bill_type='invoice'
-UNION ALL
-	SELECT
-		lrii.id AS id,
-		lci.contract_number AS contractnumber,
-		lcc.payment_number as paymentnumber,
-		lul.customer_name AS customername,
-		'' AS planlist,
-		'' AS plandate,
-		format(lcc.equip_amt-IFNULL(lcc.first_payment,0),2) AS planmoney, 
-		'' AS factdate,
-		'' AS factmoney,
-		FORMAT(lrii.invoice_money-lrii.temporary_noinvoice-lrii.noinvoice-IFNULL(lridi.suminvoicedmoney,0.00),2) AS invoicemoney,
-		'本金一次性' AS feetype,
-		invoicecode.itemname AS invoicetype,
-		lrii.invoice_object AS invoiceobject,
-		lrii.tax_reg_code AS taxregcode,
-		lrii.tax_bank AS taxbank,
-		lrii.tax_acc AS taxacc,
-		lrii.invoice_phone AS invoicephone,
-		lrii.invoice_add AS invoiceadd,
-		CASE lrii.invoice_status WHEN '0' THEN '未申请' WHEN '1' THEN '已申请' WHEN '2' THEN '已退回' WHEN '3' THEN '部分未申请' WHEN '4' THEN '暂不开票' WHEN '5' THEN '已开票'  END AS invoicestatus,
-		leasecode.itemname AS leaseform,
-		'corpusone' as feetypecode
-	FROM 
-		LI_RENT_INVOICE_INFO lrii
-		LEFT JOIN LC_CONTRACT_CONDITION lcc ON lrii.payment_number=lcc.payment_number
-		LEFT JOIN lb_contract_info lci ON lcc.contract_id=lci.id
-		LEFT JOIN LB_UNION_LESSEE lul ON lul.contract_id=lci.id AND lul.is_main='Y'
-		LEFT JOIN (SELECT RENT_INVOICE_ID,SUM(INVOICE_MONEY) AS suminvoicedmoney FROM LI_RENT_INVOICE_DOWNLOAD_INFO GROUP BY RENT_INVOICE_ID)lridi ON lridi.RENT_INVOICE_ID=lrii.id 
-		LEFT JOIN code_library leasecode ON leasecode.itemno=lci.lease_form AND leasecode.codeno='leas_form'
-		LEFT JOIN code_library invoicecode ON invoicecode.itemno=lrii.invoice_type AND invoicecode.codeno='invoice_type'
-		WHERE lrii.income_id IS NULL AND lrii.plan_id IS NULL AND lrii.payment_number IS NOT NULL AND lrii.bill_type='invoice'
-) tab where 1=1 and tab.invoicestatus in ('已申请') order by paymentnumber
+			SELECT fr.id,fr.contractnumber,fr.paymentnumber,fr.customername,fr.planlist,fr.plandate,fr.planmoney,fr.factdate,fr.factmoney,fr.invoicemoney,fr.feetype,fr.invoiceobject,fr.taxregcode,fr.taxbank,fr.taxacc,fr.invoicephone,fr.invoiceadd,fr.invoicestatus,fr.leaseform,fr.feetypecode,ii.appid,ii.sid,ii.yylxdm,ii.fplxdm,ii.kplx,ii.tspz,ii.xhdwdzdh,ii.xhdwyhzh,ii.ghdwsbh,ii.ghdwmc,ii.ghdwdzdh,ii.ghdwyhzh,ii.hsslbs,ii.fyxm,ii.fphxz,ii.spmc,ii.spsm,ii.ggxh,ii.dw,ii.spsl,ii.dj,ii.je,ii.sl,ii.se,ii.hsbz,ii.spbm,ii.zxbm,ii.yhzcbs,ii.slbs,ii.zzstsgl,ii.zhsl,ii.hjje,ii.hjse,ii.jshj,ii.bz,ii.skr,ii.fhr,ii.kpr,ii.zyspmc,ii.ssyf,ii.tzdbh,ii.yfphm,ii.yfpdm,ii.GMF_DZYX,ii.GMF_SJHM,ii.GMF_SJOPENID FROM 
+			(SELECT id,contractnumber,paymentnumber,customername,planlist,plandate,planmoney,factdate,factmoney,invoicemoney,feetype,invoiceobject,taxregcode,taxbank,taxacc,invoicephone,invoiceadd,invoicestatus,leaseform,feetypecode FROM (
+				SELECT 
+					lfii.id AS id,
+					lci.contract_number AS contractnumber,
+					lfp.payment_number AS paymentnumber,
+					lul.customer_name AS customername,
+					lfp.plan_list AS planlist,
+					lfp.plan_date AS plandate,
+					FORMAT(lfp.plan_money,2) AS planmoney,
+					'' AS factdate,
+					'' AS factmoney,
+					FORMAT(lfii.invoice_money-lfii.temporary_noinvoice-lfii.noinvoice-IFNULL(lfidi.suminvoicedmoney,0.00),2) AS invoicemoney,
+					feecode.itemname AS feetype,
+					invoicecode.itemname AS invoicetype,
+					lfii.invoice_object AS invoiceobject,
+					lfii.tax_reg_code AS taxregcode,
+					lfii.tax_bank AS taxbank,
+					lfii.tax_acc AS taxacc,
+					lfii.invoice_phone AS invoicephone,
+					lfii.invoice_add AS invoiceadd,
+					CASE lfii.invoice_status WHEN '0' THEN '未申请' WHEN '1' THEN '已申请' WHEN '2' THEN '已退回' WHEN '3' THEN '部分未申请' WHEN '4' THEN '暂不开票' WHEN '5' THEN '已开票'  END AS invoicestatus,
+					leasecode.itemname AS leaseform,
+					'fund' AS feetypecode
+				FROM 
+					LI_FUND_INVOICE_INFO lfii
+					LEFT JOIN LC_FUND_PLAN lfp ON lfp.id=lfii.plan_id
+					LEFT JOIN lb_contract_info lci ON lfp.contract_id=lci.id
+					LEFT JOIN LB_UNION_LESSEE lul ON lul.contract_id=lci.id AND lul.is_main='Y'
+					LEFT JOIN (SELECT FUND_INVOICE_ID,SUM(INVOICE_MONEY) AS suminvoicedmoney FROM LI_FUND_INVOICE_DOWNLOAD_INFO GROUP BY FUND_INVOICE_ID)lfidi ON lfidi.FUND_INVOICE_ID=lfii.id 
+					LEFT JOIN code_library feecode ON feecode.itemno=lfp.fee_type AND feecode.codeno='FeeType'
+					LEFT JOIN code_library leasecode ON leasecode.itemno=lci.lease_form AND leasecode.codeno='leas_form'
+					LEFT JOIN code_library invoicecode ON invoicecode.itemno=lfii.invoice_type AND invoicecode.codeno='invoice_type'
+					WHERE lfii.income_id IS NULL AND lfii.plan_id IS NOT NULL AND lfii.bill_type='invoice'
+			UNION ALL
+				SELECT 
+					lfii.id AS id,
+					lci.contract_number AS contractnumber,
+					lfi.payment_number AS paymentnumber,
+					lul.customer_name AS customername,
+					lfi.charge_list AS planlist,
+					lfp.plan_date AS plandate,
+					FORMAT(lfp.plan_money,2) AS planmoney,
+					lfi.fact_date AS factdate,
+					FORMAT(lfi.fact_money,2) AS factmoney,
+					FORMAT(lfii.invoice_money-lfii.temporary_noinvoice-lfii.noinvoice-IFNULL(lfidi.suminvoicedmoney,0.00),2) AS invoicemoney,
+					feecode.itemname AS feetype,
+					invoicecode.itemname AS invoicetype,
+					lfii.invoice_object AS invoiceobject,
+					lfii.tax_reg_code AS taxregcode,
+					lfii.tax_bank AS taxbank,
+					lfii.tax_acc AS taxacc,
+					lfii.invoice_phone AS invoicephone,
+					lfii.invoice_add AS invoiceadd,
+					CASE lfii.invoice_status WHEN '0' THEN '未申请' WHEN '1' THEN '已申请' WHEN '2' THEN '已退回' WHEN '3' THEN '部分未申请' WHEN '4' THEN '暂不开票' WHEN '5' THEN '已开票'  END AS invoicestatus,
+					leasecode.itemname AS leaseform,
+					'fund' AS feetypecode
+				FROM 
+					LI_FUND_INVOICE_INFO lfii
+					LEFT JOIN LC_FUND_INCOME lfi ON lfii.income_id=lfi.id
+					LEFT JOIN LC_FUND_PLAN lfp ON lfp.id=lfi.plan_id
+					LEFT JOIN lb_contract_info lci ON lfi.contract_id=lci.id
+					LEFT JOIN LB_UNION_LESSEE lul ON lul.contract_id=lci.id AND lul.is_main='Y'
+					LEFT JOIN (SELECT FUND_INVOICE_ID,SUM(INVOICE_MONEY) AS suminvoicedmoney FROM LI_FUND_INVOICE_DOWNLOAD_INFO GROUP BY FUND_INVOICE_ID)lfidi ON lfidi.FUND_INVOICE_ID=lfii.id 
+					LEFT JOIN code_library feecode ON feecode.itemno=lfi.fee_type AND feecode.codeno='FeeType'
+					LEFT JOIN code_library leasecode ON leasecode.itemno=lci.lease_form AND leasecode.codeno='leas_form'
+					LEFT JOIN code_library invoicecode ON invoicecode.itemno=lfii.invoice_type AND invoicecode.codeno='invoice_type'
+					WHERE lfii.income_id IS NOT NULL AND lfii.plan_id IS NULL AND lfii.bill_type='invoice'
+			UNION ALL
+				SELECT
+					lrii.id AS id,
+					lci.contract_number AS contractnumber,
+					lrp.payment_number AS paymentnumber,
+					lul.customer_name AS customername,
+					lrp.plan_list AS planlist,
+					lrp.plan_date AS plandate,
+					FORMAT(CASE lrii.tax_type WHEN 'rent' THEN lrp.rent WHEN 'corpus' THEN lrp.corpus WHEN 'interest' THEN lrp.interest END,2) AS planmoney,
+					'' AS factdate,
+					'' AS factmoney,
+					FORMAT(lrii.invoice_money-lrii.temporary_noinvoice-lrii.noinvoice-IFNULL(lridi.suminvoicedmoney,0.00),2) AS invoicemoney,
+					CASE lrii.tax_type WHEN 'rent' THEN '租金' WHEN 'corpus' THEN '本金' WHEN 'interest' THEN '利息' END AS feetype,
+					invoicecode.itemname AS invoicetype,
+					lrii.invoice_object AS invoiceobject,
+					lrii.tax_reg_code AS taxregcode,
+					lrii.tax_bank AS taxbank,
+					lrii.tax_acc AS taxacc,
+					lrii.invoice_phone AS invoicephone,
+					lrii.invoice_add AS invoiceadd,
+					CASE lrii.invoice_status WHEN '0' THEN '未申请' WHEN '1' THEN '已申请' WHEN '2' THEN '已退回' WHEN '3' THEN '部分未申请' WHEN '4' THEN '暂不开票' WHEN '5' THEN '已开票'  END AS invoicestatus,
+					leasecode.itemname AS leaseform,
+					lrii.tax_type AS feetypecode
+				FROM 
+					LI_RENT_INVOICE_INFO lrii
+					LEFT JOIN LC_RENT_PLAN lrp ON lrp.id=lrii.plan_id
+					LEFT JOIN lb_contract_info lci ON lrp.contract_id=lci.id
+					LEFT JOIN LB_UNION_LESSEE lul ON lul.contract_id=lci.id AND lul.is_main='Y'
+					LEFT JOIN (SELECT RENT_INVOICE_ID,SUM(INVOICE_MONEY) AS suminvoicedmoney FROM LI_RENT_INVOICE_DOWNLOAD_INFO GROUP BY RENT_INVOICE_ID)lridi ON lridi.RENT_INVOICE_ID=lrii.id 
+					LEFT JOIN code_library leasecode ON leasecode.itemno=lci.lease_form AND leasecode.codeno='leas_form'
+					LEFT JOIN code_library invoicecode ON invoicecode.itemno=lrii.invoice_type AND invoicecode.codeno='invoice_type'
+					WHERE lrii.income_id IS NULL AND lrii.plan_id IS NOT NULL AND lrii.bill_type='invoice'
+			UNION ALL
+				SELECT
+					lrii.id AS id,
+					lci.contract_number AS contractnumber,
+					lri.payment_number AS paymentnumber,
+					lul.customer_name AS customername,
+					lri.hire_list AS planlist,
+					vlrp.plan_date AS plandate,
+					FORMAT(CASE lrii.tax_type WHEN 'rent' THEN vlrp.rent WHEN 'corpus' THEN vlrp.corpus WHEN 'interest' THEN vlrp.interest WHEN 'penalty' THEN vlrp.penalty END,2) AS planmoney,
+					lri.hire_date AS factdate,
+					FORMAT(CASE lrii.tax_type WHEN 'rent' THEN lri.rent WHEN 'corpus' THEN lri.corpus WHEN 'interest' THEN lri.interest WHEN 'penalty' THEN lri.penalty END,2) AS factmoney,
+					FORMAT(lrii.invoice_money-lrii.temporary_noinvoice-lrii.noinvoice-IFNULL(lridi.suminvoicedmoney,0.00),2) AS invoicemoney,
+					CASE lrii.tax_type WHEN 'rent' THEN '租金' WHEN 'corpus' THEN '本金' WHEN 'interest' THEN '利息' WHEN 'penalty' THEN '罚息' END AS feetype,
+					invoicecode.itemname AS invoicetype,
+					lrii.invoice_object AS invoiceobject,
+					lrii.tax_reg_code AS taxregcode,
+					lrii.tax_bank AS taxbank,
+					lrii.tax_acc AS taxacc,
+					lrii.invoice_phone AS invoicephone,
+					lrii.invoice_add AS invoiceadd,
+					CASE lrii.invoice_status WHEN '0' THEN '未申请' WHEN '1' THEN '已申请' WHEN '2' THEN '已退回' WHEN '3' THEN '部分未申请' WHEN '4' THEN '暂不开票' WHEN '5' THEN '已开票'  END AS invoicestatus,
+					leasecode.itemname AS leaseform,
+					lrii.tax_type AS feetypecode
+				FROM 
+					LI_RENT_INVOICE_INFO lrii
+					LEFT JOIN LC_RENT_INCOME lri ON lri.id=lrii.income_id
+					LEFT JOIN VI_LC_RENT_PLAN vlrp ON vlrp.id=lri.plan_id
+					LEFT JOIN lb_contract_info lci ON lri.contract_id=lci.id
+					LEFT JOIN LB_UNION_LESSEE lul ON lul.contract_id=lci.id AND lul.is_main='Y'		
+					LEFT JOIN (SELECT RENT_INVOICE_ID,SUM(INVOICE_MONEY) AS suminvoicedmoney FROM LI_RENT_INVOICE_DOWNLOAD_INFO GROUP BY RENT_INVOICE_ID)lridi ON lridi.RENT_INVOICE_ID=lrii.id 
+					LEFT JOIN code_library leasecode ON leasecode.itemno=lci.lease_form AND leasecode.codeno='leas_form'
+					LEFT JOIN code_library invoicecode ON invoicecode.itemno=lrii.invoice_type AND invoicecode.codeno='invoice_type'
+					WHERE lrii.income_id IS NOT NULL AND lrii.plan_id IS NULL AND lrii.bill_type='invoice'
+			UNION ALL
+				SELECT
+					lrii.id AS id,
+					lci.contract_number AS contractnumber,
+					lcc.payment_number AS paymentnumber,
+					lul.customer_name AS customername,
+					'' AS planlist,
+					'' AS plandate,
+					FORMAT(lcc.equip_amt-IFNULL(lcc.first_payment,0),2) AS planmoney, 
+					'' AS factdate,
+					'' AS factmoney,
+					FORMAT(lrii.invoice_money-lrii.temporary_noinvoice-lrii.noinvoice-IFNULL(lridi.suminvoicedmoney,0.00),2) AS invoicemoney,
+					'本金一次性' AS feetype,
+					invoicecode.itemname AS invoicetype,
+					lrii.invoice_object AS invoiceobject,
+					lrii.tax_reg_code AS taxregcode,
+					lrii.tax_bank AS taxbank,
+					lrii.tax_acc AS taxacc,
+					lrii.invoice_phone AS invoicephone,
+					lrii.invoice_add AS invoiceadd,
+					CASE lrii.invoice_status WHEN '0' THEN '未申请' WHEN '1' THEN '已申请' WHEN '2' THEN '已退回' WHEN '3' THEN '部分未申请' WHEN '4' THEN '暂不开票' WHEN '5' THEN '已开票'  END AS invoicestatus,
+					leasecode.itemname AS leaseform,
+					'corpusone' AS feetypecode
+				FROM 
+					LI_RENT_INVOICE_INFO lrii
+					LEFT JOIN LC_CONTRACT_CONDITION lcc ON lrii.payment_number=lcc.payment_number
+					LEFT JOIN lb_contract_info lci ON lcc.contract_id=lci.id
+					LEFT JOIN LB_UNION_LESSEE lul ON lul.contract_id=lci.id AND lul.is_main='Y'
+					LEFT JOIN (SELECT RENT_INVOICE_ID,SUM(INVOICE_MONEY) AS suminvoicedmoney FROM LI_RENT_INVOICE_DOWNLOAD_INFO GROUP BY RENT_INVOICE_ID)lridi ON lridi.RENT_INVOICE_ID=lrii.id 
+					LEFT JOIN code_library leasecode ON leasecode.itemno=lci.lease_form AND leasecode.codeno='leas_form'
+					LEFT JOIN code_library invoicecode ON invoicecode.itemno=lrii.invoice_type AND invoicecode.codeno='invoice_type'
+					WHERE lrii.income_id IS NULL AND lrii.plan_id IS NULL AND lrii.payment_number IS NOT NULL AND lrii.bill_type='invoice'
+			) tab WHERE 1=1 AND tab.invoicestatus IN ('已申请') ORDER BY paymentnumber) fr
+			LEFT JOIN invoice_interface ii ON fr.id=ii.invoice_id
 			 ]]> 
 	  </table_sql>
 	  </MYSQL>
@@ -182,7 +183,7 @@ UNION ALL
       <table_sql> 
 	        <![CDATA[
 			select id,contractnumber,paymentnumber,customername,planlist,plandate,planmoney,factdate,factmoney,invoicemoney,feetype,
-			invoicetype,invoiceobject,taxregcode,taxbank,taxacc,invoicephone,invoiceadd,tab.invoicestatus,leaseform,feetypecode from (
+		    invoicetype,invoiceobject,taxregcode,taxbank,taxacc,invoicephone,invoiceadd,tab.invoicestatus,leaseform,feetypecode from (
 				SELECT 
 					lfii.id AS id,
 					lci.contract_number AS contractnumber,