From c631edf462f4ab19403f5194dec743168e2a0e79 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期一, 07 九月 2026 14:22:10 +0800
Subject: [PATCH] feat:合并开票
---
platformx-business-finance-biz/src/main/resources/mapper/ContractInvoiceMapper.xml | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 20efb7b..78dcce9 100644
--- a/platformx-business-finance-biz/src/main/resources/mapper/ContractInvoiceMapper.xml
+++ b/platformx-business-finance-biz/src/main/resources/mapper/ContractInvoiceMapper.xml
@@ -44,21 +44,21 @@
SELECT sum(ci.invoice_total_price_tax)
FROM contract_invoice ci
WHERE ci.del_flag = '0'
- AND comp_id = 2056555602756063234
+ AND comp_id = 2089995177814495234
AND ci.invoice_time >= CURDATE()
AND ci.invoice_time < 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 comp_id = 2089995177814495234
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')) smjby,
(
SELECT sum(ci.invoice_total_price_tax)
FROM contract_invoice ci
WHERE ci.del_flag = '0'
- AND comp_id = 2056555602756063234
+ AND comp_id = 2089995177814495234
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')) smjbn,
(
@@ -454,6 +454,7 @@
t.comp_id,
t1.contract_no,
t2.company_name AS busGuestName,
+ t.bw_request_result,
t1.party_b
FROM
contract_invoice t
@@ -466,6 +467,12 @@
</if>
<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>
<if test="queryDTO.contractNo !=null and queryDTO.contractNo !=''">
AND t1.contract_no LIKE CONCAT('%', #{queryDTO.contractNo}, '%')
@@ -566,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
--
Gitblit v1.9.1