From 591e3b8a10ed15023f3ad9e5a72a887ef89b0bb2 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期一, 26 八月 2024 20:47:46 +0800
Subject: [PATCH] 修改判空方式

---
 pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml |   60 ++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml
index 02f66a5..db57470 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductQualityInspectionItemsMapper.xml
@@ -12,24 +12,21 @@
         <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" />
     </resultMap>
 
     <sql id="Base_Column_List">
         id,pro_id,item,disabled,sort,
         deleted
     </sql>
-    <sql id="part_Column_List">
-        ${alias}.id,
-        ${alias}.pro_id,
-        ${alias}.item,
-        ${alias}.sort,
-        ${alias}.disabled,
-        ${alias}.deleted
-    </sql>
-    <select id="selectProNameById" parameterType="java.lang.Long" resultType="java.lang.String">
-        select name proName from plt_product where id=#{id}
-    </select>
+<!--    <sql id="part_Column_List">-->
+<!--        ${alias}.id,-->
+<!--        ${alias}.pro_id,-->
+<!--        ${alias}.item,-->
+<!--        ${alias}.sort,-->
+<!--        ${alias}.disabled,-->
+<!--        ${alias}.deleted-->
+<!--    </sql>-->
     <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
@@ -40,35 +37,35 @@
     <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductQualityInspectionItems" useGeneratedKeys="true">
         insert into plt_product_quality_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="sort != null">sort,</if>
-            <if test="disabled != null">disabled,</if>
-            <if test="deleted != null">deleted,</if>
+            <if test="id != null and id !=''">id,</if>
+            <if test="proId != null and proId !=''">pro_id,</if>
+            <if test="item != null and item !=''">item,</if>
+            <if test="sort != null and sort !=''">sort,</if>
+            <if test="disabled != null and disabled !=''">disabled,</if>
+            <if test="deleted != null and deleted !=''">deleted,</if>
         </trim>
         <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="sort != null">#{sort,jdbcType=INTEGER},</if>
-            <if test="disabled != null">#{disabled,jdbcType=TINYINT},</if>
-            <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
+            <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
+            <if test="proId != null and proId !=''">#{proId,jdbcType=BIGINT},</if>
+            <if test="item != null and item !=''">#{item,jdbcType=VARCHAR},</if>
+            <if test="sort != null and sort !=''">#{sort,jdbcType=INTEGER},</if>
+            <if test="disabled != null and disabled !=''">#{disabled,jdbcType=TINYINT},</if>
+            <if test="deleted != null and deleted !=''">#{deleted,jdbcType=TINYINT},</if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductQualityInspectionItems">
         update plt_product_quality_inspection_items
         <set>
-            <if test="proId != null">
+            <if test="proId != null and proId !=''">
                 pro_id = #{proId,jdbcType=BIGINT},
             </if>
-            <if test="disabled != null">
+            <if test="disabled != null and disabled !=''">
                 disabled = #{disabled,jdbcType=BIGINT},
             </if>
-            <if test="item != null">
+            <if test="item != null and item !=''">
                 item = #{item,jdbcType=VARCHAR},
             </if>
-            <if test="sort != null">
+            <if test="sort != null and sort !=''">
                 sort = #{sort,jdbcType=INTEGER},
             </if>
         </set>
@@ -86,6 +83,10 @@
             </if>
             <if test="item != null  and item != ''">
                 t.item like concat('%', #{item}, '%') and
+            </if>
+            <if test="disabled != null  and disabled != ''">
+                t.disabled != 1  and
+                <!--FIND_IN_SET(t.disabled, #{disabled}) and-->
             </if>
         </trim>
         order by sort desc
@@ -107,6 +108,9 @@
             <if test="item != null  and item != ''">
                 t.item like concat('%', #{item}, '%') and
             </if>
+            <if test="disabled != null  and disabled != ''">
+                t.disabled != 1  and
+            </if>
         </trim>
     </select>
 

--
Gitblit v1.8.0