From 445570788bfac47476d7f6a3e4c9517a3c2d4a5c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 22 五月 2025 16:45:34 +0800
Subject: [PATCH] 产品生产不合格原因查询排序,产品报废原因查询排序

---
 pms-parent/pms-global/src/main/resources/mapper/PltProductScrappingReasonMapper.xml |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/pms-parent/pms-global/src/main/resources/mapper/PltProductScrappingReasonMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PltProductScrappingReasonMapper.xml
index 2bde442..83e13dd 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltProductScrappingReasonMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductScrappingReasonMapper.xml
@@ -13,6 +13,8 @@
         <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/>
         <association property="proName" column="pro_id" javaType="java.lang.Long"
                      select="com.dy.pmsGlobal.daoPlt.PltProductMapper.selectProNameById" fetchType="eager" />
+        <association property="proType" column="pro_id" javaType="java.lang.Long"
+                     select="com.dy.pmsGlobal.daoPlt.PltProductMapper.selectProTypeById" fetchType="eager" />
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -84,11 +86,17 @@
         from plt_product_scrapping_reason t
         where t.deleted!=1
         <trim prefix="and" suffixOverrides="and">
+            <if test="proId != null and proId != ''">
+                t.pro_id=#{proId} and
+            </if>
             <if test="reason != null  and reason != ''">
                 t.reason like concat('%', #{reason}, '%') and
             </if>
+            <if test="disabled != null">
+                t.disabled != 1  and
+            </if>
         </trim>
-        order by sort desc
+        order by pro_id desc, sort asc
         <trim prefix="limit " >
             <if test="start != null and count != null">
                 #{start}, #{count}
@@ -101,9 +109,15 @@
         from plt_product_scrapping_reason t
         where t.deleted!=1
         <trim prefix="and" suffixOverrides="and">
+            <if test="proId != null and proId != ''">
+                t.pro_id=#{proId} and
+            </if>
             <if test="reason != null  and reason != ''">
                 t.reason like concat('%', #{reason}, '%') and
             </if>
+            <if test="disabled != null">
+                t.disabled != 1  and
+            </if>
         </trim>
     </select>
 

--
Gitblit v1.8.0