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/PltProductUnqualifiedReasonMapper.xml | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PltProductUnqualifiedReasonMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PltProductUnqualifiedReasonMapper.xml
index 9d73539..929e460 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltProductUnqualifiedReasonMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductUnqualifiedReasonMapper.xml
@@ -12,16 +12,15 @@
<result column="disabled" property="disabled" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/>
<result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/>
<association property="proName" column="pro_id" javaType="java.lang.Long"
- select="selectProNameById" fetchType="eager" />
+ 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">
id,pro_id,reason,disabled,
deleted,pro_id,sort
</sql>
- <select id="selectProNameById" parameterType="java.lang.Long" resultType="java.lang.String">
- select name proName from plt_product where id=#{id}
- </select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
@@ -33,14 +32,14 @@
insert into plt_product_unqualified_reason
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
- <if test="reason != null">reason,</if>
+ <if test="reason != null and reason !=''">reason,</if>
<if test="proId != null">pro_id,</if>
<if test="sort != null">sort,</if>
<if test="deleted != null">deleted,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=BIGINT},</if>
- <if test="reason != null">#{reason,jdbcType=VARCHAR},</if>
+ <if test="reason != null and reason !=''">#{reason,jdbcType=VARCHAR},</if>
<if test="proId != null">#{proId,jdbcType=VARCHAR},</if>
<if test="sort != null">#{sort,jdbcType=VARCHAR},</if>
<if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
@@ -52,7 +51,7 @@
<if test="disabled != null">
disabled = #{disabled,jdbcType=TINYINT},
</if>
- <if test="reason != null">
+ <if test="reason != null and reason !=''">
reason = #{reason,jdbcType=VARCHAR},
</if>
<if test="proId != null">
@@ -73,11 +72,17 @@
from plt_product_unqualified_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}
@@ -90,9 +95,15 @@
from plt_product_unqualified_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