From 88a83cd8684dffb444c0a8078781f3b124e6443a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com>
Date: Tue, 10 Jun 2025 14:13:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=AC=E8=B7=AF=E5=92=8C?=
 =?UTF-8?q?=E5=8D=83=E5=BC=A0=E5=9C=BA=E5=9C=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../digitalSignage/basic/vo/TbCablewaTransVo.java | 10 ++++++++++
 .../mappers/basic/TbCablewaTransMapper.xml        | 15 +++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/bonus/digitalSignage/basic/vo/TbCablewaTransVo.java b/src/main/java/com/bonus/digitalSignage/basic/vo/TbCablewaTransVo.java
index f981249..a63ad46 100644
--- a/src/main/java/com/bonus/digitalSignage/basic/vo/TbCablewaTransVo.java
+++ b/src/main/java/com/bonus/digitalSignage/basic/vo/TbCablewaTransVo.java
@@ -92,6 +92,16 @@ public class TbCablewaTransVo {
      */
     private String keyWord;
 
+    /**
+     * 1:索道运输 2：公路  3：千张场地
+     */
+    private String sourceType;
+
+    /**
+     * 名称
+     */
+    private String name;
+
     private int page = 1;
     private int limit = 10;
 
diff --git a/src/main/resources/mappers/basic/TbCablewaTransMapper.xml b/src/main/resources/mappers/basic/TbCablewaTransMapper.xml
index f13ed5d..702f56d 100644
--- a/src/main/resources/mappers/basic/TbCablewaTransMapper.xml
+++ b/src/main/resources/mappers/basic/TbCablewaTransMapper.xml
@@ -14,6 +14,8 @@
             <if test="createTime != null">create_time,</if>
             <if test="createUserId != null ">create_user_id,</if>
             <if test="cablewayWidth != null and cablewayWidth!=''">cableway_width,</if>
+            <if test="sourceType != null and sourceType!=''">source_type,</if>
+            <if test="name != null and name!=''">name,</if>
             is_active
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -26,6 +28,8 @@
             <if test="createTime != null ">#{createTime},</if>
             <if test="createUserId != null ">#{createUserId},</if>
             <if test="cablewayWidth != null and cablewayWidth!=''">#{cablewayWidth},</if>
+            <if test="sourceType != null and sourceType!=''">#{sourceType},</if>
+            <if test="name != null and name!=''">#{name},</if>
             1
         </trim>
     </insert>
@@ -48,6 +52,8 @@
             <if test="maxSlope != null">max_slope = #{maxSlope},</if>
             <if test="cablewayWidth != null and cablewayWidth!=''">cableway_width = #{cablewayWidth},</if>
             <if test="updateUserId != null">update_user_id = #{updateUserId},</if>
+            <if test="sourceType != null">source_type = #{sourceType},</if>
+            <if test="name != null">name = #{name},</if>
             update_time = now()
         </trim>
         where id = #{id}
@@ -63,18 +69,23 @@
     <select id="tbCablewaTransList" resultType="com.bonus.digitalSignage.basic.vo.TbCablewaTransVo">
         select tct.id as id,tct.pro_id as proId,tct.tower_id as towerId,tct.cableway_length as cablewayLength,
                tct.max_height as maxHeight,tct.safety_distance as safetyDistance,tct.max_slope as maxSlope,
-               tct.create_user_id as createUserId,tt.tower_name as towerName,tct.cableway_length AS cablewayWidth
+               tct.create_user_id as createUserId,tt.tower_name as towerName,tct.cableway_length AS cablewayWidth,
+                tct.source_type as sourceType,tct.name as name
                 from tb_cablewa_trans tct
                 left join tb_tower tt on tct.tower_id = tt.id
                 where tct.pro_id = #{proId} and tct.is_active = '1'
         <if test="keyWord != '' and keyWord != null">
             and tt.tower_name like concat('%',#{keyWord},'%')
         </if>
+        <if test="sourceType != '' and sourceType != null">
+            and tct.source_type = #{sourceType}
+        </if>
     </select>
     <select id="getTbCablewaTransById" resultType="com.bonus.digitalSignage.basic.vo.TbCablewaTransVo">
         select tct.id as id,tct.pro_id as proId,tct.tower_id as towerId,tct.cableway_length as cablewayLength,
                tct.max_height as maxHeight,tct.safety_distance as safetyDistance,tct.max_slope as maxSlope,
-               tct.create_user_id as createUserId,tt.tower_name as towerName,tct.cableway_length AS cablewayWidth
+               tct.create_user_id as createUserId,tt.tower_name as towerName,tct.cableway_length AS cablewayWidth,
+               tct.source_type as sourceType,tct.name as name
         from tb_cablewa_trans tct
                  left join tb_tower tt on tct.tower_id = tt.id
         where tct.id = #{id}