From 6de868b732a7d76c3a9cc735e88d93eecf7322d2 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 25 七月 2025 13:35:49 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml | 26 ++++++++++++++++++++++++--
1 files changed, 24 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 e915d83..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,14 +64,28 @@
<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>
order by id desc
limit #{offset},#{pageSize}
;
+ </select>
+
+ <select id="selectProduct">
+ select * from sd.product where ${productName}=#{productNameValue}
+ </select>
+
+ <select id="selectProductId">
+ select * from sd.product where ${productName}=#{productNameValue} and id != #{id}
</select>
<select id="getPageTotal" >
@@ -101,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