From acaf8ca38cd32bc474bb46b593db2a8d75b9bfdd Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 12 十月 2024 08:26:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml | 19 +++++++++++++++++--
1 files changed, 17 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 3f12498..dd28dd4 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,
@@ -46,10 +47,13 @@
and a.type_id like concat('%',#{glassTypeId},'%')
</if>
<if test="product.id != null and product.id != ''">
- and a.id like like concat('%',#{product.id},'%')
+ and a.id like concat('%',#{product.id},'%')
</if>
<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},'%')
@@ -60,6 +64,9 @@
<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>
@@ -70,6 +77,14 @@
;
</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" >
select
CEILING(count(a.id)/#{pageSize})
--
Gitblit v1.8.0