新增公路和千张场地

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;
 

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}