From f1e6aadf01a2ac32bc1707ca43fc6a2d2587b9ac Mon Sep 17 00:00:00 2001
From: liuxm <liuxm@fescotech.com>
Date: 星期四, 16 五月 2024 15:07:14 +0800
Subject: [PATCH] 添加 产品,质检项目,不合格原因,报废原因的 禁用启用方法;id序列化

---
 pms-parent/pms-global/src/main/resources/mapper/PltProductScrappingReasonMapper.xml |   60 +++++++++++++++++++++++-------------------------------------
 1 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/pms-parent/pms-global/src/main/resources/mapper/PltProductScrappingReasonMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PltProductScrappingReasonMapper.xml
index 3b196b6..8a0dbca 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltProductScrappingReasonMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltProductScrappingReasonMapper.xml
@@ -6,26 +6,22 @@
 
     <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoPlt.PltProductScrappingReason">
         <id property="id" column="id" jdbcType="BIGINT"/>
-        <result property="proId" column="pro_id" jdbcType="BIGINT"/>
         <result property="reason" column="reason" jdbcType="VARCHAR"/>
-        <result property="deleted" column="deleted" jdbcType="TINYINT"/>
-        <association property="proName" column="pro_id" javaType="java.lang.Long"
-                     select="selectProNameById" fetchType="eager" />
+        <result column="disabled" property="disabled" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/>
+        <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,pro_id,reason,
+        id,reason,disabled,
         deleted
     </sql>
     <sql id="part_Column_List">
         ${alias}.id,
-        ${alias}.pro_id,
         ${alias}.reason,
-        ${alias}.deleted
+        ${alias}.deleted,
+        ${alias}.disabled
     </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" />
@@ -48,13 +44,11 @@
         insert into plt_product_scrapping_reason
         <trim prefix="(" suffix=")" suffixOverrides=",">
                 <if test="id != null">id,</if>
-                <if test="proId != null">pro_id,</if>
                 <if test="reason != null">reason,</if>
                 <if test="deleted != null">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="reason != null">#{reason,jdbcType=VARCHAR},</if>
                 <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
         </trim>
@@ -62,26 +56,26 @@
     <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductScrappingReason">
         update plt_product_scrapping_reason
         <set>
-                <if test="proId != null">
-                    pro_id = #{proId,jdbcType=BIGINT},
-                </if>
-                <if test="reason != null">
-                    reason = #{reason,jdbcType=VARCHAR},
-                </if>
-                <if test="deleted != null">
-                    deleted = #{deleted,jdbcType=TINYINT},
-                </if>
+            <if test="reason != null">
+                reason = #{reason,jdbcType=VARCHAR},
+            </if>
+            <if test="disabled != null">
+                disabled = #{disabled,jdbcType=TINYINT},
+            </if>
+            <if test="deleted != null">
+                deleted = #{deleted,jdbcType=TINYINT},
+            </if>
         </set>
         where   id = #{id,jdbcType=BIGINT} 
     </update>
-    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductScrappingReason">
-        update plt_product_scrapping_reason
-        set 
-            pro_id =  #{proId,jdbcType=BIGINT},
-            reason =  #{reason,jdbcType=VARCHAR},
-            deleted =  #{deleted,jdbcType=TINYINT}
-        where   id = #{id,jdbcType=BIGINT} 
-    </update>
+<!--    <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoPlt.PltProductScrappingReason">-->
+<!--        update plt_product_scrapping_reason-->
+<!--        set -->
+<!--            pro_id =  #{proId,jdbcType=BIGINT},-->
+<!--            reason =  #{reason,jdbcType=VARCHAR},-->
+<!--            deleted =  #{deleted,jdbcType=TINYINT}-->
+<!--        where   id = #{id,jdbcType=BIGINT} -->
+<!--    </update>-->
 
     <select id="selectSome" resultMap="BaseResultMap">
         select
@@ -89,12 +83,8 @@
             <property name="alias" value="t"/>
         </include>
         from plt_product_scrapping_reason t
-        inner join plt_product p on t.pro_id = p.id
         where t.deleted!=1
         <trim prefix="and" suffixOverrides="and">
-            <if test="proName != null and proName != ''">
-                p.name like concat('%', #{proName}, '%') and
-            </if>
             <if test="reason != null  and reason != ''">
                 t.reason like concat('%', #{reason}, '%') and
             </if>
@@ -110,12 +100,8 @@
     <select id="selectSomeCount" resultType="java.lang.Long">
         select count(1)
         from plt_product_scrapping_reason t
-        inner join plt_product p on t.pro_id = p.id
         where t.deleted!=1
         <trim prefix="and" suffixOverrides="and">
-            <if test="proName != null and proName != ''">
-                p.name like concat('%', #{proName}, '%') and
-            </if>
             <if test="reason != null  and reason != ''">
                 t.reason like concat('%', #{reason}, '%') and
             </if>

--
Gitblit v1.8.0