From c5ea85558fea4d82b5368073c598a30f905c4bdc Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 23 十月 2026 17:11:49 +0800
Subject: [PATCH] feat:新增统计标注功能

---
 platformx-business-finance-biz/src/main/resources/mapper/ContractInvoiceMapper.xml |  245 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 242 insertions(+), 3 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 4dc90be..24bf251 100644
--- a/platformx-business-finance-biz/src/main/resources/mapper/ContractInvoiceMapper.xml
+++ b/platformx-business-finance-biz/src/main/resources/mapper/ContractInvoiceMapper.xml
@@ -468,6 +468,9 @@
 		<if test="queryDTO.invoiceCategory !=null and queryDTO.invoiceCategory !=''">
 			AND t.invoice_category = #{queryDTO.invoiceCategory}
 		</if>
+		<if test="queryDTO.isMerge !=null and queryDTO.isMerge !=''">
+			AND t.is_merge = #{queryDTO.isMerge}
+		</if>
 		<if test="queryDTO.bwRequestResult !=null and queryDTO.bwRequestResult !=''">
 			AND t.bw_request_result = #{queryDTO.bwRequestResult}
 		</if>
@@ -477,8 +480,8 @@
 		<if test="queryDTO.partyA !=null and queryDTO.partyA !=''">
 			AND t2.company_name LIKE CONCAT('%', #{queryDTO.partyA}, '%')
 		</if>
-		<if test="queryDTO.queryArea !=null and queryDTO.queryArea !=''">
-			AND t2.class_id = #{queryDTO.queryArea}
+		<if test="queryDTO.queryProvince !=null and queryDTO.queryProvince !=''">
+			AND t2.province =  #{queryDTO.queryProvince}
 		</if>
 		<if test="queryDTO.queryServiceAttr !=null and queryDTO.queryServiceAttr !=''">
 			AND t2.export_service_attr = #{queryDTO.queryServiceAttr}
@@ -570,7 +573,7 @@
 		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 count(1) from contract_invoice ci where ci.del_flag = '0' and (ci.contract_id = c.id or FIND_IN_SET(c.id,REPLACE(REPLACE(ci.contract_ids,'[', ''), ']', '')))) 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
@@ -594,4 +597,240 @@
 		ORDER BY
 		create_time ASC
 	</select>
+    <select id="homeZgsData" resultType="com.by4cloud.platformx.business.vo.HomeZgsData">
+		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 c.party_b_id = #{compId}
+		AND bc.province=#{province}
+		AND ci.invoice_time &gt;= CURDATE()
+		AND ci.invoice_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) kpbr,
+		(
+		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 c.party_b_id = #{compId}
+		  AND bc.province=#{province}
+		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' )) kpby,
+		(
+		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 c.party_b_id = #{compId}
+		  AND bc.province=#{province}
+		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-%m-01' )) kpbn,
+		(
+		SELECT
+		sum(ps.payment_amount)
+		FROM
+		payment_slip ps,
+		business_customer bc
+		WHERE
+		ps.del_flag = '0'
+		AND bc.del_flag = '0'
+		AND bc.id = ps.bus_guest_id
+		  AND ps.comp_id = #{compId}
+		  AND bc.province=#{province}
+		AND ps.payment_time &gt;= CURDATE()
+		AND ps.payment_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) skbr,
+		(
+		SELECT
+		sum(ps.payment_amount)
+		FROM
+		payment_slip ps,
+		business_customer bc
+		WHERE
+		ps.del_flag = '0'
+		AND bc.del_flag = '0'
+		AND bc.id = ps.bus_guest_id
+		  AND ps.comp_id = #{compId}
+		  AND bc.province=#{province}
+		AND ps.payment_time &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
+		AND ps.payment_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) skby,
+		(
+		SELECT
+		sum(ps.payment_amount)
+		FROM
+		payment_slip ps,
+		business_customer bc
+		WHERE
+		ps.del_flag = '0'
+		AND bc.del_flag = '0'
+		AND bc.id = ps.bus_guest_id
+		  AND ps.comp_id = #{compId}
+		  AND bc.province=#{province}
+		AND ps.payment_time &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
+		AND ps.payment_time &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-%m-01' )) skbn,
+		(
+		SELECT
+			sum( c.amount )
+		FROM
+		contract c
+		LEFT JOIN business_customer bc ON bc.id = c.party_a_id
+		WHERE
+		    c.del_flag = '0'
+			AND c.party_b_id = #{compId}
+			AND bc.province=#{province}
+		AND c.sign_date &gt;= CURDATE()
+		AND c.sign_date &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )) htbr,
+		(
+		SELECT
+			sum( c.amount )
+		FROM
+		contract c
+		LEFT JOIN business_customer bc ON bc.id = c.party_a_id
+		WHERE
+			c.del_flag = '0'
+		  AND c.party_b_id = #{compId}
+		  AND bc.province=#{province}
+		AND c.sign_date &gt;= DATE_FORMAT( CURDATE(), '%Y-%m-01' )
+		AND c.sign_date &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) htby,
+		(
+		SELECT
+			sum( c.amount )
+		FROM
+		contract c
+		LEFT JOIN business_customer bc ON bc.id = c.party_a_id
+		WHERE
+			c.del_flag = '0'
+		  AND c.party_b_id = #{compId}
+		  AND bc.province=#{province}
+		AND c.sign_date &gt;= DATE_FORMAT( CURDATE(), '%Y-01-01' )
+		AND c.sign_date &lt; DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-%m-01' )) htbn
+	</select>
+    <select id="zbjtStatisticByInvoice" resultType="com.by4cloud.platformx.business.vo.ZbjtStatisticVo">
+		SELECT
+		(
+		SELECT
+		IFNULL(sum( ci.invoice_total_price_tax ) ,0)
+		FROM
+		contract_invoice ci
+		WHERE
+		ci.del_flag = '0'
+		AND ci.invoice_time &gt;= CURDATE()
+		AND ci.invoice_time &lt; DATE_ADD( CURDATE(), INTERVAL 1 DAY )
+		) AS br,
+		(
+		SELECT
+		IFNULL(sum( ci.invoice_total_price_tax ) ,0)
+		FROM
+		contract_invoice ci
+		WHERE
+		ci.del_flag = '0'
+
+		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' )
+		) AS bm,
+		(
+		SELECT
+		IFNULL(sum( ci.invoice_total_price_tax ) ,0)
+		FROM
+		contract_invoice ci
+		WHERE
+		ci.del_flag = '0'
+
+		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' )
+		) AS bn
+	</select>
+	<select id="zbjtIndicatorTrend" resultType="com.by4cloud.platformx.business.vo.ZbjtIndicatorTrendVo">
+		WITH RECURSIVE month_series AS (
+		SELECT
+		DATE( #{startMon} ) AS month_start UNION ALL
+		SELECT
+		DATE_ADD( month_start, INTERVAL 1 MONTH )
+		FROM
+		month_series
+		WHERE
+		month_start &lt; DATE(#{endMon} )
+		) SELECT
+		DATE_FORMAT( ms.month_start, '%Y-%m' ) AS `yearMon`,
+		COALESCE ( SUM( c.invoice_total_price_tax ), 0 ) AS `je`
+		FROM
+		month_series ms
+		LEFT JOIN contract_invoice c ON DATE_FORMAT( c.invoice_time, '%Y-%m' ) = DATE_FORMAT( ms.month_start, '%Y-%m' )
+		GROUP BY
+		ms.month_start
+		ORDER BY
+		ms.month_start;
+	</select>
+	<select id="zbjtPlanAchieced" resultType="com.by4cloud.platformx.business.vo.ZbjtIndicatorTrendVo">
+		WITH RECURSIVE month_series AS (
+			SELECT
+				DATE_FORMAT( CURDATE(), '%Y-%m-01' ) AS month_start UNION ALL
+			SELECT
+				DATE_SUB( month_start, INTERVAL 1 MONTH )
+			FROM
+				month_series
+			WHERE
+				month_start &gt; DATE_SUB( DATE_FORMAT( CURDATE(), '%Y-%m-01' ), INTERVAL 11 MONTH )
+		) SELECT
+			  DATE_FORMAT( ms.month_start, '%m' ) AS `yearMon`,
+			  COALESCE ( SUM( ci.invoice_total_price_tax ), 0 ) AS `je`
+		FROM
+			month_series ms
+				LEFT JOIN contract_invoice ci ON DATE_FORMAT( ci.invoice_time, '%Y-%m' ) = DATE_FORMAT( ms.month_start, '%Y-%m' )
+				AND ci.del_flag = '0'
+				<if test="compId !=null">
+					AND ci.comp_id = #{compId}
+				</if>
+		GROUP BY
+			ms.month_start
+		ORDER BY
+			ms.month_start ASC;
+	</select>
+	<select id="zbjtPlanAchiecedSmj" resultType="com.by4cloud.platformx.business.vo.ZbjtIndicatorTrendVo">
+		WITH RECURSIVE month_series AS (
+		SELECT
+		DATE_FORMAT( CURDATE(), '%Y-%m-01' ) AS month_start UNION ALL
+		SELECT
+		DATE_SUB( month_start, INTERVAL 1 MONTH )
+		FROM
+		month_series
+		WHERE
+		month_start &gt; DATE_SUB( DATE_FORMAT( CURDATE(), '%Y-%m-01' ), INTERVAL 11 MONTH )
+		) SELECT
+		DATE_FORMAT( ms.month_start, '%m' ) AS `yearMon`,
+		COALESCE ( SUM( ci.invoice_total_price_tax ), 0 ) AS `je`
+		FROM
+		month_series ms
+		LEFT JOIN contract_invoice ci ON DATE_FORMAT( ci.invoice_time, '%Y-%m' ) = DATE_FORMAT( ms.month_start, '%Y-%m' )
+		AND ci.del_flag = '0'
+			AND (ci.comp_id = 2089995177814495234 or ci.comp_id = 2089996921978040321 or ci.comp_id = 2089997578009128962 or ci.comp_id = 2101966257365045249)
+		GROUP BY
+		ms.month_start
+		ORDER BY
+		ms.month_start ASC;
+	</select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1