From a5b7ba070f03327f8848593a31c44cc79e7bb24a Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 11 七月 2024 21:53:14 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml
index 877c01d..c4fab1e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrControllerTrampMapper.xml
@@ -8,10 +8,11 @@
<result column="rtuAddr" jdbcType="VARCHAR" property="rtuAddr" />
<result column="protocol" jdbcType="VARCHAR" property="protocol" />
<result column="findDt" jdbcType="TIMESTAMP" property="findDt" />
+ <result column="orgTag" jdbcType="VARCHAR" property="orgTag" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, rtuAddr, protocol, findDt
+ id, rtuAddr, protocol, findDt, orgTag
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -37,9 +38,9 @@
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoPr.PrControllerTramp">
<!--@mbg.generated-->
insert into pr_controller_tramp (id, rtuAddr, protocol,
- findDt)
+ findDt, orgTag)
values (#{id,jdbcType=BIGINT}, #{rtuAddr,jdbcType=VARCHAR}, #{protocol,jdbcType=VARCHAR},
- #{findDt,jdbcType=TIMESTAMP})
+ #{findDt,jdbcType=TIMESTAMP},#{orgTag,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoPr.PrControllerTramp">
<!--@mbg.generated-->
@@ -57,6 +58,9 @@
<if test="findDt != null">
findDt,
</if>
+ <if test="orgTag != null">
+ orgTag,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
@@ -70,6 +74,9 @@
</if>
<if test="findDt != null">
#{findDt,jdbcType=TIMESTAMP},
+ </if>
+ <if test="orgTag != null">
+ #{orgTag,jdbcType=VARCHAR},
</if>
</trim>
</insert>
@@ -86,6 +93,9 @@
<if test="findDt != null">
findDt = #{findDt,jdbcType=TIMESTAMP},
</if>
+ <if test="orgTag != null">
+ orgTag = #{orgTag,jdbcType=VARCHAR},
+ </if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
@@ -94,7 +104,8 @@
update pr_controller_tramp
set rtuAddr = #{rtuAddr,jdbcType=VARCHAR},
protocol = #{protocol,jdbcType=VARCHAR},
- findDt = #{findDt,jdbcType=TIMESTAMP}
+ findDt = #{findDt,jdbcType=TIMESTAMP},
+ orgTag = #{orgTag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
</update>
@@ -113,7 +124,8 @@
select CAST(id AS char)AS id,
rtuAddr,
protocol,
- findDt
+ findDt,
+ orgTag
FROM pr_controller_tramp
<where>
<if test="id != null and id !=''">
@@ -125,7 +137,6 @@
<if test="protocol != null and protocol != ''">
AND protocol = #{protocol,jdbcType=VARCHAR}
</if>
-
</where>
</select>
<!-- 鏍规嵁鏉′欢鑾峰彇娴佹氮鎺у埗鍣ㄦ暟閲�-->
--
Gitblit v1.8.0