From a3202d4c62be404247d23f0676e95f8c5d146983 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期六, 06 七月 2024 09:49:17 +0800
Subject: [PATCH] 添加根据设备号查询生产日志,生命周期,和相关信息;限制上传文档类型
---
pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml | 54 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml
index c6f32b4..66f08c4 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml
@@ -7,7 +7,7 @@
<resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaDeviceLast">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="equipNo" column="equip_no" jdbcType="VARCHAR"/>
- <result property="claimId" column="claim_id" jdbcType="BIGINT"/>
+ <result property="workId" column="work_id" jdbcType="BIGINT"/>
<result property="repairId" column="repair_id" jdbcType="BIGINT"/>
<result property="planId" column="plan_id" jdbcType="BIGINT"/>
<result property="stationId" column="station_id" jdbcType="BIGINT"/>
@@ -16,23 +16,41 @@
<result property="equipCycleContent" column="equip_cycle_content" jdbcType="VARCHAR"/>
<result property="status" column="status" jdbcType="TINYINT"/>
<result property="result" column="result" jdbcType="TINYINT"/>
- <result property="errorCode" column="error_code" jdbcType="VARCHAR"/>
+ <result property="errorMsg" column="error_msg" jdbcType="VARCHAR"/>
<result property="assistants" column="assistants" jdbcType="VARCHAR"/>
<result property="updatedBy" column="updated_by" jdbcType="BIGINT"/>
<result property="inTime" column="in_time" jdbcType="TIMESTAMP"/>
<result property="outTime" column="out_time" jdbcType="TIMESTAMP"/>
<result property="memo" column="memo" jdbcType="VARCHAR"/>
</resultMap>
+ <resultMap id="joinResultMap" type="com.dy.pmsGlobal.pojoSta.StaDeviceLife" extends="BaseResultMap">
+ <result property="planName" column="plan_name" jdbcType="VARCHAR"/>
+ <result property="stationName" column="station_name" jdbcType="VARCHAR"/>
+ <result property="updateUserName" column="update_user_name" jdbcType="VARCHAR"/>
+ <association property="assistantNames" jdbcType="VARCHAR" column="assistants"
+ select="com.dy.pmsGlobal.daoBa.BaUserMapper.selectNamesByAssistants" fetchType="eager" />
+ </resultMap>
<sql id="Base_Column_List">
- id,equip_no,claim_id,
+ id,equip_no,work_id,
repair_id,plan_id,station_id,
curr_node,node_content,equip_cycle_content,
status,result,
- error_code,assistants,
+ error_msg,assistants,
updated_by,in_time,out_time,
memo
</sql>
+ <select id="selectByEquipNo" parameterType="java.lang.String" resultMap="joinResultMap">
+ select
+ t.* ,p.`name` plan_name,s.`name` station_name,u.`name` update_user_name
+ FROM
+ sta_device_last 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.equip_no = #{equipNo,jdbcType=VARCHAR}
+ ORDER BY t.id DESC
+ </select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
@@ -53,18 +71,18 @@
</delete>
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLast" useGeneratedKeys="true">
insert into sta_device_last
- ( id,equip_no,claim_id
+ ( id,equip_no,work_id
,repair_id,plan_id,station_id
,curr_node,node_content,equip_cycle_content
,status,result
- ,error_code,assistants
+ ,error_msg,assistants
,updated_by,in_time,out_time
,memo)
- values (#{id,jdbcType=BIGINT},#{equipNo,jdbcType=VARCHAR},#{claimId,jdbcType=BIGINT}
+ values (#{id,jdbcType=BIGINT},#{equipNo,jdbcType=VARCHAR},#{workId,jdbcType=BIGINT}
,#{repairId,jdbcType=BIGINT},#{planId,jdbcType=BIGINT},#{stationId,jdbcType=BIGINT}
,#{currNode,jdbcType=BIGINT},#{nodeContent,jdbcType=VARCHAR},#{equipCycleContent,jdbcType=VARCHAR}
,#{status,jdbcType=TINYINT},#{result,jdbcType=TINYINT}
- ,#{errorCode,jdbcType=VARCHAR},#{assistants,jdbcType=VARCHAR}
+ ,#{errorMsg,jdbcType=VARCHAR},#{assistants,jdbcType=VARCHAR}
,#{updatedBy,jdbcType=BIGINT},#{inTime,jdbcType=TIMESTAMP},#{outTime,jdbcType=TIMESTAMP}
,#{memo,jdbcType=VARCHAR})
</insert>
@@ -73,7 +91,7 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="equipNo != null">equip_no,</if>
- <if test="claimId != null">claim_id,</if>
+ <if test="workId != null">work_id,</if>
<if test="repairId != null">repair_id,</if>
<if test="planId != null">plan_id,</if>
<if test="stationId != null">station_id,</if>
@@ -82,7 +100,7 @@
<if test="equipCycleContent != null">equip_cycle_content,</if>
<if test="status != null">status,</if>
<if test="result != null">result,</if>
- <if test="errorCode != null">error_code,</if>
+ <if test="errorMsg != null">error_msg,</if>
<if test="assistants != null">assistants,</if>
<if test="updatedBy != null">updated_by,</if>
<if test="inTime != null">in_time,</if>
@@ -92,7 +110,7 @@
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=BIGINT},</if>
<if test="equipNo != null">#{equipNo,jdbcType=VARCHAR},</if>
- <if test="claimId != null">#{claimId,jdbcType=BIGINT},</if>
+ <if test="workId != null">#{workId,jdbcType=BIGINT},</if>
<if test="repairId != null">#{repairId,jdbcType=BIGINT},</if>
<if test="planId != null">#{planId,jdbcType=BIGINT},</if>
<if test="stationId != null">#{stationId,jdbcType=BIGINT},</if>
@@ -101,7 +119,7 @@
<if test="equipCycleContent != null">#{equipCycleContent,jdbcType=VARCHAR},</if>
<if test="status != null">#{status,jdbcType=TINYINT},</if>
<if test="result != null">#{result,jdbcType=TINYINT},</if>
- <if test="errorCode != null">#{errorCode,jdbcType=VARCHAR},</if>
+ <if test="errorMsg != null">#{errorMsg,jdbcType=VARCHAR},</if>
<if test="assistants != null">#{assistants,jdbcType=VARCHAR},</if>
<if test="updatedBy != null">#{updatedBy,jdbcType=BIGINT},</if>
<if test="inTime != null">#{inTime,jdbcType=TIMESTAMP},</if>
@@ -115,8 +133,8 @@
<if test="equipNo != null">
equip_no = #{equipNo,jdbcType=VARCHAR},
</if>
- <if test="claimId != null">
- claim_id = #{claimId,jdbcType=BIGINT},
+ <if test="workId != null">
+ work_id = #{workId,jdbcType=BIGINT},
</if>
<if test="repairId != null">
repair_id = #{repairId,jdbcType=BIGINT},
@@ -142,8 +160,8 @@
<if test="result != null">
result = #{result,jdbcType=TINYINT},
</if>
- <if test="errorCode != null">
- error_code = #{errorCode,jdbcType=VARCHAR},
+ <if test="errorMsg != null">
+ error_msg = #{errorMsg,jdbcType=VARCHAR},
</if>
<if test="assistants != null">
assistants = #{assistants,jdbcType=VARCHAR},
@@ -167,7 +185,7 @@
update sta_device_last
set
equip_no = #{equipNo,jdbcType=VARCHAR},
- claim_id = #{claimId,jdbcType=BIGINT},
+ work_id = #{workId,jdbcType=BIGINT},
repair_id = #{repairId,jdbcType=BIGINT},
plan_id = #{planId,jdbcType=BIGINT},
station_id = #{stationId,jdbcType=BIGINT},
@@ -176,7 +194,7 @@
equip_cycle_content = #{equipCycleContent,jdbcType=VARCHAR},
status = #{status,jdbcType=TINYINT},
result = #{result,jdbcType=TINYINT},
- error_code = #{errorCode,jdbcType=VARCHAR},
+ error_msg = #{errorMsg,jdbcType=VARCHAR},
assistants = #{assistants,jdbcType=VARCHAR},
updated_by = #{updatedBy,jdbcType=BIGINT},
in_time = #{inTime,jdbcType=TIMESTAMP},
--
Gitblit v1.8.0