From 530385f0901cb838540bc3f83d573686eb3a3bb4 Mon Sep 17 00:00:00 2001
From: liuxm <liuxm@fescotech.com>
Date: 星期四, 16 五月 2024 17:48:47 +0800
Subject: [PATCH] 按功能点添加权限;工站添加生产线关联

---
 pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml |   62 +++++++++++++------------------
 1 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml
index 4240ac2..db8786b 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml
@@ -6,19 +6,24 @@
 
     <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoPlt.PltStation">
         <id property="id" column="id" jdbcType="BIGINT"/>
+        <result property="lineId" column="line_id" jdbcType="BIGINT"/>
         <result property="code" column="code" jdbcType="VARCHAR"/>
         <result property="name" column="name" jdbcType="VARCHAR"/>
         <result property="remark" column="remark" jdbcType="VARCHAR"/>
         <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
         <result column="disabled" property="disabled" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/>
         <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler"/>
+        <association property="lineName" column="line_id" javaType="java.lang.Long"
+                     select="selectLineNameById" fetchType="eager" />
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,code,name,disabled,
+        id,line_id,code,name,disabled,
         remark,dt,deleted
     </sql>
-
+    <select id="selectLineNameById" parameterType="java.lang.Long" resultType="String">
+        select name from plt_production_line where id = #{lineId}
+    </select>
     <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
@@ -26,61 +31,46 @@
         where  id = #{id,jdbcType=BIGINT} 
     </select>
 
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-        delete from plt_station
-        where  id = #{id,jdbcType=BIGINT} 
-    </delete>
-    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltStation" useGeneratedKeys="true">
-        insert into plt_station
-        ( id,code,name
-        ,remark,deleted
-        )
-        values (#{id,jdbcType=BIGINT},#{code,jdbcType=VARCHAR},#{name,jdbcType=VARCHAR}
-        ,#{remark,jdbcType=VARCHAR},#{deleted,jdbcType=TINYINT}
-        )
-    </insert>
     <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPlt.PltStation" useGeneratedKeys="true">
         insert into plt_station
         <trim prefix="(" suffix=")" suffixOverrides=",">
                 <if test="id != null">id,</if>
+                <if test="lineId != null">line_id,</if>
                 <if test="code != null">code,</if>
                 <if test="name != null">name,</if>
                 <if test="remark != null">remark,</if>
+                <if test="disabled != null">disabled,</if>
                 <if test="deleted != null">deleted,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
                 <if test="id != null">#{id,jdbcType=BIGINT},</if>
+                <if test="lineId != null">#{lineId,jdbcType=VARCHAR},</if>
                 <if test="code != null">#{code,jdbcType=VARCHAR},</if>
                 <if test="name != null">#{name,jdbcType=VARCHAR},</if>
                 <if test="remark != null">#{remark,jdbcType=VARCHAR},</if>
+                <if test="disabled != null">#{disabled,jdbcType=TINYINT},</if>
                 <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPlt.PltStation">
         update plt_station
         <set>
-                <if test="code != null">
-                    code = #{code,jdbcType=VARCHAR},
-                </if>
-                <if test="name != null">
-                    name = #{name,jdbcType=VARCHAR},
-                </if>
-                <if test="remark != null">
-                    remark = #{remark,jdbcType=VARCHAR},
-                </if>
-                <if test="deleted != null">
-                    deleted = #{deleted,jdbcType=TINYINT},
-                </if>
+            <if test="code != null">
+                code = #{code,jdbcType=VARCHAR},
+            </if>
+            <if test="name != null">
+                name = #{name,jdbcType=VARCHAR},
+            </if>
+            <if test="remark != null">
+                remark = #{remark,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.PltStation">
-        update plt_station
-        set 
-            code =  #{code,jdbcType=VARCHAR},
-            name =  #{name,jdbcType=VARCHAR},
-            remark =  #{remark,jdbcType=VARCHAR},
-            deleted =  #{deleted,jdbcType=TINYINT}
         where   id = #{id,jdbcType=BIGINT} 
     </update>
 

--
Gitblit v1.8.0