From 4837d8e606a630945a8150cd8dff3fb0e48f0784 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 20 六月 2024 14:26:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeMapper.xml | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeMapper.xml
index 21d5a69..9bb4600 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeMapper.xml
@@ -7,10 +7,10 @@
<resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaDeviceLife">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="equipNo" column="equip_no" jdbcType="VARCHAR"/>
- <result property="planId" column="plan_id" jdbcType="VARCHAR"/>
- <result property="stationId" column="station_id" jdbcType="VARCHAR"/>
- <result property="currNode" column="curr_node" jdbcType="VARCHAR"/>
- <result property="nextNode" column="next_node" jdbcType="VARCHAR"/>
+ <result property="planId" column="plan_id" jdbcType="BIGINT"/>
+ <result property="stationId" column="station_id" jdbcType="BIGINT"/>
+ <result property="currNode" column="curr_node" jdbcType="BIGINT"/>
+ <result property="nextNode" column="next_node" jdbcType="BIGINT"/>
<result property="inLineTime" column="in_line_time" jdbcType="TIMESTAMP"/>
<result property="status" column="status" jdbcType="TINYINT"/>
<result property="result" column="result" jdbcType="TINYINT"/>
@@ -18,7 +18,7 @@
<result property="memo" column="memo" jdbcType="VARCHAR"/>
<result property="assistants" column="assistants" jdbcType="VARCHAR"/>
<result property="updatedDate" column="updated_date" jdbcType="TIMESTAMP"/>
- <result property="updatedBy" column="updated_by" jdbcType="VARCHAR"/>
+ <result property="updatedBy" column="updated_by" jdbcType="BIGINT"/>
<result property="claimId" column="claim_id" jdbcType="BIGINT"/>
<result property="repairId" column="repair_id" jdbcType="BIGINT"/>
</resultMap>
@@ -51,11 +51,11 @@
,error_code,memo,assistants
,updated_date,updated_by,claim_id
,repair_id)
- values (#{id,jdbcType=BIGINT},#{equipNo,jdbcType=VARCHAR},#{planId,jdbcType=VARCHAR}
- ,#{stationId,jdbcType=VARCHAR},#{currNode,jdbcType=VARCHAR},#{nextNode,jdbcType=VARCHAR}
+ values (#{id,jdbcType=BIGINT},#{equipNo,jdbcType=VARCHAR},#{planId,jdbcType=BIGINT}
+ ,#{stationId,jdbcType=BIGINT},#{currNode,jdbcType=BIGINT},#{nextNode,jdbcType=BIGINT}
,#{inLineTime,jdbcType=TIMESTAMP},#{status,jdbcType=TINYINT},#{result,jdbcType=TINYINT}
,#{errorCode,jdbcType=VARCHAR},#{memo,jdbcType=VARCHAR},#{assistants,jdbcType=VARCHAR}
- ,#{updatedDate,jdbcType=TIMESTAMP},#{updatedBy,jdbcType=VARCHAR},#{claimId,jdbcType=BIGINT}
+ ,#{updatedDate,jdbcType=TIMESTAMP},#{updatedBy,jdbcType=BIGINT},#{claimId,jdbcType=BIGINT}
,#{repairId,jdbcType=BIGINT})
</insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLife" useGeneratedKeys="true">
@@ -81,10 +81,10 @@
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=BIGINT},</if>
<if test="equipNo != null">#{equipNo,jdbcType=VARCHAR},</if>
- <if test="planId != null">#{planId,jdbcType=VARCHAR},</if>
- <if test="stationId != null">#{stationId,jdbcType=VARCHAR},</if>
- <if test="currNode != null">#{currNode,jdbcType=VARCHAR},</if>
- <if test="nextNode != null">#{nextNode,jdbcType=VARCHAR},</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="nextNode != null">#{nextNode,jdbcType=BIGINT},</if>
<if test="inLineTime != null">#{inLineTime,jdbcType=TIMESTAMP},</if>
<if test="status != null">#{status,jdbcType=TINYINT},</if>
<if test="result != null">#{result,jdbcType=TINYINT},</if>
@@ -92,7 +92,7 @@
<if test="memo != null">#{memo,jdbcType=VARCHAR},</if>
<if test="assistants != null">#{assistants,jdbcType=VARCHAR},</if>
<if test="updatedDate != null">#{updatedDate,jdbcType=TIMESTAMP},</if>
- <if test="updatedBy != null">#{updatedBy,jdbcType=VARCHAR},</if>
+ <if test="updatedBy != null">#{updatedBy,jdbcType=BIGINT},</if>
<if test="claimId != null">#{claimId,jdbcType=BIGINT},</if>
<if test="repairId != null">#{repairId,jdbcType=BIGINT},</if>
</trim>
@@ -104,16 +104,16 @@
equip_no = #{equipNo,jdbcType=VARCHAR},
</if>
<if test="planId != null">
- plan_id = #{planId,jdbcType=VARCHAR},
+ plan_id = #{planId,jdbcType=BIGINT},
</if>
<if test="stationId != null">
- station_id = #{stationId,jdbcType=VARCHAR},
+ station_id = #{stationId,jdbcType=BIGINT},
</if>
<if test="currNode != null">
- curr_node = #{currNode,jdbcType=VARCHAR},
+ curr_node = #{currNode,jdbcType=BIGINT},
</if>
<if test="nextNode != null">
- next_node = #{nextNode,jdbcType=VARCHAR},
+ next_node = #{nextNode,jdbcType=BIGINT},
</if>
<if test="inLineTime != null">
in_line_time = #{inLineTime,jdbcType=TIMESTAMP},
@@ -137,7 +137,7 @@
updated_date = #{updatedDate,jdbcType=TIMESTAMP},
</if>
<if test="updatedBy != null">
- updated_by = #{updatedBy,jdbcType=VARCHAR},
+ updated_by = #{updatedBy,jdbcType=BIGINT},
</if>
<if test="claimId != null">
claim_id = #{claimId,jdbcType=BIGINT},
@@ -152,10 +152,10 @@
update sta_device_life
set
equip_no = #{equipNo,jdbcType=VARCHAR},
- plan_id = #{planId,jdbcType=VARCHAR},
- station_id = #{stationId,jdbcType=VARCHAR},
- curr_node = #{currNode,jdbcType=VARCHAR},
- next_node = #{nextNode,jdbcType=VARCHAR},
+ plan_id = #{planId,jdbcType=BIGINT},
+ station_id = #{stationId,jdbcType=BIGINT},
+ curr_node = #{currNode,jdbcType=BIGINT},
+ next_node = #{nextNode,jdbcType=BIGINT},
in_line_time = #{inLineTime,jdbcType=TIMESTAMP},
status = #{status,jdbcType=TINYINT},
result = #{result,jdbcType=TINYINT},
@@ -163,7 +163,7 @@
memo = #{memo,jdbcType=VARCHAR},
assistants = #{assistants,jdbcType=VARCHAR},
updated_date = #{updatedDate,jdbcType=TIMESTAMP},
- updated_by = #{updatedBy,jdbcType=VARCHAR},
+ updated_by = #{updatedBy,jdbcType=BIGINT},
claim_id = #{claimId,jdbcType=BIGINT},
repair_id = #{repairId,jdbcType=BIGINT}
where id = #{id,jdbcType=BIGINT}
--
Gitblit v1.8.0