From 8000dd179e5a1eef3113cbd75dddb32bbb805d1c Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 07 一月 2025 11:58:12 +0800
Subject: [PATCH] edit

---
 pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml |   36 +++++++++++++++++++-----------------
 1 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml
index 3696f61..08e0e9d 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml
@@ -15,6 +15,8 @@
         <result property="remark" column="remark" jdbcType="VARCHAR"/>
         <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" />
         <association property="creatorName" column="creator" javaType="java.lang.Long"
                      select="com.dy.pmsGlobal.daoBa.BaUserMapper.selectNameByUserId" fetchType="eager" />
         <association property="isQuote" column="id" javaType="java.lang.Boolean" fetchType="eager"
@@ -76,30 +78,30 @@
     <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrProductionProcess" useGeneratedKeys="true">
         insert into pr_production_process
         <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="name != null and name !=''">name,</if>
                 <if test="creator != null and creator !=''">creator,</if>
-                <if test="dt != null and dt !=''">dt,</if>
-                <if test="disabled != null and disabled !=''">disabled,</if>
-                <if test="deleted != null and deleted !=''">deleted,</if>
+                <if test="dt != null">dt,</if>
+                <if test="disabled != null">disabled,</if>
+                <if test="deleted != null">deleted,</if>
                 <if test="remark != null and remark !=''">remark,</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="name != null and name !=''">#{name,jdbcType=VARCHAR},</if>
                 <if test="creator != null and creator !=''">#{creator,jdbcType=VARCHAR},</if>
-                <if test="dt != null and dt !=''">#{dt,jdbcType=TIMESTAMP},</if>
-                <if test="disabled != null and disabled !=''">#{disabled,jdbcType=TINYINT},</if>
-                <if test="deleted != null and deleted !=''">#{deleted,jdbcType=TINYINT},</if>
+                <if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
+                <if test="disabled != null">#{disabled,jdbcType=TINYINT},</if>
+                <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
                 <if test="remark != null and remark !=''">#{remark,jdbcType=VARCHAR},</if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrProductionProcess">
         update pr_production_process
         <set>
-                <if test="proId != null and proId !=''">
+                <if test="proId != null">
                     pro_id = #{proId,jdbcType=BIGINT},
                 </if>
                 <if test="name != null and name !=''">
@@ -108,13 +110,13 @@
                 <if test="creator != null and creator !=''">
                     creator = #{creator,jdbcType=VARCHAR},
                 </if>
-                <if test="dt != null and dt !=''">
+                <if test="dt != null">
                     dt = #{dt,jdbcType=TIMESTAMP},
                 </if>
-                <if test="disabled != null and disabled !=''">
+                <if test="disabled != null">
                     disabled = #{disabled,jdbcType=TINYINT},
                 </if>
-                <if test="deleted != null and deleted !=''">
+                <if test="deleted != null">
                     deleted = #{deleted,jdbcType=TINYINT},
                 </if>
                 <if test="remark != null and remark !=''">
@@ -129,7 +131,7 @@
         <include refid="Base_Column_List" />
         from pr_production_process t
         <trim prefix="where" suffixOverrides="and">
-            <if test="proId != null and proId !=''">
+            <if test="proId != null">
                 pro_id = #{proId,jdbcType=BIGINT} and
             </if>
 <!--            <if test="name != null and name !=''">-->
@@ -148,7 +150,7 @@
         select count(1)
         from pr_production_process t
         <trim prefix="where" suffixOverrides="and">
-            <if test="proId != null and proId !=''">
+            <if test="proId != null">
                 pro_id = #{proId,jdbcType=BIGINT} and
             </if>
             <!--            <if test="name != null and name !=''">-->
@@ -169,7 +171,7 @@
         select count(1)
         from pr_production_process
         where name = #{name} and deleted = 0
-        <if test="id != null and id !=''">
+        <if test="id != null">
             and id != #{id}
         </if>
     </select>

--
Gitblit v1.8.0