From 3c55debea2b60faf89acdf89074ffd135dc44d7e Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 08 四月 2025 17:37:19 +0800
Subject: [PATCH] 提交筛选日期调整

---
 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