From 4d2576c1e9de09c9b325ba958fbe46b24dea9e4f Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 04 七月 2024 17:17:48 +0800
Subject: [PATCH] add node type

---
 pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
index 6c7a823..c5daeb1 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
@@ -12,6 +12,7 @@
             <result property="planId" column="plan_id" jdbcType="BIGINT"/>
             <result property="processId" column="process_id" jdbcType="BIGINT"/>
             <result property="nodeId" column="node_id" jdbcType="BIGINT"/>
+            <result property="nodeType" column="node_type" jdbcType="VARCHAR"/>
             <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
             <result property="status" column="status" jdbcType="TINYINT"/>
             <result property="startTime" column="start_time" jdbcType="TIMESTAMP"/>
@@ -35,6 +36,7 @@
         <result property="planId" column="plan_id" jdbcType="BIGINT"/>
         <result property="processId" column="process_id" jdbcType="BIGINT"/>
         <result property="nodeId" column="node_id" jdbcType="BIGINT"/>
+        <result property="nodeType" column="node_type" jdbcType="VARCHAR"/>
         <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
         <result property="status" column="status" jdbcType="TINYINT"/>
         <result property="startTime" column="start_time" jdbcType="TIMESTAMP"/>
@@ -53,7 +55,7 @@
     <sql id="Base_Column_List">
         id,user_id,line_id,
         station_id,plan_id,process_id,
-        node_id,dt,status,
+        node_id,node_type,dt,status,
         start_time,end_time,assistants
     </sql>
     <sql id="part_Column_List">
@@ -64,6 +66,7 @@
         ${alias}.plan_id,
         ${alias}.process_id,
         ${alias}.node_id,
+        ${alias}.node_type,
         ${alias}.dt,
         ${alias}.status,
         ${alias}.start_time,
@@ -284,12 +287,12 @@
         insert into sta_assembly_work_last
         ( id,user_id,line_id
         ,station_id,plan_id,process_id
-        ,node_id,dt,status
+        ,node_id,node_type,dt,status
         ,start_time,end_time,assistants
         )
         values (#{id,jdbcType=BIGINT},#{userId,jdbcType=BIGINT},#{lineId,jdbcType=BIGINT}
         ,#{stationId,jdbcType=BIGINT},#{planId,jdbcType=BIGINT},#{processId,jdbcType=BIGINT}
-        ,#{nodeId,jdbcType=BIGINT},#{dt,jdbcType=TIMESTAMP},#{status,jdbcType=TINYINT}
+        ,#{nodeId,jdbcType=BIGINT},#{nodeType,jdbcType=VARCHAR},#{dt,jdbcType=TIMESTAMP},#{status,jdbcType=TINYINT}
         ,#{startTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP},#{assistants,jdbcType=VARCHAR}
         )
     </insert>
@@ -303,6 +306,7 @@
                 <if test="planId != null">plan_id,</if>
                 <if test="processId != null">process_id,</if>
                 <if test="nodeId != null">node_id,</if>
+                <if test="nodeType != null">node_Type,</if>
                 <if test="dt != null">dt,</if>
                 <if test="status != null">status,</if>
                 <if test="startTime != null">start_time,</if>
@@ -317,6 +321,7 @@
                 <if test="planId != null">#{planId,jdbcType=BIGINT},</if>
                 <if test="processId != null">#{processId,jdbcType=BIGINT},</if>
                 <if test="nodeId != null">#{nodeId,jdbcType=BIGINT},</if>
+                <if test="nodeType != null">#{nodeType,jdbcType=BIGINT},</if>
                 <if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
                 <if test="status != null">#{status,jdbcType=TINYINT},</if>
                 <if test="startTime != null">#{startTime,jdbcType=TIMESTAMP},</if>
@@ -345,6 +350,9 @@
                 <if test="nodeId != null">
                     node_id = #{nodeId,jdbcType=BIGINT},
                 </if>
+                <if test="nodeType != null">
+                    node_type = #{nodeType,jdbcType=BIGINT},
+                </if>
                 <if test="dt != null">
                     dt = #{dt,jdbcType=TIMESTAMP},
                 </if>
@@ -372,6 +380,7 @@
             plan_id =  #{planId,jdbcType=BIGINT},
             process_id =  #{processId,jdbcType=BIGINT},
             node_id =  #{nodeId,jdbcType=BIGINT},
+            node_type =  #{nodeType,jdbcType=BIGINT},
             dt =  #{dt,jdbcType=TIMESTAMP},
             status =  #{status,jdbcType=TINYINT},
             start_time =  #{startTime,jdbcType=TIMESTAMP},

--
Gitblit v1.8.0