From ca019747743a76f9348fcac99385c91736a36638 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期四, 17 九月 2026 16:44:15 +0800
Subject: [PATCH] feat:标的物变更 合同审核流程改为推送合同中心通过后上传盖章签字件 履约进度新增合同补录按钮
---
platformx-business-finance-biz/src/main/resources/mapper/ContractInvoiceMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 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..78dcce9 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>
@@ -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
--
Gitblit v1.9.1