From 2db76f2066701cbe292f206ad49a7f8523b8aa9f Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 14 八月 2026 16:30:25 +0800
Subject: [PATCH] feat:银行流水关联多个合同,新增预收款开票,所有List校验调整为ColUtil

---
 platformx-business-finance-biz/src/main/resources/mapper/ContractInvoiceMapper.xml | 1117 ++++++++++++++++++++++++++--------------------------------
 1 files changed, 507 insertions(+), 610 deletions(-)

diff --git a/platformx-business-finance-biz/src/main/resources/mapper/ContractInvoiceMapper.xml b/platformx-business-finance-biz/src/main/resources/mapper/ContractInvoiceMapper.xml
index 767a077..20efb7b 100644
--- a/platformx-business-finance-biz/src/main/resources/mapper/ContractInvoiceMapper.xml
+++ b/platformx-business-finance-biz/src/main/resources/mapper/ContractInvoiceMapper.xml
@@ -3,535 +3,425 @@
 
 <mapper namespace="com.by4cloud.platformx.business.mapper.ContractInvoiceMapper">
 
-  <resultMap id="ContractInvoiceMap" type="com.by4cloud.platformx.business.entity.ContractInvoice">
-        <id property="id" column="id"/>
-        <result property="compId" column="comp_id"/>
-        <result property="contractId" column="contract_id"/>
-        <result property="invoicePrice" column="invoice_total_price_tax"/>
-        <result property="invoiceTime" column="invoice_time"/>
-        <result property="invoicePath" column="invoice_path"/>
-	  	<result property="invoiceCategory" column="invoice_category"/>
-	    <result property="redReversal" column="red_reversal"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="delFlag" column="del_flag"/>
-  </resultMap>
-    <select id="homeZbjt" resultType="com.by4cloud.platformx.business.vo.HomeZbjtVo">
-		SELECT
-		(
-		SELECT
-		sum(ci.invoice_total_price_tax)
-		FROM
-		contract_invoice ci
-		WHERE
-		ci.del_flag = '0'
-		AND comp_id = 2056556196124250113
-		AND ci.invoice_time &gt;= CURDATE()
-		AND ci.invoice_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) sgbbr,
-		(
-		SELECT
-		sum(ci.invoice_total_price_tax)
-		FROM
-		contract_invoice ci
-		WHERE
-		ci.del_flag = '0'
-		AND comp_id = 2056556196124250113
-		AND ci.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
-		AND ci.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) sgbby,
-		(
-		SELECT
-		sum(ci.invoice_total_price_tax)
-		FROM
-		contract_invoice ci
-		WHERE
-		ci.del_flag = '0'
-		AND comp_id = 2056556196124250113
-		AND ci.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-		AND ci.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )) sgbbn,
-		(
-		SELECT
-		sum(ci.invoice_total_price_tax)
-		FROM
-		contract_invoice ci
-		WHERE
-		ci.del_flag = '0'
-		AND comp_id = 2056555602756063234
-		AND ci.invoice_time &gt;= CURDATE()
-		AND ci.invoice_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) smjbr,
-		(
-		SELECT
-		sum(ci.invoice_total_price_tax)
-		FROM
-		contract_invoice ci
-		WHERE
-		ci.del_flag = '0'
-		AND comp_id = 2056555602756063234
-		AND ci.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
-		AND ci.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) smjby,
-		(
-		SELECT
-		sum(ci.invoice_total_price_tax)
-		FROM
-		contract_invoice ci
-		WHERE
-		ci.del_flag = '0'
-		AND comp_id = 2056555602756063234
-		AND ci.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-		AND ci.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )) smjbn,
-		(
-		SELECT
-		sum(ci.invoice_total_price_tax)
-		FROM
-		contract_invoice ci
-		WHERE
-		ci.del_flag = '0'
-		AND comp_id = 2056556317461270529
-		AND ci.invoice_time &gt;= CURDATE()
-		AND ci.invoice_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) jxcbr,
-		(
-		SELECT
-		sum(ci.invoice_total_price_tax)
-		FROM
-		contract_invoice ci
-		WHERE
-		ci.del_flag = '0'
-		AND comp_id = 2056556317461270529
-		AND ci.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
-		AND ci.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) jxcby,
-		(
-		SELECT
-		sum(ci.invoice_total_price_tax)
-		FROM
-		contract_invoice ci
-		WHERE
-		ci.del_flag = '0'
-		AND comp_id = 2056556317461270529
-		AND ci.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-		AND ci.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )) jxcbn,
-		(
-		SELECT
-		sum(ci.invoice_total_price_tax)
-		FROM
-		contract_invoice ci
-		WHERE
-		ci.del_flag = '0'
-		AND comp_id = 2056556421857497090
-		AND ci.invoice_time &gt;= CURDATE()
-		AND ci.invoice_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) tfbr,
-		(
-		SELECT
-		sum(ci.invoice_total_price_tax)
-		FROM
-		contract_invoice ci
-		WHERE
-		ci.del_flag = '0'
-		AND comp_id = 2056556421857497090
-		AND ci.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
-		AND ci.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) tfby,
-		(
-		SELECT
-		sum(ci.invoice_total_price_tax)
-		FROM
-		contract_invoice ci
-		WHERE
-		ci.del_flag = '0'
-		AND comp_id = 2056556421857497090
-		AND ci.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-		AND ci.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )) tfbn,
-		(
-		SELECT
-		sum(ci.invoice_total_price_tax)
-		FROM
-		contract_invoice ci
-		WHERE
-		ci.del_flag = '0'
-		AND comp_id = 2056556535640576002
-		AND ci.invoice_time &gt;= CURDATE()
-		AND ci.invoice_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) ymjbr,
-		(
-		SELECT
-		sum(ci.invoice_total_price_tax)
-		FROM
-		contract_invoice ci
-		WHERE
-		ci.del_flag = '0'
-		AND comp_id = 2056556535640576002
-		AND ci.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
-		AND ci.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) ymjby,
-		(
-		SELECT
-		sum(ci.invoice_total_price_tax)
-		FROM
-		contract_invoice ci
-		WHERE
-		ci.del_flag = '0'
-		AND comp_id = 2056556535640576002
-		AND ci.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-		AND ci.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )) ymjbn
+	<resultMap id="ContractInvoiceMap" type="com.by4cloud.platformx.business.entity.ContractInvoice">
+		<id property="id" column="id"/>
+		<result property="compId" column="comp_id"/>
+		<result property="contractId" column="contract_id"/>
+		<result property="invoicePrice" column="invoice_total_price_tax"/>
+		<result property="invoiceTime" column="invoice_time"/>
+		<result property="invoicePath" column="invoice_path"/>
+		<result property="invoiceCategory" column="invoice_category"/>
+		<result property="redReversal" column="red_reversal"/>
+		<result property="createBy" column="create_by"/>
+		<result property="createTime" column="create_time"/>
+		<result property="updateBy" column="update_by"/>
+		<result property="updateTime" column="update_time"/>
+		<result property="delFlag" column="del_flag"/>
+	</resultMap>
+	<select id="homeZbjt" resultType="com.by4cloud.platformx.business.vo.HomeZbjtVo">
+		SELECT (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci
+				   WHERE ci.del_flag = '0'
+					 AND comp_id = 2056556196124250113
+					 AND ci.invoice_time &gt;= CURDATE()
+					 AND ci.invoice_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY ))                            sgbbr,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci
+				   WHERE ci.del_flag = '0'
+					 AND comp_id = 2056556196124250113
+					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01')) sgbby,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci
+				   WHERE ci.del_flag = '0'
+					 AND comp_id = 2056556196124250113
+					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
+					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01'))  sgbbn,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci
+				   WHERE ci.del_flag = '0'
+					 AND comp_id = 2056555602756063234
+					 AND ci.invoice_time &gt;= CURDATE()
+					 AND ci.invoice_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY ))                            smjbr,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci
+				   WHERE ci.del_flag = '0'
+					 AND comp_id = 2056555602756063234
+					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01')) smjby,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci
+				   WHERE ci.del_flag = '0'
+					 AND comp_id = 2056555602756063234
+					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
+					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01'))  smjbn,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci
+				   WHERE ci.del_flag = '0'
+					 AND comp_id = 2056556317461270529
+					 AND ci.invoice_time &gt;= CURDATE()
+					 AND ci.invoice_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY ))                            jxcbr,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci
+				   WHERE ci.del_flag = '0'
+					 AND comp_id = 2056556317461270529
+					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01')) jxcby,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci
+				   WHERE ci.del_flag = '0'
+					 AND comp_id = 2056556317461270529
+					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
+					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01'))  jxcbn,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci
+				   WHERE ci.del_flag = '0'
+					 AND comp_id = 2056556421857497090
+					 AND ci.invoice_time &gt;= CURDATE()
+					 AND ci.invoice_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY ))                            tfbr,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci
+				   WHERE ci.del_flag = '0'
+					 AND comp_id = 2056556421857497090
+					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01')) tfby,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci
+				   WHERE ci.del_flag = '0'
+					 AND comp_id = 2056556421857497090
+					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
+					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01'))  tfbn,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci
+				   WHERE ci.del_flag = '0'
+					 AND comp_id = 2056556535640576002
+					 AND ci.invoice_time &gt;= CURDATE()
+					 AND ci.invoice_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY ))                            ymjbr,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci
+				   WHERE ci.del_flag = '0'
+					 AND comp_id = 2056556535640576002
+					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01')) ymjby,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci
+				   WHERE ci.del_flag = '0'
+					 AND comp_id = 2056556535640576002
+					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
+					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01'))  ymjbn
 	</select>
-    <select id="homeZgs" resultType="com.by4cloud.platformx.business.vo.HomeZgsVo">
-		SELECT
-		(
-		SELECT
-		sum( ci.invoice_total_price_tax )
-		FROM
-		contract_invoice ci,
-		contract c,
-		business_customer bc
-		WHERE
-		ci.del_flag = '0'
-		AND bc.del_flag = '0'
-		AND c.del_flag = '0'
-		AND ci.contract_id = c.id
-		AND bc.id = c.party_a_id
-		AND bc.area_id = '2'
-		AND ci.comp_id = #{compId}
-		AND ci.invoice_time &gt;= CURDATE()
-		AND ci.invoice_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) hbbr,
-		(
-		SELECT
-		sum( ci.invoice_total_price_tax )
-		FROM
-		contract_invoice ci,
-		contract c,
-		business_customer bc
-		WHERE
-		ci.del_flag = '0'
-		AND bc.del_flag = '0'
-		AND c.del_flag = '0'
-		AND ci.contract_id = c.id
-		AND bc.id = c.party_a_id
-		AND bc.area_id = '2'
-		  AND ci.comp_id = #{compId}
-		AND ci.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
-		AND ci.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) hbby,
-		(
-		SELECT
-		sum( ci.invoice_total_price_tax )
-		FROM
-		contract_invoice ci,
-		contract c,
-		business_customer bc
-		WHERE
-		ci.del_flag = '0'
-		AND bc.del_flag = '0'
-		AND c.del_flag = '0'
-		AND ci.contract_id = c.id
-		AND bc.id = c.party_a_id
-		AND bc.area_id = '2'
-		  AND ci.comp_id = #{compId}
-		AND ci.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-		AND ci.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )) hbbn,
-		(
-		SELECT
-		sum( ci.invoice_total_price_tax )
-		FROM
-		contract_invoice ci,
-		contract c,
-		business_customer bc
-		WHERE
-		ci.del_flag = '0'
-		AND bc.del_flag = '0'
-		AND c.del_flag = '0'
-		AND ci.contract_id = c.id
-		AND bc.id = c.party_a_id
-		AND bc.area_id = '6'
-		  AND ci.comp_id = #{compId}
-		AND ci.invoice_time &gt;= CURDATE()
-		AND ci.invoice_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) xbbr,
-		(
-		SELECT
-		sum( ci.invoice_total_price_tax )
-		FROM
-		contract_invoice ci,
-		contract c,
-		business_customer bc
-		WHERE
-		ci.del_flag = '0'
-		AND bc.del_flag = '0'
-		AND c.del_flag = '0'
-		AND ci.contract_id = c.id
-		AND bc.id = c.party_a_id
-		AND bc.area_id = '6'
-		  AND ci.comp_id = #{compId}
-		AND ci.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
-		AND ci.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) xbby,
-		(
-		SELECT
-		sum( ci.invoice_total_price_tax )
-		FROM
-		contract_invoice ci,
-		contract c,
-		business_customer bc
-		WHERE
-		ci.del_flag = '0'
-		AND bc.del_flag = '0'
-		AND c.del_flag = '0'
-		AND ci.contract_id = c.id
-		AND bc.id = c.party_a_id
-		AND bc.area_id = '2'
-		  AND ci.comp_id = #{compId}
-		AND ci.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-		AND ci.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )) xbbn,
-		(
-		SELECT
-		sum( ci.invoice_total_price_tax )
-		FROM
-		contract_invoice ci,
-		contract c,
-		business_customer bc
-		WHERE
-		ci.del_flag = '0'
-		AND bc.del_flag = '0'
-		AND c.del_flag = '0'
-		AND ci.contract_id = c.id
-		AND bc.id = c.party_a_id
-		AND bc.area_id = '1'
-		  AND ci.comp_id = #{compId}
-		AND ci.invoice_time &gt;= CURDATE()
-		AND ci.invoice_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) dbbr,
-		(
-		SELECT
-		sum( ci.invoice_total_price_tax )
-		FROM
-		contract_invoice ci,
-		contract c,
-		business_customer bc
-		WHERE
-		ci.del_flag = '0'
-		AND bc.del_flag = '0'
-		AND c.del_flag = '0'
-		AND ci.contract_id = c.id
-		AND bc.id = c.party_a_id
-		AND bc.area_id = '1'
-		  AND ci.comp_id = #{compId}
-		AND ci.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
-		AND ci.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) dbby,
-		(
-		SELECT
-		sum( ci.invoice_total_price_tax )
-		FROM
-		contract_invoice ci,
-		contract c,
-		business_customer bc
-		WHERE
-		ci.del_flag = '0'
-		AND bc.del_flag = '0'
-		AND c.del_flag = '0'
-		AND ci.contract_id = c.id
-		AND bc.id = c.party_a_id
-		AND bc.area_id = '1'
-		  AND ci.comp_id = #{compId}
-		AND ci.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-		AND ci.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )) dbbn,
-		(
-			SELECT
-				sum( ci.invoice_total_price_tax )
-			FROM
-				contract_invoice ci,
-				contract c,
-				business_customer bc
-			WHERE
-				ci.del_flag = '0'
-			  AND bc.del_flag = '0'
-			  AND c.del_flag = '0'
-			  AND ci.contract_id = c.id
-			  AND bc.id = c.party_a_id
-			  AND bc.area_id = '3'
-			  AND ci.comp_id = #{compId}
-			  AND ci.invoice_time &gt;= CURDATE()
-			  AND ci.invoice_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) hdbr,
-		(
-			SELECT
-				sum( ci.invoice_total_price_tax )
-			FROM
-				contract_invoice ci,
-				contract c,
-				business_customer bc
-			WHERE
-				ci.del_flag = '0'
-			  AND bc.del_flag = '0'
-			  AND c.del_flag = '0'
-			  AND ci.contract_id = c.id
-			  AND bc.id = c.party_a_id
-			  AND bc.area_id = '3'
-			  AND ci.comp_id = #{compId}
-			  AND ci.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
-			  AND ci.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) hdby,
-		(
-			SELECT
-				sum( ci.invoice_total_price_tax )
-			FROM
-				contract_invoice ci,
-				contract c,
-				business_customer bc
-			WHERE
-				ci.del_flag = '0'
-			  AND bc.del_flag = '0'
-			  AND c.del_flag = '0'
-			  AND ci.contract_id = c.id
-			  AND bc.id = c.party_a_id
-			  AND bc.area_id = '3'
-			  AND ci.comp_id = #{compId}
-			  AND ci.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-			  AND ci.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )) hdbn,
-		(
-			SELECT
-				sum( ci.invoice_total_price_tax )
-			FROM
-				contract_invoice ci,
-				contract c,
-				business_customer bc
-			WHERE
-				ci.del_flag = '0'
-			  AND bc.del_flag = '0'
-			  AND c.del_flag = '0'
-			  AND ci.contract_id = c.id
-			  AND bc.id = c.party_a_id
-			  AND bc.area_id = '4'
-			  AND ci.comp_id = #{compId}
-			  AND ci.invoice_time &gt;= CURDATE()
-			  AND ci.invoice_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) znbr,
-		(
-			SELECT
-				sum( ci.invoice_total_price_tax )
-			FROM
-				contract_invoice ci,
-				contract c,
-				business_customer bc
-			WHERE
-				ci.del_flag = '0'
-			  AND bc.del_flag = '0'
-			  AND c.del_flag = '0'
-			  AND ci.contract_id = c.id
-			  AND bc.id = c.party_a_id
-			  AND bc.area_id = '4'
-			  AND ci.comp_id = #{compId}
-			  AND ci.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
-			  AND ci.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) znby,
-		(
-			SELECT
-				sum( ci.invoice_total_price_tax )
-			FROM
-				contract_invoice ci,
-				contract c,
-				business_customer bc
-			WHERE
-				ci.del_flag = '0'
-			  AND bc.del_flag = '0'
-			  AND c.del_flag = '0'
-			  AND ci.contract_id = c.id
-			  AND bc.id = c.party_a_id
-			  AND bc.area_id = '4'
-			  AND ci.comp_id = #{compId}
-			  AND ci.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-			  AND ci.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )) znbn,
-		(
-			SELECT
-				sum( ci.invoice_total_price_tax )
-			FROM
-				contract_invoice ci,
-				contract c,
-				business_customer bc
-			WHERE
-				ci.del_flag = '0'
-			  AND bc.del_flag = '0'
-			  AND c.del_flag = '0'
-			  AND ci.contract_id = c.id
-			  AND bc.id = c.party_a_id
-			  AND bc.area_id = '5'
-			  AND ci.comp_id = #{compId}
-			  AND ci.invoice_time &gt;= CURDATE()
-			  AND ci.invoice_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) xnbr,
-		(
-			SELECT
-				sum( ci.invoice_total_price_tax )
-			FROM
-				contract_invoice ci,
-				contract c,
-				business_customer bc
-			WHERE
-				ci.del_flag = '0'
-			  AND bc.del_flag = '0'
-			  AND c.del_flag = '0'
-			  AND ci.contract_id = c.id
-			  AND bc.id = c.party_a_id
-			  AND bc.area_id = '5'
-			  AND ci.comp_id = #{compId}
-			  AND ci.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
-			  AND ci.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) xnby,
-		(
-			SELECT
-				sum( ci.invoice_total_price_tax )
-			FROM
-				contract_invoice ci,
-				contract c,
-				business_customer bc
-			WHERE
-				ci.del_flag = '0'
-			  AND bc.del_flag = '0'
-			  AND c.del_flag = '0'
-			  AND ci.contract_id = c.id
-			  AND bc.id = c.party_a_id
-			  AND bc.area_id = '5'
-			  AND ci.comp_id = #{compId}
-			  AND ci.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-			  AND ci.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )) xnbn,
-		(
-		SELECT
-		sum( ci.invoice_total_price_tax )
-		FROM
-		contract_invoice ci,
-		contract c,
-		business_customer bc
-		WHERE
-		ci.del_flag = '0'
-		AND bc.del_flag = '0'
-		AND c.del_flag = '0'
-		AND ci.contract_id = c.id
-		AND bc.id = c.party_a_id
-		AND bc.export_service_attr = '2'
-		  AND ci.comp_id = #{compId}
-		AND ci.invoice_time &gt;= CURDATE()
-		AND ci.invoice_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) hwbr,
-		(
-		SELECT
-		sum( ci.invoice_total_price_tax )
-		FROM
-		contract_invoice ci,
-		contract c,
-		business_customer bc
-		WHERE
-		ci.del_flag = '0'
-		AND bc.del_flag = '0'
-		AND c.del_flag = '0'
-		AND ci.contract_id = c.id
-		AND bc.id = c.party_a_id
-		AND bc.export_service_attr = '2'
-		  AND ci.comp_id = #{compId}
-		AND ci.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
-		AND ci.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) hwby,
-		(
-		SELECT
-		sum( ci.invoice_total_price_tax )
-		FROM
-		contract_invoice ci,
-		contract c,
-		business_customer bc
-		WHERE
-		ci.del_flag = '0'
-		AND bc.del_flag = '0'
-		AND c.del_flag = '0'
-		AND ci.contract_id = c.id
-		AND bc.id = c.party_a_id
-		AND bc.area_id = '2'
-		  AND ci.comp_id = #{compId}
-		AND ci.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-		AND ci.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )) hwbn
+	<select id="homeZgs" resultType="com.by4cloud.platformx.business.vo.HomeZgsVo">
+		SELECT (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci,
+						contract c,
+						business_customer bc
+				   WHERE ci.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND c.del_flag = '0'
+					 AND ci.contract_id = c.id
+					 AND bc.id = c.party_a_id
+					 AND bc.area_id = '2'
+					 AND ci.comp_id = #{compId}
+					 AND ci.invoice_time &gt;= CURDATE()
+					 AND ci.invoice_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY ))                            hbbr,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci,
+						contract c,
+						business_customer bc
+				   WHERE ci.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND c.del_flag = '0'
+					 AND ci.contract_id = c.id
+					 AND bc.id = c.party_a_id
+					 AND bc.area_id = '2'
+					 AND ci.comp_id = #{compId}
+					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01')) hbby,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci,
+						contract c,
+						business_customer bc
+				   WHERE ci.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND c.del_flag = '0'
+					 AND ci.contract_id = c.id
+					 AND bc.id = c.party_a_id
+					 AND bc.area_id = '2'
+					 AND ci.comp_id = #{compId}
+					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
+					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01'))  hbbn,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci,
+						contract c,
+						business_customer bc
+				   WHERE ci.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND c.del_flag = '0'
+					 AND ci.contract_id = c.id
+					 AND bc.id = c.party_a_id
+					 AND bc.area_id = '6'
+					 AND ci.comp_id = #{compId}
+					 AND ci.invoice_time &gt;= CURDATE()
+					 AND ci.invoice_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY ))                            xbbr,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci,
+						contract c,
+						business_customer bc
+				   WHERE ci.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND c.del_flag = '0'
+					 AND ci.contract_id = c.id
+					 AND bc.id = c.party_a_id
+					 AND bc.area_id = '6'
+					 AND ci.comp_id = #{compId}
+					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01')) xbby,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci,
+						contract c,
+						business_customer bc
+				   WHERE ci.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND c.del_flag = '0'
+					 AND ci.contract_id = c.id
+					 AND bc.id = c.party_a_id
+					 AND bc.area_id = '2'
+					 AND ci.comp_id = #{compId}
+					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
+					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01'))  xbbn,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci,
+						contract c,
+						business_customer bc
+				   WHERE ci.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND c.del_flag = '0'
+					 AND ci.contract_id = c.id
+					 AND bc.id = c.party_a_id
+					 AND bc.area_id = '1'
+					 AND ci.comp_id = #{compId}
+					 AND ci.invoice_time &gt;= CURDATE()
+					 AND ci.invoice_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY ))                            dbbr,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci,
+						contract c,
+						business_customer bc
+				   WHERE ci.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND c.del_flag = '0'
+					 AND ci.contract_id = c.id
+					 AND bc.id = c.party_a_id
+					 AND bc.area_id = '1'
+					 AND ci.comp_id = #{compId}
+					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01')) dbby,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci,
+						contract c,
+						business_customer bc
+				   WHERE ci.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND c.del_flag = '0'
+					 AND ci.contract_id = c.id
+					 AND bc.id = c.party_a_id
+					 AND bc.area_id = '1'
+					 AND ci.comp_id = #{compId}
+					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
+					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01'))  dbbn,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci,
+						contract c,
+						business_customer bc
+				   WHERE ci.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND c.del_flag = '0'
+					 AND ci.contract_id = c.id
+					 AND bc.id = c.party_a_id
+					 AND bc.area_id = '3'
+					 AND ci.comp_id = #{compId}
+					 AND ci.invoice_time &gt;= CURDATE()
+					 AND ci.invoice_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY ))                            hdbr,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci,
+						contract c,
+						business_customer bc
+				   WHERE ci.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND c.del_flag = '0'
+					 AND ci.contract_id = c.id
+					 AND bc.id = c.party_a_id
+					 AND bc.area_id = '3'
+					 AND ci.comp_id = #{compId}
+					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01')) hdby,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci,
+						contract c,
+						business_customer bc
+				   WHERE ci.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND c.del_flag = '0'
+					 AND ci.contract_id = c.id
+					 AND bc.id = c.party_a_id
+					 AND bc.area_id = '3'
+					 AND ci.comp_id = #{compId}
+					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
+					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01'))  hdbn,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci,
+						contract c,
+						business_customer bc
+				   WHERE ci.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND c.del_flag = '0'
+					 AND ci.contract_id = c.id
+					 AND bc.id = c.party_a_id
+					 AND bc.area_id = '4'
+					 AND ci.comp_id = #{compId}
+					 AND ci.invoice_time &gt;= CURDATE()
+					 AND ci.invoice_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY ))                            znbr,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci,
+						contract c,
+						business_customer bc
+				   WHERE ci.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND c.del_flag = '0'
+					 AND ci.contract_id = c.id
+					 AND bc.id = c.party_a_id
+					 AND bc.area_id = '4'
+					 AND ci.comp_id = #{compId}
+					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01')) znby,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci,
+						contract c,
+						business_customer bc
+				   WHERE ci.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND c.del_flag = '0'
+					 AND ci.contract_id = c.id
+					 AND bc.id = c.party_a_id
+					 AND bc.area_id = '4'
+					 AND ci.comp_id = #{compId}
+					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
+					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01'))  znbn,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci,
+						contract c,
+						business_customer bc
+				   WHERE ci.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND c.del_flag = '0'
+					 AND ci.contract_id = c.id
+					 AND bc.id = c.party_a_id
+					 AND bc.area_id = '5'
+					 AND ci.comp_id = #{compId}
+					 AND ci.invoice_time &gt;= CURDATE()
+					 AND ci.invoice_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY ))                            xnbr,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci,
+						contract c,
+						business_customer bc
+				   WHERE ci.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND c.del_flag = '0'
+					 AND ci.contract_id = c.id
+					 AND bc.id = c.party_a_id
+					 AND bc.area_id = '5'
+					 AND ci.comp_id = #{compId}
+					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01')) xnby,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci,
+						contract c,
+						business_customer bc
+				   WHERE ci.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND c.del_flag = '0'
+					 AND ci.contract_id = c.id
+					 AND bc.id = c.party_a_id
+					 AND bc.area_id = '5'
+					 AND ci.comp_id = #{compId}
+					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
+					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01'))  xnbn,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci,
+						contract c,
+						business_customer bc
+				   WHERE ci.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND c.del_flag = '0'
+					 AND ci.contract_id = c.id
+					 AND bc.id = c.party_a_id
+					 AND bc.export_service_attr = '2'
+					 AND ci.comp_id = #{compId}
+					 AND ci.invoice_time &gt;= CURDATE()
+					 AND ci.invoice_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY ))                            hwbr,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci,
+						contract c,
+						business_customer bc
+				   WHERE ci.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND c.del_flag = '0'
+					 AND ci.contract_id = c.id
+					 AND bc.id = c.party_a_id
+					 AND bc.export_service_attr = '2'
+					 AND ci.comp_id = #{compId}
+					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01')) hwby,
+			   (
+				   SELECT sum(ci.invoice_total_price_tax)
+				   FROM contract_invoice ci,
+						contract c,
+						business_customer bc
+				   WHERE ci.del_flag = '0'
+					 AND bc.del_flag = '0'
+					 AND c.del_flag = '0'
+					 AND ci.contract_id = c.id
+					 AND bc.id = c.party_a_id
+					 AND bc.area_id = '2'
+					 AND ci.comp_id = #{compId}
+					 AND ci.invoice_time &gt;= DATE_FORMAT(CURDATE(), '%Y-01-01')
+					 AND ci.invoice_time &lt; DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01'))  hwbn
 	</select>
-    <select id="pageInvoice" resultType="com.by4cloud.platformx.business.vo.HomeInvoiceVo">
+	<select id="pageInvoice" resultType="com.by4cloud.platformx.business.vo.HomeInvoiceVo">
 		SELECT
 		t.id,
 		t.contract_id,
@@ -572,10 +462,10 @@
 		WHERE
 		t.del_flag = '0'
 		<if test="queryDTO.queryCompId !=null and queryDTO.queryCompId !=''">
-			AND t.comp_id =  #{queryDTO.queryCompId}
+			AND t.comp_id = #{queryDTO.queryCompId}
 		</if>
 		<if test="queryDTO.invoiceCategory !=null and queryDTO.invoiceCategory !=''">
-			AND t.invoice_category =  #{queryDTO.invoiceCategory}
+			AND t.invoice_category = #{queryDTO.invoiceCategory}
 		</if>
 		<if test="queryDTO.contractNo !=null and queryDTO.contractNo !=''">
 			AND t1.contract_no LIKE CONCAT('%', #{queryDTO.contractNo}, '%')
@@ -584,103 +474,104 @@
 			AND t2.company_name LIKE CONCAT('%', #{queryDTO.partyA}, '%')
 		</if>
 		<if test="queryDTO.queryArea !=null and queryDTO.queryArea !=''">
-			AND t2.class_id =  #{queryDTO.queryArea}
+			AND t2.class_id = #{queryDTO.queryArea}
 		</if>
 		<if test="queryDTO.queryServiceAttr !=null and queryDTO.queryServiceAttr !=''">
-			AND t2.export_service_attr =  #{queryDTO.queryServiceAttr}
+			AND t2.export_service_attr = #{queryDTO.queryServiceAttr}
 		</if>
 		<if test="queryDTO.queryType !=null and queryDTO.queryType !='' and queryDTO.queryType =='1'.toString()">
-			AND  t.invoice_time &gt;= CURDATE()
-			AND  t.invoice_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )
+			AND t.invoice_time &gt;= CURDATE()
+			AND t.invoice_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )
 		</if>
 		<if test="queryDTO.queryType !=null and queryDTO.queryType !='' and queryDTO.queryType =='2'.toString()">
-			AND  t.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-			AND  t.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )
+			AND t.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
+			AND t.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )
 		</if>
 		<if test="queryDTO.queryType !=null and queryDTO.queryType !='' and queryDTO.queryType =='3'.toString()">
-			AND  t.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
-			AND  t.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )
+			AND t.invoice_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
+			AND t.invoice_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )
 		</if>
 		<if test="queryDTO.startTime !=null and queryDTO.endTime !=null">
-			AND  t.invoice_time &gt;=  #{queryDTO.startTime}
-			AND  t.invoice_time &lt;=  #{queryDTO.endTime}
+			AND t.invoice_time &gt;= #{queryDTO.startTime}
+			AND t.invoice_time &lt;= #{queryDTO.endTime}
 		</if>
 		ORDER BY
 		t.create_time DESC
 	</select>
-    <select id="pageScope" resultType="com.by4cloud.platformx.business.vo.ContractInvoicePageVo">
+	<select id="pageScope" resultType="com.by4cloud.platformx.business.vo.ContractInvoicePageVo">
 		SELECT
-			id,
-			contract_no,
-			contract_name,
-			party_a_id,
-			party_a,
-			party_b_id,
-			party_b,
-			amount,
-			currency,
-			contract_type,
-			supply_attribute,
-			contract_status,
-			contract_attribute,
-			sign_date,
-			sign_place,
-			effective_date,
-			delivery_cycle,
-			expiration_date,
-			attachment_url,
-			remark,
-			parent_id,
-			approve_time,
-			arrival_schedule_id,
-			accept_schedule_id,
-			warranty_schedule_id,
-			erp_push_flag,
-			billing_status,
-			billing_amout,
-			next_schedule_name,
-			template_id,
-			sales_model,
-			paid_amount,
-			contract_category,
-			exec_frequency,
-			exec_times,
-			exec_day,
-			environment,
-			standard,
-			use_month,
-			after_ship_month,
-			ship_method,
-			ship_address,
-			packaging,
-			repair_period,
-			repair_breach_amount,
-			goods_short,
-			goods_short_breach_amount,
-			overdue_breach_amount,
-			terminate_contract,
-			court,
-			contract_attchment,
-			city,
-			region,
-			invoice_notice,
-			contract_tax,
-			economic_matters,
-			erp_contract_no,
-			data_id,
-			industry_code,
-			area_code,
-			create_by,
-			update_by,
-			create_time,
-			update_time,
-			del_flag,
-			comp_id,
-		       (select count(1) from contract_invoice ci where ci.del_flag = '0' and ci.contract_id = c.id) invoiceNum
+		id,
+		contract_no,
+		contract_name,
+		party_a_id,
+		party_a,
+		party_b_id,
+		party_b,
+		amount,
+		currency,
+		contract_type,
+		supply_attribute,
+		contract_status,
+		contract_attribute,
+		sign_date,
+		sign_place,
+		effective_date,
+		delivery_cycle,
+		expiration_date,
+		attachment_url,
+		remark,
+		parent_id,
+		approve_time,
+		arrival_schedule_id,
+		accept_schedule_id,
+		warranty_schedule_id,
+		erp_push_flag,
+		billing_status,
+		billing_amout,
+		next_schedule_name,
+		template_id,
+		sales_model,
+		paid_amount,
+		contract_category,
+		exec_frequency,
+		exec_times,
+		exec_day,
+		environment,
+		standard,
+		use_month,
+		after_ship_month,
+		ship_method,
+		ship_address,
+		packaging,
+		repair_period,
+		repair_breach_amount,
+		goods_short,
+		goods_short_breach_amount,
+		overdue_breach_amount,
+		terminate_contract,
+		court,
+		contract_attchment,
+		city,
+		region,
+		invoice_notice,
+		contract_tax,
+		economic_matters,
+		erp_contract_no,
+		data_id,
+		industry_code,
+		area_code,
+		create_by,
+		update_by,
+		create_time,
+		update_time,
+		del_flag,
+		comp_id,
+		(select count(1) from contract_invoice ci where ci.del_flag = '0' and ci.contract_id = c.id) invoiceNum,
+		(select planned_amount from contract_payment_schedule cps where cps.del_flag='0' and cps.stage_name='鍚堝悓绛捐' and cps.contract_id = c.id) advanceAmount
 		FROM
-			contract c
+		contract c
 		WHERE
-			del_flag = '0'
+		del_flag = '0'
 		<if test="queryDTO.contractNo !=null and queryDTO.contractNo !=''">
 			AND contract_no LIKE CONCAT('%', #{queryDTO.contractNo}, '%')
 		</if>
@@ -690,7 +581,13 @@
 		<if test="queryDTO.billingStatus !=null and queryDTO.billingStatus !=''">
 			AND billing_status = #{queryDTO.billingStatus}
 		</if>
+		<if test="queryDTO.advanceType !=null and queryDTO.advanceType !=''">
+			AND exists (select * from contract_payment_schedule cps where cps.del_flag='0' and
+			cps.stage_name='鍚堝悓绛捐' and cps.payment_ratio &gt; 0 and cps.contract_id = c.id)
+			AND not exists (select * from contract_out_bound cps where cps.del_flag='0' and
+			cps.contract_id = c.id)
+		</if>
 		ORDER BY
-			create_time ASC
+		create_time ASC
 	</select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1