From d175d9c401fb97ebe6a580005a8c9ad5fedccb6b Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期一, 29 七月 2024 17:02:41 +0800
Subject: [PATCH] add other method
---
pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
index 905a7d8..17450de 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
@@ -22,6 +22,7 @@
<result property="outTime" column="out_time" jdbcType="TIMESTAMP"/>
<result property="updatedBy" column="updated_by" jdbcType="BIGINT"/>
<result property="memo" column="memo" jdbcType="VARCHAR"/>
+ <result property="number" column="number" jdbcType="INTEGER"/>
</resultMap>
<resultMap id="joinResultMap" type="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog" extends="BaseResultMap">
<result property="planName" column="plan_name" jdbcType="VARCHAR"/>
@@ -37,7 +38,7 @@
curr_node,node_content,device_cycle_content,
status,result,
error_msg,assistants,in_time,
- out_time,updated_by,memo
+ out_time,updated_by,memo,number
</sql>
@@ -51,11 +52,13 @@
select
t.* ,p.`name` plan_name,s.`name` station_name,u.`name` update_user_name
FROM
- sta_device_last t
+ (
+ select <include refid="Base_Column_List" /> from sta_device_production_log_past where device_no = #{deviceNo,jdbcType=VARCHAR} union
+ select <include refid="Base_Column_List" /> from sta_device_production_log where device_no = #{deviceNo,jdbcType=VARCHAR}
+ ) t
left join pr_assembly_plan p on t.plan_id=p.id
left join plt_station s on s.id = t.station_id
left JOIN ba_user u on u.id=t.updated_by
- where t.device_no = #{deviceNo,jdbcType=VARCHAR}
ORDER BY t.id DESC
</select>
@@ -70,14 +73,14 @@
,curr_node,node_content,device_cycle_content
,status,result
,error_msg,assistants,in_time
- ,out_time,updated_by,memo
+ ,out_time,updated_by,memo,number
)
values (#{id,jdbcType=BIGINT},#{deviceNo,jdbcType=VARCHAR},#{workId,jdbcType=BIGINT}
,#{repairId,jdbcType=BIGINT},#{planId,jdbcType=BIGINT},#{stationId,jdbcType=BIGINT}
,#{currNode,jdbcType=BIGINT},#{nodeContent,jdbcType=VARCHAR},#{deviceCycleContent,jdbcType=VARCHAR}
,#{status,jdbcType=TINYINT},#{result,jdbcType=TINYINT}
,#{errorMsg,jdbcType=VARCHAR},#{assistants,jdbcType=VARCHAR},#{inTime,jdbcType=TIMESTAMP}
- ,#{outTime,jdbcType=TIMESTAMP},#{updatedBy,jdbcType=BIGINT},#{memo,jdbcType=VARCHAR}
+ ,#{outTime,jdbcType=TIMESTAMP},#{updatedBy,jdbcType=BIGINT},#{memo,jdbcType=VARCHAR}, #{number,jdbcType=INTEGER}
)
</insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog" useGeneratedKeys="true">
@@ -100,6 +103,7 @@
<if test="outTime != null">out_time,</if>
<if test="updatedBy != null">updated_by,</if>
<if test="memo != null">memo,</if>
+ <if test="number != null">number,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=BIGINT},</if>
@@ -119,6 +123,7 @@
<if test="outTime != null">#{outTime,jdbcType=TIMESTAMP},</if>
<if test="updatedBy != null">#{updatedBy,jdbcType=BIGINT},</if>
<if test="memo != null">#{memo,jdbcType=VARCHAR},</if>
+ <if test="number != null">#{number,jdbcType=INTEGER},</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog">
@@ -172,6 +177,9 @@
<if test="memo != null">
memo = #{memo,jdbcType=VARCHAR},
</if>
+ <if test="number != null">
+ number = #{number,jdbcType=INTEGER},
+ </if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
@@ -193,7 +201,8 @@
in_time = #{inTime,jdbcType=TIMESTAMP},
out_time = #{outTime,jdbcType=TIMESTAMP},
updated_by = #{updatedBy,jdbcType=BIGINT},
- memo = #{memo,jdbcType=VARCHAR}
+ memo = #{memo,jdbcType=VARCHAR},
+ number = #{number,jdbcType=INTEGER}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>
--
Gitblit v1.8.0