From 9c21d0b197cee42ab475570f82eba18cd9307e70 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期一, 15 一月 2024 18:27:46 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.0.189:29418/Jcdm041-Mes
---
jcdm-main/src/main/resources/mapper/sc/stationConf/ScStationConfMapper.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/jcdm-main/src/main/resources/mapper/sc/stationConf/ScStationConfMapper.xml b/jcdm-main/src/main/resources/mapper/sc/stationConf/ScStationConfMapper.xml
index 887a0bd..5a105a3 100644
--- a/jcdm-main/src/main/resources/mapper/sc/stationConf/ScStationConfMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/sc/stationConf/ScStationConfMapper.xml
@@ -19,15 +19,17 @@
<result property="updateUser" column="update_user" />
<result property="updateTime" column="update_time" />
<result property="remarks" column="remarks" />
+ <result property="macAddress" column="mac_address" />
</resultMap>
<sql id="selectScStationConfVo">
- select id, processes_code, processes_name, processes_type, ip_address, spare_field_1, spare_field_2, spare_field_3, spare_field_4, create_user, create_time, update_user, update_time, remarks from sc_station_conf
+ select id, processes_code, mac_address,processes_name, processes_type, ip_address, spare_field_1, spare_field_2, spare_field_3, spare_field_4, create_user, create_time, update_user, update_time, remarks from sc_station_conf
</sql>
<select id="selectScStationConfList" parameterType="ScStationConf" resultMap="ScStationConfResult">
<include refid="selectScStationConfVo"/>
<where>
+ <if test="macAddress != null and macAddress != ''"> and mac_adress = #{macAddress}</if>
<if test="processesCode != null and processesCode != ''"> and processes_code = #{processesCode}</if>
<if test="processesName != null and processesName != ''"> and processes_name like concat('%', #{processesName}, '%')</if>
<if test="processesType != null and processesType != ''"> and processes_type = #{processesType}</if>
@@ -51,6 +53,7 @@
insert into sc_station_conf
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="processesCode != null">processes_code,</if>
+ <if test="macAddress != null">mac_address,</if>
<if test="processesName != null">processes_name,</if>
<if test="processesType != null">processes_type,</if>
<if test="ipAddress != null">ip_address,</if>
@@ -66,6 +69,7 @@
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="processesCode != null">#{processesCode},</if>
+ <if test="macAddress != null">#{macAddress},</if>
<if test="processesName != null">#{processesName},</if>
<if test="processesType != null">#{processesType},</if>
<if test="ipAddress != null">#{ipAddress},</if>
@@ -86,6 +90,7 @@
<trim prefix="SET" suffixOverrides=",">
<if test="processesCode != null">processes_code = #{processesCode},</if>
<if test="processesName != null">processes_name = #{processesName},</if>
+ <if test="macAddress != null">mac_address = #{macAddress},</if>
<if test="processesType != null">processes_type = #{processesType},</if>
<if test="ipAddress != null">ip_address = #{ipAddress},</if>
<if test="spareField1 != null">spare_field_1 = #{spareField1},</if>
--
Gitblit v1.9.3