From 96118de3ac74f5468cf5d4ac73d6ea3bec1da010 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 20 十一月 2026 14:36:25 +0800
Subject: [PATCH] feat:新增销售指标 产品板块 重点工作 专项业务 产品收入和合同统计修改功能 feat:承兑新增承兑编号字段 feat:客商主数据更新名称 专项业务去年同月字段 机动车销售发票地址字段及判断 feat:银行流水更新客户id feat:机动车销售发票新增税务及代码字段 feat:流水更新按钮参数 feat:检索新增标的物运维按钮
---
platformx-business-finance-biz/src/main/resources/mapper/ContractInvoiceMapper.xml | 59 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 16 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 2bb5061..972ecef 100644
--- a/platformx-business-finance-biz/src/main/resources/mapper/ContractInvoiceMapper.xml
+++ b/platformx-business-finance-biz/src/main/resources/mapper/ContractInvoiceMapper.xml
@@ -714,6 +714,15 @@
WHERE ci.del_flag = '0'
AND ci.invoice_time >= CURDATE()
AND ci.invoice_time < DATE_ADD(CURDATE(), INTERVAL 1 DAY )
+ <if test="compIds != null and compIds.size() > 0">
+ AND ci.comp_id IN
+ <foreach collection="compIds" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
+ <if test="compId!=null">
+ AND ci.comp_id = #{compId}
+ </if>
) AS br,
(
SELECT IFNULL(sum(ci.invoice_total_price_tax), 0)
@@ -722,6 +731,15 @@
AND ci.invoice_time >= DATE_FORMAT(CURDATE(), '%Y-%m-01')
AND ci.invoice_time < DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01')
+ <if test="compIds != null and compIds.size() > 0">
+ AND ci.comp_id IN
+ <foreach collection="compIds" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
+ <if test="compId!=null">
+ AND ci.comp_id = #{compId}
+ </if>
) AS bm,
(
SELECT IFNULL(sum(ci.invoice_total_price_tax), 0)
@@ -730,6 +748,15 @@
AND ci.invoice_time >= DATE_FORMAT(CURDATE(), '%Y-01-01')
AND ci.invoice_time < DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01')
+ <if test="compIds != null and compIds.size() > 0">
+ AND ci.comp_id IN
+ <foreach collection="compIds" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
+ <if test="compId!=null">
+ AND ci.comp_id = #{compId}
+ </if>
) AS bn
</select>
<select id="zbjtIndicatorTrend" resultType="com.by4cloud.platformx.business.vo.ZbjtIndicatorTrendVo">
@@ -875,7 +902,7 @@
IFNULL(sum( invoice_total_price_tax ),0) wc
FROM
contract_invoice ci
- LEFT JOIN contract c ON c.id = ci.contract_id
+ JOIN contract c ON c.id = ci.contract_id
AND c.supply_attribute = #{type}
AND ( c.comp_id = 2089995177814495234 OR c.comp_id = 2089996921978040321 OR c.comp_id = 2089997578009128962 OR c.comp_id = 2101966257365045249 )
WHERE
@@ -890,7 +917,7 @@
IFNULL(sum( invoice_total_price_tax ),0) wc
FROM
contract_invoice ci
- LEFT JOIN contract c ON c.id = ci.contract_id
+ JOIN contract c ON c.id = ci.contract_id
AND c.supply_attribute = #{type}
AND c.comp_id = 2056556196124250113
@@ -906,7 +933,7 @@
IFNULL(sum( invoice_total_price_tax ),0) wc
FROM
contract_invoice ci
- LEFT JOIN contract c ON c.id = ci.contract_id
+ JOIN contract c ON c.id = ci.contract_id
AND c.supply_attribute = #{type}
AND c.comp_id = 2056556317461270529
@@ -922,7 +949,7 @@
IFNULL(sum( invoice_total_price_tax ),0) wc
FROM
contract_invoice ci
- LEFT JOIN contract c ON c.id = ci.contract_id
+ JOIN contract c ON c.id = ci.contract_id
AND c.supply_attribute = #{type}
AND c.comp_id = 2056556421857497090
WHERE
@@ -938,7 +965,7 @@
IFNULL(sum( invoice_total_price_tax ),0) wc
FROM
contract_invoice ci
- LEFT JOIN contract c ON c.id = ci.contract_id
+ JOIN contract c ON c.id = ci.contract_id
AND c.supply_attribute = #{type}
AND ( c.comp_id = 2089995177814495234 OR c.comp_id = 2089996921978040321 OR c.comp_id = 2089997578009128962 OR c.comp_id = 2101966257365045249 )
WHERE
@@ -953,7 +980,7 @@
IFNULL(sum( invoice_total_price_tax ),0) wc
FROM
contract_invoice ci
- LEFT JOIN contract c ON c.id = ci.contract_id
+ JOIN contract c ON c.id = ci.contract_id
AND c.supply_attribute = #{type}
AND c.comp_id = 2056556196124250113
@@ -969,7 +996,7 @@
IFNULL(sum( invoice_total_price_tax ),0) wc
FROM
contract_invoice ci
- LEFT JOIN contract c ON c.id = ci.contract_id
+ JOIN contract c ON c.id = ci.contract_id
AND c.supply_attribute = #{type}
AND c.comp_id = 2056556317461270529
@@ -985,7 +1012,7 @@
IFNULL(sum( invoice_total_price_tax ),0) wc
FROM
contract_invoice ci
- LEFT JOIN contract c ON c.id = ci.contract_id
+ JOIN contract c ON c.id = ci.contract_id
AND c.supply_attribute = #{type}
AND c.comp_id = 2056556421857497090
WHERE
@@ -1001,9 +1028,9 @@
IFNULL(sum( invoice_total_price_tax ),0) wc
FROM
contract_invoice ci
- INNER JOIN contract c ON c.id = ci.contract_id
+ JOIN contract c ON c.id = ci.contract_id
AND ( c.comp_id = 2089995177814495234 OR c.comp_id = 2089996921978040321 OR c.comp_id = 2089997578009128962 OR c.comp_id = 2101966257365045249 )
- INNER JOIN business_customer bc ON bc.id = c.party_a_id
+ JOIN business_customer bc ON bc.id = c.party_a_id
AND bc.export_service_attr = '2'
WHERE
ci.del_flag = '0' UNION ALL
@@ -1014,9 +1041,9 @@
IFNULL(sum( invoice_total_price_tax ),0) wc
FROM
contract_invoice ci
- INNER JOIN contract c ON c.id = ci.contract_id
+ JOIN contract c ON c.id = ci.contract_id
AND c.comp_id = 2056556196124250113
- INNER JOIN business_customer bc ON bc.id = c.party_a_id
+ JOIN business_customer bc ON bc.id = c.party_a_id
AND bc.export_service_attr = '2'
WHERE
ci.del_flag = '0' UNION ALL
@@ -1027,9 +1054,9 @@
IFNULL(sum( invoice_total_price_tax ),0) wc
FROM
contract_invoice ci
- INNER JOIN contract c ON c.id = ci.contract_id
+ JOIN contract c ON c.id = ci.contract_id
AND c.comp_id = 2056556317461270529
- INNER JOIN business_customer bc ON bc.id = c.party_a_id
+ JOIN business_customer bc ON bc.id = c.party_a_id
AND bc.export_service_attr = '2'
WHERE
ci.del_flag = '0' UNION ALL
@@ -1040,9 +1067,9 @@
IFNULL(sum( invoice_total_price_tax ),0) wc
FROM
contract_invoice ci
- INNER JOIN contract c ON c.id = ci.contract_id
+ JOIN contract c ON c.id = ci.contract_id
AND c.comp_id = 2056556421857497090
- INNER JOIN business_customer bc ON bc.id = c.party_a_id
+ JOIN business_customer bc ON bc.id = c.party_a_id
AND bc.export_service_attr = '2'
WHERE
ci.del_flag = '0'
--
Gitblit v1.9.1