From 1416681fe19d6e9feb1538b1f64a2bcd7f53a5fe Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期五, 05 七月 2024 14:00:33 +0800
Subject: [PATCH] add getworklast

---
 pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml |   73 +++++++++++-------------------------
 1 files changed, 23 insertions(+), 50 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 c50c2d3..661dc22 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
@@ -12,7 +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="TINYINT"/>
+        <result property="workType" column="work_type" jdbcType="TINYINT"/>
         <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
         <result property="status" column="status" jdbcType="TINYINT"/>
         <result property="startTime" column="start_time" jdbcType="TIMESTAMP"/>
@@ -44,7 +44,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="TINYINT"/>
+        <result property="workType" column="work_type" jdbcType="TINYINT"/>
         <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
         <result property="status" column="status" jdbcType="TINYINT"/>
         <result property="startTime" column="start_time" jdbcType="TIMESTAMP"/>
@@ -65,50 +65,23 @@
         id
         ,user_id,line_id,
         station_id,plan_id,process_id,
-        node_id,node_type,dt,status,
+        node_id,work_type,dt,status,
         start_time,end_time,assistants
     </sql>
     <sql id="part_Column_List">
-        ${alias}
-        .
-        id
-        ,
-        ${alias}
-        .
-        user_id,
-        ${alias}
-        .
-        line_id,
-        ${alias}
-        .
-        station_id,
-        ${alias}
-        .
-        plan_id,
-        ${alias}
-        .
-        process_id,
-        ${alias}
-        .
-        node_id,
-        ${alias}
-        .
-        node_type,
-        ${alias}
-        .
-        dt,
-        ${alias}
-        .
-        status,
-        ${alias}
-        .
-        start_time,
-        ${alias}
-        .
-        end_time,
-        ${alias}
-        .
-        assistants
+        ${alias}.id,
+        ${alias}.user_id,
+        ${alias}.line_id,
+        ${alias}.station_id,
+        ${alias}.plan_id,
+        ${alias}.process_id,
+        ${alias}.node_id,
+        ${alias}.work_type,
+        ${alias}.dt,
+        ${alias}.status,
+        ${alias}.start_time,
+        ${alias}.end_time,
+        ${alias}.assistants
     </sql>
     <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
         select
@@ -327,11 +300,11 @@
         insert into sta_assembly_work_last
         ( id, user_id, line_id
         , station_id, plan_id, process_id
-        , node_id, node_type, dt, status
+        , node_id, work_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}, #{nodeType,jdbcType=TINYINT}, #{dt,jdbcType=TIMESTAMP}
+               , #{nodeId,jdbcType=BIGINT}, #{workType,jdbcType=TINYINT}, #{dt,jdbcType=TIMESTAMP}
                , #{status,jdbcType=TINYINT}
                , #{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, #{assistants,jdbcType=VARCHAR})
     </insert>
@@ -346,7 +319,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="workType != null">work_Type,</if>
             <if test="dt != null">dt,</if>
             <if test="status != null">status,</if>
             <if test="startTime != null">start_time,</if>
@@ -361,7 +334,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=TINYINT},</if>
+            <if test="workType != null">#{workType,jdbcType=TINYINT},</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>
@@ -390,8 +363,8 @@
             <if test="nodeId != null">
                 node_id = #{nodeId,jdbcType=BIGINT},
             </if>
-            <if test="nodeType != null">
-                node_type = #{nodeType,jdbcType=TINYINT},
+            <if test="workType != null">
+                work_type = #{workType,jdbcType=TINYINT},
             </if>
             <if test="dt != null">
                 dt = #{dt,jdbcType=TIMESTAMP},
@@ -419,7 +392,7 @@
             plan_id    = #{planId,jdbcType=BIGINT},
             process_id = #{processId,jdbcType=BIGINT},
             node_id    = #{nodeId,jdbcType=BIGINT},
-            node_type  = #{nodeType,jdbcType=TINYINT},
+            work_type  = #{workType,jdbcType=TINYINT},
             dt         = #{dt,jdbcType=TIMESTAMP},
             status     = #{status,jdbcType=TINYINT},
             start_time = #{startTime,jdbcType=TIMESTAMP},

--
Gitblit v1.8.0