From 47eb3a7bb1e7901a6d45d9df8ea8b9c4fb28ae82 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 05 三月 2025 16:18:41 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml
index cbeb517..2edce48 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml
@@ -64,8 +64,14 @@
<if test="product.creator != null and product.creator != ''">
and a.creator like concat('%',#{product.creator},'%')
</if>
+ <if test="product.state != null">
+ and a.state = #{product.state}
+ </if>
<if test="product.createTime != null and product.createTime != ''">
and date(a.create_time) like concat('%',#{product.createTime},'%')
+ </if>
+ <if test="product.remarks != null and product.remarks != ''">
+ and a.remarks like concat('%',#{product.remarks},'%')
</if>
</where>
@@ -109,11 +115,19 @@
<if test="product.createTime != null and product.createTime != ''">
and date(a.create_time) regexp #{product.createTime}
</if>
+ <if test="product.remarks != null and product.remarks != ''">
+ and a.remarks like concat('%',#{product.remarks},'%')
+ </if>
+ <if test="product.state != null">
+ and a.state = #{product.state}
+ </if>
+ <if test="product.productAbbreviation != null and product.productAbbreviation != ''">
+ and a.product_abbreviation like concat('%',#{product.productAbbreviation},'%')
+ </if>
</where>
order by a.id desc
- limit #{offset},#{pageSize}
- ;
+ limit #{offset},#{pageSize};
</select>
<update id="updateProductStateById">
--
Gitblit v1.8.0