From 174cc2a8aa52f00334e0e9a3a0ea91b2e3e7acd3 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 30 十月 2025 16:20:41 +0800
Subject: [PATCH] 修改次破报表翻页汇总不正确问题

---
 north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml |   47 ++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 44 insertions(+), 3 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 e915d83..71c28d2 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml
@@ -64,14 +64,37 @@
             <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>
 
-        order by id desc
+        order by
+        <if test="orderBy == null ">
+            id desc
+        </if>
+        <if test="orderBy == 'desc'">
+            ${field} desc
+        </if>
+        <if test="orderBy == 'asc'">
+            ${field}
+        </if>
         limit #{offset},#{pageSize}
         ;
+    </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" >
@@ -101,14 +124,32 @@
             <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">
         update product set state = #{state} where id = #{id}
     </update>
+
+    <select id="getGlassThickness">
+        select sum(REPLACE(JSON_UNQUOTE(JSON_EXTRACT(separation, '$.thickness')),'mm',''))
+        from product_detail as a
+        where a.prod_id = #{productId}
+        and a.id &lt;= (select b.id
+                        from product_detail as b
+                        where b.prod_id = #{productId} and b.glass_sort = #{technologyNumber})
+
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0