From f94dec7ddbd0aa96f642f04d41d0f74ca0edfdc7 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 25 六月 2024 18:22:30 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 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 3f12498..cd28050 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml
@@ -6,7 +6,7 @@
<resultMap id="productMap" type="com.example.erp.entity.sd.Product" >
<id column="id" property="id"/>
<result column="product_name" property="productName"/>
- <result column="product" property="productName"/>
+ <result column="product_abbreviation" property="productAbbreviation"/>
<result column="total_thickness" property="totalThickness"/>
<result column="thickness" property="thickness"/>
<result column="query" property="query"/>
@@ -29,6 +29,7 @@
<select id="defaultProduct" resultMap="productMap">
select a.id ,
a.product_name,
+ a.product_abbreviation,
a.total_thickness,
a.thickness,
a.query,
@@ -51,6 +52,9 @@
<if test="product.productName != null and product.productName != ''">
and a.product_name like concat('%',#{product.productName},'%')
</if>
+ <if test="product.productAbbreviation != null and product.productAbbreviation != ''">
+ and a.product_abbreviation like concat('%',#{product.productAbbreviation},'%')
+ </if>
<if test="product.basicGlassType.typeName != null and product.basicGlassType.typeName!= ''">
and bgt.type_name like concat('%',#{product.basicGlassType.typeName},'%')
</if>
--
Gitblit v1.8.0