From acfd83a6d586ebe09bec7e5470006f70adb81392 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 16 十二月 2025 13:48:56 +0800
Subject: [PATCH] 仓储物流增加产品大类搜索 决策分析增加项目搜索
---
src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml | 3 +++
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml | 9 +++++++++
src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml | 3 +++
3 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index f1f7509..4325549 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -60,6 +60,9 @@
<if test="req.timeStr != null and req.timeStr != ''">
and t1.create_time like concat('%',#{req.timeStr},'%')
</if>
+ <if test="req.productCategory != null and req.productCategory != ''">
+ and t2.product_category like concat('%',#{req.productCategory},'%')
+ </if>
</where>
</select>
<select id="list" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDto">
@@ -141,6 +144,9 @@
t1.type = 1
<if test="req.supplierName != null and req.supplierName != ''">
and t3.supplier_name like concat('%',#{req.supplierName},'%')
+ </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},'%')
@@ -250,6 +256,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/procurementrecord/ProcurementRecordOutMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
index f335353..216392c 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordOutMapper.xml
@@ -29,6 +29,9 @@
<if test="req.timeStr != null and req.timeStr != ''">
and t1.create_time like concat('%',#{req.timeStr},'%')
</if>
+ <if test="req.productCategory != null and req.productCategory != ''">
+ and t2.product_category like concat('%',#{req.productCategory},'%')
+ </if>
</where>
</select>
<select id="list" resultType="com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto">
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