From 5a347be900bf045c947cdbc08167526cd44116db Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 12 十月 2026 18:18:50 +0800
Subject: [PATCH] fix(erp/crm): 单据明细单价口径由「不含税单价」改为「含税单价」
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java
index a5a814f..66daa01 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/invoice/CrmInvoiceMapper.java
@@ -76,10 +76,11 @@
if (CollUtil.isEmpty(contractIds)) {
return Collections.emptyMap();
}
- // SQL sum 鏌ヨ
+ // SQL sum 鏌ヨ锛堝鎵归�氳繃 + 瀹℃壒涓紝涓庡紑绁ㄩ槻瓒呮牎楠屽彛寰勪竴鑷达級
List<Map<String, Object>> result = selectMaps(new QueryWrapper<CrmInvoiceDO>()
.select("contract_id, SUM(price) AS total_price")
- .eq("audit_status", CrmAuditStatusEnum.APPROVE.getStatus())
+ .in("audit_status", CrmAuditStatusEnum.APPROVE.getStatus(),
+ CrmAuditStatusEnum.PROCESS.getStatus())
.groupBy("contract_id")
.in("contract_id", contractIds));
// 鑾峰緱閲戦
@@ -90,4 +91,13 @@
return selectCount(CrmInvoiceDO::getContractId, contractId);
}
+ /**
+ * 鏌ヨ鍚堝悓涓嬬殑鍏ㄩ儴寮�绁紙瀵煎叆鍘婚噸鐢級
+ */
+ default List<CrmInvoiceDO> selectListByContractId(Long contractId) {
+ return selectList(new LambdaQueryWrapperX<CrmInvoiceDO>()
+ .eq(CrmInvoiceDO::getContractId, contractId)
+ .orderByAsc(CrmInvoiceDO::getId));
+ }
+
}
--
Gitblit v1.9.3