From e027ad59a205f6d47b5dcd44fad0cd2fada793f8 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 24 九月 2024 10:44:13 +0800
Subject: [PATCH] add pro_type

---
 pms-parent/pms-global/src/main/resources/mapper/PltProductTestInspectionItemsMapper.xml |   38 ++++++++++++++++++++------------------
 1 files changed, 20 insertions(+), 18 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 416a260..d75f9f9 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,13 +34,13 @@
         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-->
             </if>
@@ -51,13 +53,13 @@
         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
             </if>
         </trim>
@@ -85,38 +87,38 @@
     <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductTestInspectionItems" useGeneratedKeys="true">
         insert into plt_product_test_inspection_items
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                <if test="id != null and id !=''">id,</if>
-                <if test="proId != null and proId !=''">pro_id,</if>
+                <if test="id != null">id,</if>
+                <if test="proId != null">pro_id,</if>
                 <if test="item != null and item !=''">item,</if>
-                <if test="deleted != null and deleted !=''">deleted,</if>
-                <if test="disabled != null and disabled !=''">disabled,</if>
-                <if test="sort != null and sort !=''">sort,</if>
+                <if test="deleted != null">deleted,</if>
+                <if test="disabled != null">disabled,</if>
+                <if test="sort != null">sort,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
-                <if test="proId != null and proId !=''">#{proId,jdbcType=BIGINT},</if>
+                <if test="id != null">#{id,jdbcType=BIGINT},</if>
+                <if test="proId != null">#{proId,jdbcType=BIGINT},</if>
                 <if test="item != null and item !=''">#{item,jdbcType=VARCHAR},</if>
-                <if test="deleted != null and deleted !=''">#{deleted,jdbcType=TINYINT},</if>
-                <if test="disabled != null and disabled !=''">#{disabled,jdbcType=TINYINT},</if>
-                <if test="sort != null and sort !=''">#{sort,jdbcType=INTEGER},</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>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductTestInspectionItems">
         update plt_product_test_inspection_items
         <set>
-                <if test="proId != null and proId !=''">
+                <if test="proId != null">
                     pro_id = #{proId,jdbcType=BIGINT},
                 </if>
                 <if test="item != null and item !=''">
                     item = #{item,jdbcType=VARCHAR},
                 </if>
-                <if test="deleted != null and deleted !=''">
+                <if test="deleted != null">
                     deleted = #{deleted,jdbcType=TINYINT},
                 </if>
-                <if test="disabled != null and disabled !=''">
+                <if test="disabled != null">
                     disabled = #{disabled,jdbcType=TINYINT},
                 </if>
-                <if test="sort != null and sort !=''">
+                <if test="sort != null">
                     sort = #{sort,jdbcType=INTEGER},
                 </if>
         </set>

--
Gitblit v1.8.0