From c488d63b58458ea0dee56ffbb4c5b66b2141d4f1 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 30 五月 2025 09:59:30 +0800
Subject: [PATCH] 去除画蛇添足代码
---
pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml
index 454b8b8..f3a6c4c 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml
@@ -13,6 +13,8 @@
<result property="sort" column="sort" jdbcType="INTEGER"/>
<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">
@@ -32,15 +34,15 @@
from plt_product_test_inspection_items t
where t.deleted!=1
<trim prefix="and" suffixOverrides="and">
- <if test="proId != null and proId != ''">
+ <if test="proId != null">
t.pro_id=#{proId} and
</if>
<if test="item != null and item != ''">
t.item like concat('%', #{item}, '%') and
</if>
- <if test="disabled != null and disabled != ''">
+ <if test="disabled != null">
t.disabled != 1 and
-<!-- FIND_IN_SET(t.disabled, #{disabled}) and-->
+ <!--FIND_IN_SET(t.disabled, #{disabled}) and-->
</if>
</trim>
</select>
@@ -51,14 +53,17 @@
from plt_product_test_inspection_items t
where t.deleted!=1
<trim prefix="and" suffixOverrides="and">
- <if test="proId != null and proId != ''">
+ <if test="proId != null">
t.pro_id=#{proId} and
</if>
<if test="item != null and item != ''">
t.item like concat('%', #{item}, '%') 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}
@@ -70,7 +75,7 @@
delete from plt_product_test_inspection_items
where id = #{id,jdbcType=BIGINT}
</delete>
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductTestInspectionItems" useGeneratedKeys="true">
+ <insert id="insert" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductTestInspectionItems">
insert into plt_product_test_inspection_items
( id,pro_id,item
,deleted,disabled,sort
@@ -79,12 +84,12 @@
,#{deleted,jdbcType=TINYINT},#{disabled,jdbcType=TINYINT},#{sort,jdbcType=INTEGER}
)
</insert>
- <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductTestInspectionItems" useGeneratedKeys="true">
+ <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductTestInspectionItems">
insert into plt_product_test_inspection_items
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="proId != null">pro_id,</if>
- <if test="item != null">item,</if>
+ <if test="item != null and item !=''">item,</if>
<if test="deleted != null">deleted,</if>
<if test="disabled != null">disabled,</if>
<if test="sort != null">sort,</if>
@@ -92,7 +97,7 @@
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=BIGINT},</if>
<if test="proId != null">#{proId,jdbcType=BIGINT},</if>
- <if test="item != null">#{item,jdbcType=VARCHAR},</if>
+ <if test="item != null and item !=''">#{item,jdbcType=VARCHAR},</if>
<if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
<if test="disabled != null">#{disabled,jdbcType=TINYINT},</if>
<if test="sort != null">#{sort,jdbcType=INTEGER},</if>
@@ -104,7 +109,7 @@
<if test="proId != null">
pro_id = #{proId,jdbcType=BIGINT},
</if>
- <if test="item != null">
+ <if test="item != null and item !=''">
item = #{item,jdbcType=VARCHAR},
</if>
<if test="deleted != null">
--
Gitblit v1.8.0