From a8513206048eed68f2908a4d01ee9c2d9bd331e2 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 23 一月 2024 08:47:14 +0800
Subject: [PATCH] 产品界面展示数据完整

---
 north-glass-erp/target/classes/mapper/sd/Product.xml |   41 ++++++++++++++++++++++++++++++++++++++---
 1 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/north-glass-erp/target/classes/mapper/sd/Product.xml b/north-glass-erp/target/classes/mapper/sd/Product.xml
index fcc975a..ae51f90 100644
--- a/north-glass-erp/target/classes/mapper/sd/Product.xml
+++ b/north-glass-erp/target/classes/mapper/sd/Product.xml
@@ -3,9 +3,10 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.example.erp.mapper.sd.ProductMapper">
-    <resultMap id="productmap" type="com.example.erp.entity.sd.Product" >
+    <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="total_thickness" property="totalThickness"/>
         <result column="thickness" property="thickness"/>
         <result column="query" property="query"/>
@@ -23,8 +24,8 @@
 
     </resultMap>
 
-    <select id="defaultProduct" resultMap="productmap">
-        select a.id as id,
+    <select id="defaultProduct" resultMap="productMap">
+        select a.id ,
         a.product_name,
         a.total_thickness,
         a.thickness,
@@ -66,4 +67,38 @@
         limit #{offset},#{pageSize}
         ;
     </select>
+
+    <select id="getPageTotal" >
+        select
+            CEILING(count(a.id)/#{pageSize})
+        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>
+
+        order by a.id desc
+        limit #{offset},#{pageSize}
+        ;
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0