From c5c284896ce6428cffc5092e9cdef4fefc23409f Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 18 九月 2026 17:12:49 +0800
Subject: [PATCH] feat: 石煤机客商产品查询处理 合同推送新增选商方式和是否关联交易
---
platformx-business-finance-biz/src/main/resources/mapper/ContractMapper.xml | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/platformx-business-finance-biz/src/main/resources/mapper/ContractMapper.xml b/platformx-business-finance-biz/src/main/resources/mapper/ContractMapper.xml
index 5936e13..701a0b1 100644
--- a/platformx-business-finance-biz/src/main/resources/mapper/ContractMapper.xml
+++ b/platformx-business-finance-biz/src/main/resources/mapper/ContractMapper.xml
@@ -173,6 +173,33 @@
UNION ALL
SELECT
+ '鐭崇叅鏈哄叕鍙�' AS party_b_name,
+ SUM(CASE WHEN MONTH(sign_date) = 1 THEN amount ELSE 0 END) AS m01,
+ SUM(CASE WHEN MONTH(sign_date) = 2 THEN amount ELSE 0 END) AS m02,
+ SUM(CASE WHEN MONTH(sign_date) = 3 THEN amount ELSE 0 END) AS m03,
+ SUM(CASE WHEN MONTH(sign_date) = 4 THEN amount ELSE 0 END) AS m04,
+ SUM(CASE WHEN MONTH(sign_date) = 5 THEN amount ELSE 0 END) AS m05,
+ SUM(CASE WHEN MONTH(sign_date) = 6 THEN amount ELSE 0 END) AS m06,
+ SUM(CASE WHEN MONTH(sign_date) = 7 THEN amount ELSE 0 END) AS m07,
+ SUM(CASE WHEN MONTH(sign_date) = 8 THEN amount ELSE 0 END) AS m08,
+ SUM(CASE WHEN MONTH(sign_date) = 9 THEN amount ELSE 0 END) AS m09,
+ SUM(CASE WHEN MONTH(sign_date) = 10 THEN amount ELSE 0 END) AS m10,
+ SUM(CASE WHEN MONTH(sign_date) = 11 THEN amount ELSE 0 END) AS m11,
+ SUM(CASE WHEN MONTH(sign_date) = 12 THEN amount ELSE 0 END) AS m12,
+ SUM(amount) AS total_amt
+ FROM contract
+ WHERE
+ del_flag = '0'
+ AND amount IS NOT NULL
+ AND sign_date IS NOT NULL
+ AND YEAR(sign_date) = #{queryDTO.year}
+ AND party_b_id IN (2089995177814495234,2089996921978040321,2089997578009128962)
+
+ GROUP BY party_b_id, party_b
+
+ UNION ALL
+
+ SELECT
'鎬昏' AS party_b_name,
SUM(CASE WHEN MONTH(sign_date) = 1 THEN amount ELSE 0 END),
SUM(CASE WHEN MONTH(sign_date) = 2 THEN amount ELSE 0 END),
@@ -1094,6 +1121,8 @@
c.next_schedule_name,
c.warranty_schedule_id,
c.comp_id,
+ c.center_push_flag,
+ c.last_attachment_url,
(select sum(delivered_quantity*unit_price) from contract_subject_matter csm where csm.contract_id = c.id) outAmount
FROM
contract c,
@@ -1104,6 +1133,9 @@
AND bc.id = c.party_a_id
<if test="queryDTO.contractName !=null and queryDTO.contractName !=''">
AND contract_name LIKE CONCAT('%', #{queryDTO.contractName}, '%')
+ </if>
+ <if test="queryDTO.contractNo !=null and queryDTO.contractNo !=''">
+ AND contract_no LIKE CONCAT('%', #{queryDTO.contractNo}, '%')
</if>
<if test="queryDTO.partyA !=null and queryDTO.partyA !=''">
AND party_a LIKE CONCAT('%', #{queryDTO.partyA}, '%')
@@ -1178,7 +1210,7 @@
contract c
WHERE
c.del_flag = '0'
- AND comp_id = 2056555602756063234
+ AND comp_id = 2089995177814495234
AND c.sign_date >= CURDATE()
AND c.sign_date < DATE_ADD( CURDATE(), INTERVAL 1 DAY )) smjbr,
(
@@ -1188,7 +1220,7 @@
contract c
WHERE
c.del_flag = '0'
- AND comp_id = 2056555602756063234
+ AND comp_id = 2089995177814495234
AND c.sign_date >=DATE_FORMAT( CURDATE(), '%Y-%m-01' )
AND c.sign_date < DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 MONTH ), '%Y-%m-01' )) smjby,
(
@@ -1198,7 +1230,7 @@
contract c
WHERE
c.del_flag = '0'
- AND comp_id = 2056555602756063234
+ AND comp_id = 2089995177814495234
AND c.sign_date >=DATE_FORMAT( CURDATE(), '%Y-01-01' )
AND c.sign_date < DATE_FORMAT( DATE_ADD( CURDATE(), INTERVAL 1 YEAR ), '%Y-01-01' )) smjbn,
(
--
Gitblit v1.9.1