From c89cf8126ed20af98e19b8ab1f63e8bfae596788 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 16 十月 2024 17:11:05 +0800
Subject: [PATCH] command crud

---
 pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 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 3340f44..d75f9f9 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml
@@ -11,6 +11,10 @@
             <result property="deleted" column="deleted" jdbcType="TINYINT"/>
             <result property="disabled" column="disabled" jdbcType="TINYINT"/>
             <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">
@@ -30,11 +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">
+                t.disabled != 1  and
+                <!--FIND_IN_SET(t.disabled, #{disabled}) and-->
             </if>
         </trim>
     </select>
@@ -45,11 +53,14 @@
         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
@@ -78,7 +89,7 @@
         <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>
@@ -86,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>
@@ -98,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