From d25b0270e0bb9266ed92c7c74ee1cb8fb24aa51a Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 14 一月 2025 10:53:02 +0800
Subject: [PATCH] add input_number
---
pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml | 55 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 35 insertions(+), 20 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 82399da..74a4b78 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml
@@ -13,6 +13,8 @@
<result property="stationId" column="station_id" jdbcType="BIGINT"/>
<result property="currNode" column="curr_node" jdbcType="BIGINT"/>
<result property="nodeContent" column="node_content" jdbcType="VARCHAR"/>
+ <result property="nextNode" column="next_node" jdbcType="BIGINT"/>
+ <result property="nextNodeContent" column="next_node_content" jdbcType="VARCHAR"/>
<result property="deviceCycleContent" column="device_cycle_content" jdbcType="VARCHAR"/>
<result property="status" column="status" jdbcType="TINYINT"/>
<result property="result" column="result" jdbcType="TINYINT"/>
@@ -69,14 +71,15 @@
insert into sta_device_last
( id,device_no,work_id
,repair_id,plan_id,station_id
- ,curr_node,node_content,device_cycle_content
+ ,curr_node,node_content,next_node,next_node_content,device_cycle_content
,status,result
,error_msg,assistants
,updated_by,in_time,out_time
,memo)
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}
+ ,#{currNode,jdbcType=BIGINT},#{nodeContent,jdbcType=VARCHAR},#{nextNode,jdbcType=BIGINT},#{nextNodeContent,jdbcType=VARCHAR}
+ ,#{deviceCycleContent,jdbcType=VARCHAR}
,#{status,jdbcType=TINYINT},#{result,jdbcType=TINYINT}
,#{errorMsg,jdbcType=VARCHAR},#{assistants,jdbcType=VARCHAR}
,#{updatedBy,jdbcType=BIGINT},#{inTime,jdbcType=TIMESTAMP},#{outTime,jdbcType=TIMESTAMP}
@@ -87,51 +90,55 @@
insert into sta_device_last
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
- <if test="deviceNo != null">device_no,</if>
+ <if test="deviceNo != null and deviceNo !=''">device_no,</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>
<if test="currNode != null">curr_node,</if>
- <if test="nodeContent != null">node_content,</if>
- <if test="deviceCycleContent != null">device_cycle_content,</if>
+ <if test="nodeContent != null and nodeContent !=''">node_content,</if>
+ <if test="nextNode != null">next_node,</if>
+ <if test="nextNodeContent != null and nextNodeContent !=''">next_node_content,</if>
+ <if test="deviceCycleContent != null and deviceCycleContent !=''">device_cycle_content,</if>
<if test="status != null">status,</if>
<if test="result != null">result,</if>
- <if test="errorMsg != null">error_msg,</if>
- <if test="assistants != null">assistants,</if>
+ <if test="errorMsg != null and errorMsg !=''">error_msg,</if>
+ <if test="assistants != null and assistants !=''">assistants,</if>
<if test="updatedBy != null">updated_by,</if>
<if test="inTime != null">in_time,</if>
<if test="outTime != null">out_time,</if>
<if test="inLineTime != null">in_line_time,</if>
<if test="outLineTime != null">out_line_time,</if>
- <if test="memo != null">memo,</if>
+ <if test="memo != null and memo !=''">memo,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=BIGINT},</if>
- <if test="deviceNo != null">#{deviceNo,jdbcType=VARCHAR},</if>
+ <if test="deviceNo != null and deviceNo !=''">#{deviceNo,jdbcType=VARCHAR},</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>
<if test="currNode != null">#{currNode,jdbcType=BIGINT},</if>
- <if test="nodeContent != null">#{nodeContent,jdbcType=VARCHAR},</if>
- <if test="deviceCycleContent != null">#{deviceCycleContent,jdbcType=VARCHAR},</if>
+ <if test="nodeContent != null and nodeContent !=''">#{nodeContent,jdbcType=VARCHAR},</if>
+ <if test="nextNode != null">#{nextNode,jdbcType=BIGINT},</if>
+ <if test="nextNodeContent != null and nextNodeContent !=''">#{nextNodeContent,jdbcType=VARCHAR},</if>
+ <if test="deviceCycleContent != null and deviceCycleContent !=''">#{deviceCycleContent,jdbcType=VARCHAR},</if>
<if test="status != null">#{status,jdbcType=TINYINT},</if>
<if test="result != null">#{result,jdbcType=TINYINT},</if>
- <if test="errorMsg != null">#{errorMsg,jdbcType=VARCHAR},</if>
- <if test="assistants != null">#{assistants,jdbcType=VARCHAR},</if>
+ <if test="errorMsg != null and errorMsg !=''">#{errorMsg,jdbcType=VARCHAR},</if>
+ <if test="assistants != null and assistants !=''">#{assistants,jdbcType=VARCHAR},</if>
<if test="updatedBy != null">#{updatedBy,jdbcType=BIGINT},</if>
<if test="inTime != null">#{inTime,jdbcType=TIMESTAMP},</if>
<if test="outTime != null">#{outTime,jdbcType=TIMESTAMP},</if>
<if test="inLineTime != null">#{inLineTime,jdbcType=TIMESTAMP},</if>
<if test="outLineTime != null">#{outLineTime,jdbcType=TIMESTAMP},</if>
- <if test="memo != null">#{memo,jdbcType=VARCHAR},</if>
+ <if test="memo != null and memo !=''">#{memo,jdbcType=VARCHAR},</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLast">
update sta_device_last
<set>
- <if test="deviceNo != null">
+ <if test="deviceNo != null and deviceNo !=''">
device_no = #{deviceNo,jdbcType=VARCHAR},
</if>
<if test="workId != null">
@@ -149,10 +156,16 @@
<if test="currNode != null">
curr_node = #{currNode,jdbcType=BIGINT},
</if>
- <if test="nodeContent != null">
+ <if test="nodeContent != null and nodeContent !=''">
node_content = #{nodeContent,jdbcType=VARCHAR},
</if>
- <if test="deviceCycleContent != null">
+ <if test="nextNode != null">
+ next_node = #{nextNode,jdbcType=BIGINT},
+ </if>
+ <if test="nextNodeContent != null and nextNodeContent !=''">
+ next_node_content = #{nextNodeContent,jdbcType=VARCHAR},
+ </if>
+ <if test="deviceCycleContent != null and deviceCycleContent !=''">
device_cycle_content = #{deviceCycleContent,jdbcType=VARCHAR},
</if>
<if test="status != null">
@@ -161,10 +174,10 @@
<if test="result != null">
result = #{result,jdbcType=TINYINT},
</if>
- <if test="errorMsg != null">
+ <if test="errorMsg != null and errorMsg !=''">
error_msg = #{errorMsg,jdbcType=VARCHAR},
</if>
- <if test="assistants != null">
+ <if test="assistants != null and assistants !=''">
assistants = #{assistants,jdbcType=VARCHAR},
</if>
<if test="updatedBy != null">
@@ -182,7 +195,7 @@
<if test="outLineTime != null">
out_line_time = #{outLineTime,jdbcType=TIMESTAMP},
</if>
- <if test="memo != null">
+ <if test="memo != null and memo !=''">
memo = #{memo,jdbcType=VARCHAR},
</if>
</set>
@@ -198,6 +211,8 @@
station_id = #{stationId,jdbcType=BIGINT},
curr_node = #{currNode,jdbcType=BIGINT},
node_content = #{nodeContent,jdbcType=VARCHAR},
+ next_node = #{nextNode,jdbcType=BIGINT},
+ next_node_content = #{nextNodeContent,jdbcType=VARCHAR},
device_cycle_content = #{deviceCycleContent,jdbcType=VARCHAR},
status = #{status,jdbcType=TINYINT},
result = #{result,jdbcType=TINYINT},
--
Gitblit v1.8.0