From 94e42e483b7f6224014ef2c2179f6ab789beb93e Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 22 一月 2024 15:12:11 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/Product.xml | 103 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 85 insertions(+), 18 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/Product.xml b/north-glass-erp/src/main/resources/mapper/sd/Product.xml
index acda317..b774dab 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/Product.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/Product.xml
@@ -3,26 +3,93 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.example.erp.mapper.sd.ProductMapper">
- <select id="defaultProduct">
- select
- a.id,
- prodID,
- product,
- glassType,
- typeName,
- totalThickness,
- thickness,
- Query,
- remarks,
- state,
- creator,
- date(a.createTime) as 'createTime',
- updateTime
- from
- product as a
- left join basic_glass_type bgt on bgt.typeID = a.glassType
+ <resultMap id="productmap" type="com.example.erp.entity.sd.Product" >
+ <id column="id" property="id"/>
+<<<<<<< HEAD
+ <result column="product_name" property="productName"/>
+=======
+ <result column="product" property="product"/>
+>>>>>>> 2bf272a9d41a2b6c67910b23371af9537a9153a5
+ <result column="total_thickness" property="totalThickness"/>
+ <result column="thickness" property="thickness"/>
+ <result column="query" property="query"/>
+ <result column="remarks" property="remarks"/>
+ <result column="state" property="state"/>
+ <result column="creator" property="creator"/>
+ <result column="create_time" property="createTime"/>
+ <result column="update_time" property="updateTime"/>
+<<<<<<< HEAD
+ <association property="basicGlassType" javaType="com.example.erp.entity.sd.BasicGlassType">
+ <result column="type_id" property="typeID"/>
+=======
+ <association property="glassType" javaType="com.example.erp.entity.sd.GlassType">
+ <result column="type_id" property="typeId"/>
+>>>>>>> 2bf272a9d41a2b6c67910b23371af9537a9153a5
+ <result column="type_name" property="typeName"/>
+ </association>
+ <!--<result column="g_typeId" property="glassTypes.typeId"/>
+ <result column="g_type" property="glassTypes.type"/>-->
+
+ </resultMap>
+
+ <select id="defaultProduct" resultMap="productmap">
+<<<<<<< HEAD
+ select a.id as id,
+ a.product_name,
+ a.total_thickness,
+ a.thickness,
+ a.query,
+ a.remarks,
+ a.state,
+ a.creator,
+ date(a.create_time) as create_time,
+ a.update_time as update_time,
+ a.type_id as type_id,
+ bgt.type_name
+ from product as a
+ left join basic_glass_type bgt on bgt.type_id = a.type_id
+ <where>
+ <if test="glassTypeId != null and glassTypeId != ''">
+ and a.type_id regexp #{glassTypeId}
+ </if>
+ <if test="product.id != null and product.id != ''">
+ and a.id regexp #{product.id}
+ </if>
+ <if test="product.productName != null and product.productName != ''">
+ and a.product_name regexp #{product.productName}
+ </if>
+ <if test="product.basicGlassType.typeName != null and product.basicGlassType.typeName!= ''">
+ and bgt.type_name regexp #{product.basicGlassType.typeName}
+ </if>
+ <if test="product.query != null and product.query != ''">
+ and a.query regexp #{product.query}
+ </if>
+ <if test="product.creator != null and product.creator != ''">
+ and a.creator regexp #{product.creator}
+ </if>
+ <if test="product.createTime != null and product.createTime != ''">
+ and date(a.create_time) regexp #{product.createTime}
+ </if>
+ </where>
+=======
+ select a.id as id,
+ a.product,
+ a.total_thickness,
+ a.thickness,
+ a.query,
+ a.remarks,
+ a.state,
+ a.creator,
+ date(a.create_time) as create_time,
+ a.update_time as update_time,
+ bgt.type_id as type_id,
+ bgt.type as type
+ from product as a
+ left join glass_type bgt on bgt.type_id = a.type_id
+>>>>>>> 2bf272a9d41a2b6c67910b23371af9537a9153a5
order by id desc
+ limit #{offset},#{pageSize}
;
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0