From d01bad0d465d3a00644f8c5521be88c4b13237c3 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 04 七月 2024 17:28:10 +0800
Subject: [PATCH] add node type
---
pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml | 54 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 11 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 1e9f4cf..40a0fb3 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="TINYINT"/>
<result property="dt" column="dt" jdbcType="TIMESTAMP"/>
<result property="status" column="status" jdbcType="TINYINT"/>
<result property="startTime" column="start_time" jdbcType="TIMESTAMP"/>
@@ -21,22 +22,40 @@
select="com.dy.pmsGlobal.daoBa.BaUserMapper.selectNameByUserId" fetchType="eager" />
<association property="stationName" column="station_id" javaType="java.lang.Long"
select="com.dy.pmsGlobal.daoPlt.PltStationMapper.selectNameByStationId" fetchType="eager" />
- <association property="planName" column="plan_id" javaType="java.lang.Long"
- select="com.dy.pmsGlobal.daoPr.PrAssemblyPlanMapper.selectNameByPlanId" fetchType="eager" />
- <association property="processName" column="process_id" javaType="java.lang.Long"
- select="com.dy.pmsGlobal.daoPr.PrProductionProcessMapper.selectProcessNameById" fetchType="eager" />
- <association property="nodeName" column="node_id" javaType="java.lang.Long"
- select="com.dy.pmsGlobal.daoPr.PrProductionNodeMapper.selectNameByNodeId" fetchType="eager" />
<association property="lineName" column="line_id" javaType="java.lang.Long"
select="com.dy.pmsGlobal.daoPlt.PltProductionLineMapper.selectNameByLineId" fetchType="eager" />
<collection property="assistantsList" ofType="com.dy.pmsGlobal.pojoBa.BaUser"
select="com.dy.pmsGlobal.daoBa.BaUserMapper.selectByAssistants" fetchType="eager" column="assistants" />
</resultMap>
+ <resultMap id="SelectResultMap" type="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast">
+ <id property="id" column="id" jdbcType="BIGINT"/>
+ <result property="userId" column="user_id" jdbcType="BIGINT"/>
+ <result property="lineId" column="line_id" jdbcType="BIGINT"/>
+ <result property="stationId" column="station_id" jdbcType="BIGINT"/>
+ <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="dt" column="dt" jdbcType="TIMESTAMP"/>
+ <result property="status" column="status" jdbcType="TINYINT"/>
+ <result property="startTime" column="start_time" jdbcType="TIMESTAMP"/>
+ <result property="endTime" column="end_time" jdbcType="TIMESTAMP"/>
+ <result property="assistants" column="assistants" jdbcType="VARCHAR"/>
+ <result property="userName" column="user_name" jdbcType="VARCHAR"/>
+ <result property="stationName" column="station_name" jdbcType="VARCHAR"/>
+ <result property="planName" column="plan_name" jdbcType="VARCHAR"/>
+ <result property="processName" column="process_name" jdbcType="VARCHAR"/>
+ <result property="nodeName" column="node_name" jdbcType="VARCHAR"/>
+ <result property="lineName" column="line_name" jdbcType="VARCHAR"/>
+ <collection property="assistantsList" ofType="com.dy.pmsGlobal.pojoBa.BaUser"
+ select="com.dy.pmsGlobal.daoBa.BaUserMapper.selectByAssistants" fetchType="eager" column="assistants" />
+ </resultMap>
+
<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">
@@ -47,6 +66,7 @@
${alias}.plan_id,
${alias}.process_id,
${alias}.node_id,
+ ${alias}.node_type,
${alias}.dt,
${alias}.status,
${alias}.start_time,
@@ -122,11 +142,17 @@
</where>
order by id desc
</select>
- <select id="selectSome" resultMap="BaseResultMap">
+ <select id="selectSome" resultMap="SelectResultMap">
select
<include refid="part_Column_List" >
<property name="alias" value="l"/>
- </include>
+ </include>,
+ u.name as user_name,
+ s.name as station_name,
+ p.name as plan_name,
+ pp.name as process_name,
+ n.content as node_name,
+ ll.name as line_name
from sta_assembly_work_last l
left join ba_user u on l.user_id = u.id
left join plt_station s on l.station_id = s.id
@@ -261,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=TINYINT},#{dt,jdbcType=TIMESTAMP},#{status,jdbcType=TINYINT}
,#{startTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP},#{assistants,jdbcType=VARCHAR}
)
</insert>
@@ -280,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>
@@ -294,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=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>
@@ -322,6 +350,9 @@
<if test="nodeId != null">
node_id = #{nodeId,jdbcType=BIGINT},
</if>
+ <if test="nodeType != null">
+ node_type = #{nodeType,jdbcType=TINYINT},
+ </if>
<if test="dt != null">
dt = #{dt,jdbcType=TIMESTAMP},
</if>
@@ -349,6 +380,7 @@
plan_id = #{planId,jdbcType=BIGINT},
process_id = #{processId,jdbcType=BIGINT},
node_id = #{nodeId,jdbcType=BIGINT},
+ node_type = #{nodeType,jdbcType=TINYINT},
dt = #{dt,jdbcType=TIMESTAMP},
status = #{status,jdbcType=TINYINT},
start_time = #{startTime,jdbcType=TIMESTAMP},
--
Gitblit v1.8.0