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 | 95 +++++++++++++++++++++++++++-------------------- 1 files changed, 55 insertions(+), 40 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 78c50b2..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} @@ -86,45 +89,49 @@ <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLast" useGeneratedKeys="true"> insert into sta_device_last <trim prefix="(" suffix=")" suffixOverrides=","> - <if test="id != null and id !=''">id,</if> + <if test="id != null">id,</if> <if test="deviceNo != null and deviceNo !=''">device_no,</if> - <if test="workId != null and workId !=''">work_id,</if> - <if test="repairId != null and repairId !=''">repair_id,</if> - <if test="planId != null and planId !=''">plan_id,</if> - <if test="stationId != null and stationId !=''">station_id,</if> - <if test="currNode != null and currNode !=''">curr_node,</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 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 and status !=''">status,</if> - <if test="result != null and result !=''">result,</if> + <if test="status != null">status,</if> + <if test="result != null">result,</if> <if test="errorMsg != null and errorMsg !=''">error_msg,</if> <if test="assistants != null and assistants !=''">assistants,</if> - <if test="updatedBy != null and updatedBy !=''">updated_by,</if> - <if test="inTime != null and inTime !=''">in_time,</if> - <if test="outTime != null and outTime !=''">out_time,</if> - <if test="inLineTime != null and inLineTime !=''">in_line_time,</if> - <if test="outLineTime != null and outLineTime !=''">out_line_time,</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 and memo !=''">memo,</if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> - <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if> + <if test="id != null">#{id,jdbcType=BIGINT},</if> <if test="deviceNo != null and deviceNo !=''">#{deviceNo,jdbcType=VARCHAR},</if> - <if test="workId != null and workId !=''">#{workId,jdbcType=BIGINT},</if> - <if test="repairId != null and repairId !=''">#{repairId,jdbcType=BIGINT},</if> - <if test="planId != null and planId !=''">#{planId,jdbcType=BIGINT},</if> - <if test="stationId != null and stationId !=''">#{stationId,jdbcType=BIGINT},</if> - <if test="currNode != null and currNode !=''">#{currNode,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> + <if test="currNode != null">#{currNode,jdbcType=BIGINT},</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 and status !=''">#{status,jdbcType=TINYINT},</if> - <if test="result != null and result !=''">#{result,jdbcType=TINYINT},</if> + <if test="status != null">#{status,jdbcType=TINYINT},</if> + <if test="result != null">#{result,jdbcType=TINYINT},</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 and updatedBy !=''">#{updatedBy,jdbcType=BIGINT},</if> - <if test="inTime != null and inTime !=''">#{inTime,jdbcType=TIMESTAMP},</if> - <if test="outTime != null and outTime !=''">#{outTime,jdbcType=TIMESTAMP},</if> - <if test="inLineTime != null and inLineTime !=''">#{inLineTime,jdbcType=TIMESTAMP},</if> - <if test="outLineTime != null and outLineTime !=''">#{outLineTime,jdbcType=TIMESTAMP},</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 and memo !=''">#{memo,jdbcType=VARCHAR},</if> </trim> </insert> @@ -134,31 +141,37 @@ <if test="deviceNo != null and deviceNo !=''"> device_no = #{deviceNo,jdbcType=VARCHAR}, </if> - <if test="workId != null and workId !=''"> + <if test="workId != null"> work_id = #{workId,jdbcType=BIGINT}, </if> - <if test="repairId != null and repairId !=''"> + <if test="repairId != null"> repair_id = #{repairId,jdbcType=BIGINT}, </if> - <if test="planId != null and planId !=''"> + <if test="planId != null"> plan_id = #{planId,jdbcType=BIGINT}, </if> - <if test="stationId != null and stationId !=''"> + <if test="stationId != null"> station_id = #{stationId,jdbcType=BIGINT}, </if> - <if test="currNode != null and currNode !=''"> + <if test="currNode != null"> curr_node = #{currNode,jdbcType=BIGINT}, </if> <if test="nodeContent != null and nodeContent !=''"> node_content = #{nodeContent,jdbcType=VARCHAR}, </if> + <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 and status !=''"> + <if test="status != null"> status = #{status,jdbcType=TINYINT}, </if> - <if test="result != null and result !=''"> + <if test="result != null"> result = #{result,jdbcType=TINYINT}, </if> <if test="errorMsg != null and errorMsg !=''"> @@ -167,19 +180,19 @@ <if test="assistants != null and assistants !=''"> assistants = #{assistants,jdbcType=VARCHAR}, </if> - <if test="updatedBy != null and updatedBy !=''"> + <if test="updatedBy != null"> updated_by = #{updatedBy,jdbcType=BIGINT}, </if> - <if test="inTime != null and inTime !=''"> + <if test="inTime != null"> in_time = #{inTime,jdbcType=TIMESTAMP}, </if> - <if test="outTime != null and outTime !=''"> + <if test="outTime != null"> out_time = #{outTime,jdbcType=TIMESTAMP}, </if> - <if test="inLineTime != null and inLineTime !=''"> + <if test="inLineTime != null"> in_line_time = #{inLineTime,jdbcType=TIMESTAMP}, </if> - <if test="outLineTime != null and outLineTime !=''"> + <if test="outLineTime != null"> out_line_time = #{outLineTime,jdbcType=TIMESTAMP}, </if> <if test="memo != null and memo !=''"> @@ -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