From b52a346d937c162120057f9c235904e66438e2a3 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期二, 16 十二月 2025 13:37:14 +0800
Subject: [PATCH] 仓储物流增加产品大类搜索 决策分析增加项目利润
---
src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml | 3 +++
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml | 6 ++++++
src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml | 3 +++
3 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index f1f7509..0f479ab 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -250,6 +250,9 @@
<if test="req.customerName != null and req.customerName != ''">
and t3.customer_name like concat('%',#{req.customerName},'%')
</if>
+ <if test="req.productCategory != null and req.productCategory != ''">
+ and t2.product_category like concat('%',#{req.productCategory},'%')
+ </if>
<if test="req.timeStr != null and req.timeStr != ''">
and t1.create_time like concat('%',#{req.timeStr},'%')
</if>
@@ -305,6 +308,9 @@
<if test="req.endDate != null">
and t1.create_time <= #{req.endDate}
</if>
+ <if test="req.productCategory != null and req.productCategory != ''">
+ and t2.product_category like concat('%',#{req.productCategory},'%')
+ </if>
</where>
group by t3.customer_name,t2.product_category,t2.specification_model
</select>
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
index f335353..cc0b28f 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
@@ -118,6 +118,9 @@
<if test="req.customerName != null and req.customerName != ''">
and t3.customer_name like concat('%',#{req.customerName},'%')
</if>
+ <if test="req.productCategory != null and req.productCategory != ''">
+ and t2.product_category like concat('%',#{req.productCategory},'%')
+ </if>
<if test="req.timeStr != null and req.timeStr != ''">
and t1.create_time like concat('%',#{req.timeStr},'%')
</if>
diff --git a/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml b/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml
index 413f293..bda5396 100644
--- a/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml
+++ b/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml
@@ -49,6 +49,9 @@
<if test="c.customerName != null and c.customerName != ''">
AND A.customer_name LIKE CONCAT('%', #{c.customerName}, '%')
</if>
+ <if test="c.projectName != null and c.projectName != ''">
+ AND A.project_name LIKE CONCAT('%', #{c.projectName}, '%')
+ </if>
</where>
</select>
<select id="listVat" resultType="com.ruoyi.purchase.dto.VatDto">
--
Gitblit v1.9.3