From 23213c63022ee4dd7f4d8f678838865f01e9b2df Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期五, 19 一月 2024 11:06:48 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.0.189:29418/Jcdm041-Mes
---
jcdm-main/src/main/resources/mapper/bs/technologyRoute/BsTechnologyRouteInfoMapper.xml | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/jcdm-main/src/main/resources/mapper/bs/technologyRoute/BsTechnologyRouteInfoMapper.xml b/jcdm-main/src/main/resources/mapper/bs/technologyRoute/BsTechnologyRouteInfoMapper.xml
index 6dad025..c18d1e1 100644
--- a/jcdm-main/src/main/resources/mapper/bs/technologyRoute/BsTechnologyRouteInfoMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/bs/technologyRoute/BsTechnologyRouteInfoMapper.xml
@@ -8,6 +8,8 @@
<result property="id" column="id" />
<result property="routeCode" column="route_code" />
<result property="routeName" column="route_name" />
+ <result property="lineCode" column="line_code" />
+ <result property="lineName" column="line_name" />
<result property="productCode" column="product_code" />
<result property="productName" column="product_name" />
<result property="version" column="version" />
@@ -25,7 +27,7 @@
</resultMap>
<sql id="selectBsTechnologyRouteInfoVo">
- select id, route_code, route_name, product_code, product_name, version, status, data_source, remark, create_user, create_time, update_user, update_time, spare_field_1, spare_field_2, spare_field_3, spare_field_4 from bs_technology_route_info
+ select id, route_code, route_name, line_code, line_name , product_code, product_name, version, status, data_source, remark, create_user, create_time, update_user, update_time, spare_field_1, spare_field_2, spare_field_3, spare_field_4 from bs_technology_route_info
</sql>
<select id="selectBsTechnologyRouteInfoList" parameterType="BsTechnologyRouteInfo" resultMap="BsTechnologyRouteInfoResult">
@@ -36,6 +38,8 @@
<if test="productCode != null and productCode != ''"> and product_code like concat('%', #{productCode}, '%')</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="status != null and status != ''"> and status = #{status}</if>
+ <if test="lineCode != null and lineCode != ''"> and line_code like concat('%', #{lineCode}, '%')</if>
+ <if test="lineName != null and lineName != ''"> and line_name like concat('%', #{lineName}, '%')</if>
<if test="dataSource != null and dataSource != ''"> and data_source like concat('%', #{dataSource}, '%')</if>
</where>
</select>
@@ -50,6 +54,8 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="routeCode != null and routeCode != ''">route_code,</if>
+ <if test="lineCode != null and lineCode != ''">line_code,</if>
+ <if test="lineName != null and lineName != ''">line_name,</if>
<if test="routeName != null">route_name,</if>
<if test="productCode != null and productCode != ''">product_code,</if>
<if test="productName != null">product_name,</if>
@@ -70,6 +76,8 @@
<if test="id != null">#{id},</if>
<if test="routeCode != null and routeCode != ''">#{routeCode},</if>
<if test="routeName != null">#{routeName},</if>
+ <if test="lineCode != null and lineCode != ''">#{lineCode},</if>
+ <if test="lineName != null and lineName != ''">#{lineName},</if>
<if test="productCode != null and productCode != ''">#{productCode},</if>
<if test="productName != null">#{productName},</if>
<if test="version != null">#{version},</if>
@@ -91,6 +99,8 @@
update bs_technology_route_info
<trim prefix="SET" suffixOverrides=",">
<if test="routeCode != null and routeCode != ''">route_code = #{routeCode},</if>
+ <if test="lineCode != null and lineCode != ''">line_code = #{lineCode},</if>
+ <if test="lineName != null and lineName != ''">line_name = #{lineName},</if>
<if test="routeName != null">route_name = #{routeName},</if>
<if test="productCode != null and productCode != ''">product_code = #{productCode},</if>
<if test="productName != null">product_name = #{productName},</if>
--
Gitblit v1.9.3