瀏覽代碼

【CHG】去掉九防台账用不到的字段

zhaomn 3 年之前
父節點
當前提交
759147f9b5

+ 5 - 5
railway-business/src/main/java/com/railway/business/baseinfo/domain/BasePrevent.java

@@ -21,11 +21,11 @@ public class BasePrevent extends BaseEntity {
   @ApiModelProperty(value = "主键", hidden = true)
   private Long id;
 
-  @ApiModelProperty(value = "段别")
-  private String piecewise;
-
-  @ApiModelProperty(value = "段别")
-  private String piecewiseText;
+//  @ApiModelProperty(value = "段别")
+//  private String piecewise;
+//
+//  @ApiModelProperty(value = "段别")
+//  private String piecewiseText;
 
   @ApiModelProperty(value = "车间id")
   private Long deptId;

+ 0 - 4
railway-business/src/main/java/com/railway/business/baseinfo/service/impl/BasePreventServiceImpl.java

@@ -6,7 +6,6 @@ import com.railway.business.baseinfo.mapper.BasePreventMapper;
 import com.railway.business.baseinfo.service.IBasePreventService;
 import com.railway.business.baseinfo.service.IBaseStationService;
 import com.railway.common.utils.SecurityUtils;
-import com.railway.common.utils.StringUtils;
 import java.util.Date;
 import java.util.List;
 import org.springframework.stereotype.Service;
@@ -41,9 +40,6 @@ public abstract class BasePreventServiceImpl<T extends BasePrevent>
     prevent.setDeptStationId(deptStation.getId());
     prevent.setCreateTime(new Date());
     prevent.setCreateBy(SecurityUtils.getUsername());
-    if (StringUtils.isEmpty(prevent.getPiecewise())) {
-      prevent.setPiecewise("changchun");
-    }
     return preventMapper.insert(prevent);
   }
 

+ 2 - 55
railway-business/src/main/resources/mapper/baseinfo/BasePreventBirdMapper.xml

@@ -5,7 +5,6 @@
 
   <resultMap id="BaseResultMap" type="com.railway.business.baseinfo.domain.BasePreventBird">
     <result column="id" property="id"/>
-    <result column="piecewise" property="piecewise"/>
     <result column="dept_id" property="deptId"/>
     <result column="dept_name" property="deptName"/>
     <result column="line_id" property="lineId"/>
@@ -31,7 +30,6 @@
 
   <sql id="Base_Column_List">
     t.id,
-    t.piecewise,
     v.dept_id,
     v.dept_name,
     v.line_id,
@@ -60,30 +58,12 @@
     </selectKey>
     INSERT INTO base_prevent_bird
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test='null != piecewise'>
-        piecewise,
-      </if>
-      <if test='null != deptId'>
-        dept_id,
-      </if>
-      <if test='null != deptName'>
-        dept_name,
-      </if>
-      <if test='null != lineId'>
-        line_id,
-      </if>
-      <if test='null != lineName'>
-        line_name,
-      </if>
       <if test='null != xingbie'>
         xingbie,
       </if>
       <if test='null != deptStationId'>
         dept_station_id,
       </if>
-      <if test='null != stationName'>
-        station_name,
-      </if>
       <if test='null != pillarCode'>
         pillar_code,
       </if>
@@ -122,30 +102,12 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test='null != piecewise'>
-        #{piecewise},
-      </if>
-      <if test='null != deptId'>
-        #{deptId},
-      </if>
-      <if test='null != deptName'>
-        #{deptName},
-      </if>
-      <if test='null != lineId'>
-        #{lineId},
-      </if>
-      <if test='null != lineName'>
-        #{lineName},
-      </if>
       <if test='null != xingbie'>
         #{xingbie},
       </if>
       <if test='null != deptStationId'>
         #{deptStationId},
       </if>
-      <if test='null != stationName'>
-        #{stationName},
-      </if>
       <if test='null != pillarCode'>
         #{pillarCode},
       </if>
@@ -194,14 +156,8 @@
   <update id="update" parameterType="com.railway.business.baseinfo.domain.BasePreventBird">
     UPDATE base_prevent_bird
     <set>
-      <if test='null != piecewise'>piecewise = #{piecewise},</if>
-      <if test='null != deptId'>dept_id = #{deptId},</if>
-      <if test='null != deptName'>dept_name = #{deptName},</if>
-      <if test='null != lineId'>line_id = #{lineId},</if>
-      <if test='null != lineName'>line_name = #{lineName},</if>
       <if test='null != xingbie'>xingbie = #{xingbie},</if>
       <if test='null != deptStationId'>dept_station_id = #{deptStationId},</if>
-      <if test='null != stationName'>station_name = #{stationName},</if>
       <if test='null != pillarCode'>pillar_code = #{pillarCode},</if>
       <if test='null != marker'>marker = #{marker},</if>
       <if test='null != startMarker'>start_marker = #{startMarker},</if>
@@ -221,31 +177,22 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text,dict1.dict_label as
-    piecewiseText
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_prevent_bird t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
-    LEFT JOIN sys_dict_data dict1 ON (t.piecewise = dict1.dict_value AND dict1.dict_type =
-    'piecewise')
     WHERE t.del_flag='0' and id = #{id}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text,dict1.dict_label as
-    piecewiseText
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_prevent_bird t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
-    LEFT JOIN sys_dict_data dict1 ON (t.piecewise = dict1.dict_value AND dict1.dict_type =
-    'piecewise')
     <where>
       t.del_flag='0'
-      <if test="piecewise!=null and piecewise!=''">
-        and piecewise=#{piecewise}
-      </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
       </if>

+ 2 - 55
railway-business/src/main/resources/mapper/baseinfo/BasePreventFloodMapper.xml

@@ -5,7 +5,6 @@
 
   <resultMap id="BaseResultMap" type="com.railway.business.baseinfo.domain.BasePreventFlood">
     <result column="id" property="id"/>
-    <result column="piecewise" property="piecewise"/>
     <result column="dept_id" property="deptId"/>
     <result column="dept_name" property="deptName"/>
     <result column="fill_date" property="fillDate"/>
@@ -34,7 +33,6 @@
 
   <sql id="Base_Column_List">
     t.id,
-    t.piecewise,
     v.dept_id,
     v.dept_name,
     t.fill_date,
@@ -66,36 +64,18 @@
     </selectKey>
     INSERT INTO base_prevent_flood
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test='null != piecewise'>
-        piecewise,
-      </if>
-      <if test='null != deptId'>
-        dept_id,
-      </if>
-      <if test='null != deptName'>
-        dept_name,
-      </if>
       <if test='null != fillDate'>
         fill_date,
       </if>
       <if test='null != fillUser'>
         fill_user,
       </if>
-      <if test='null != lineId'>
-        line_id,
-      </if>
-      <if test='null != lineName'>
-        line_name,
-      </if>
       <if test='null != xingbie'>
         xingbie,
       </if>
       <if test='null != deptStationId'>
         dept_station_id,
       </if>
-      <if test='null != stationName'>
-        station_name,
-      </if>
       <if test='null != marker'>
         marker,
       </if>
@@ -137,36 +117,18 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test='null != piecewise'>
-        #{piecewise},
-      </if>
-      <if test='null != deptId'>
-        #{deptId},
-      </if>
-      <if test='null != deptName'>
-        #{deptName},
-      </if>
       <if test='null != fillDate'>
         #{fillDate},
       </if>
       <if test='null != fillUser'>
         #{fillUser},
       </if>
-      <if test='null != lineId'>
-        #{lineId},
-      </if>
-      <if test='null != lineName'>
-        #{lineName},
-      </if>
       <if test='null != xingbie'>
         #{xingbie},
       </if>
       <if test='null != deptStationId'>
         #{deptStationId},
       </if>
-      <if test='null != stationName'>
-        #{stationName},
-      </if>
       <if test='null != marker'>
         #{marker},
       </if>
@@ -218,16 +180,10 @@
   <update id="update" parameterType="com.railway.business.baseinfo.domain.BasePreventFlood">
     UPDATE base_prevent_flood
     <set>
-      <if test='null != piecewise'>piecewise = #{piecewise},</if>
-      <if test='null != deptId'>dept_id = #{deptId},</if>
-      <if test='null != deptName'>dept_name = #{deptName},</if>
       <if test='null != fillDate'>fill_date = #{fillDate},</if>
       <if test='null != fillUser'>fill_user = #{fillUser},</if>
-      <if test='null != lineId'>line_id = #{lineId},</if>
-      <if test='null != lineName'>line_name = #{lineName},</if>
       <if test='null != xingbie'>xingbie = #{xingbie},</if>
       <if test='null != deptStationId'>dept_station_id = #{deptStationId},</if>
-      <if test='null != stationName'>station_name = #{stationName},</if>
       <if test='null != marker'>marker = #{marker},</if>
       <if test='null != startMarker'>start_marker = #{startMarker},</if>
       <if test='null != endMarker'>end_marker = #{endMarker},</if>
@@ -248,31 +204,22 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text,dict1.dict_label as
-    piecewiseText
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_prevent_flood t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
-    LEFT JOIN sys_dict_data dict1 ON (t.piecewise = dict1.dict_value AND dict1.dict_type =
-    'piecewise')
     WHERE t.del_flag='0' and id = #{id}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text,dict1.dict_label as
-    piecewiseText
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_prevent_flood t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
-    LEFT JOIN sys_dict_data dict1 ON (t.piecewise = dict1.dict_value AND dict1.dict_type =
-    'piecewise')
     <where>
       t.del_flag='0'
-      <if test="piecewise!=null and piecewise!=''">
-        and t.piecewise=#{piecewise}
-      </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
       </if>

+ 2 - 55
railway-business/src/main/resources/mapper/baseinfo/BasePreventForeignMapper.xml

@@ -5,7 +5,6 @@
 
   <resultMap id="BaseResultMap" type="com.railway.business.baseinfo.domain.BasePreventForeign">
     <result column="id" property="id"/>
-    <result column="piecewise" property="piecewise"/>
     <result column="dept_id" property="deptId"/>
     <result column="dept_name" property="deptName"/>
     <result column="line_id" property="lineId"/>
@@ -31,7 +30,6 @@
 
   <sql id="Base_Column_List">
     t.id,
-    t.piecewise,
     v.dept_id,
     v.dept_name,
     v.line_id,
@@ -60,30 +58,12 @@
     </selectKey>
     INSERT INTO base_prevent_foreign
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test='null != piecewise'>
-        piecewise,
-      </if>
-      <if test='null != deptId'>
-        dept_id,
-      </if>
-      <if test='null != deptName'>
-        dept_name,
-      </if>
-      <if test='null != lineId'>
-        line_id,
-      </if>
-      <if test='null != lineName'>
-        line_name,
-      </if>
       <if test='null != xingbie'>
         xingbie,
       </if>
       <if test='null != deptStationId'>
         dept_station_id,
       </if>
-      <if test='null != stationName'>
-        station_name,
-      </if>
       <if test='null != pillarCode'>
         pillar_code,
       </if>
@@ -122,30 +102,12 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test='null != piecewise'>
-        #{piecewise},
-      </if>
-      <if test='null != deptId'>
-        #{deptId},
-      </if>
-      <if test='null != deptName'>
-        #{deptName},
-      </if>
-      <if test='null != lineId'>
-        #{lineId},
-      </if>
-      <if test='null != lineName'>
-        #{lineName},
-      </if>
       <if test='null != xingbie'>
         #{xingbie},
       </if>
       <if test='null != deptStationId'>
         #{deptStationId},
       </if>
-      <if test='null != stationName'>
-        #{stationName},
-      </if>
       <if test='null != pillarCode'>
         #{pillarCode},
       </if>
@@ -194,14 +156,8 @@
   <update id="update" parameterType="com.railway.business.baseinfo.domain.BasePreventForeign">
     UPDATE base_prevent_foreign
     <set>
-      <if test='null != piecewise'>piecewise = #{piecewise},</if>
-      <if test='null != deptId'>dept_id = #{deptId},</if>
-      <if test='null != deptName'>dept_name = #{deptName},</if>
-      <if test='null != lineId'>line_id = #{lineId},</if>
-      <if test='null != lineName'>line_name = #{lineName},</if>
       <if test='null != xingbie'>xingbie = #{xingbie},</if>
       <if test='null != deptStationId'>dept_station_id = #{deptStationId},</if>
-      <if test='null != stationName'>station_name = #{stationName},</if>
       <if test='null != pillarCode'>pillar_code = #{pillarCode},</if>
       <if test='null != marker'>marker = #{marker},</if>
       <if test='null != startMarker'>start_marker = #{startMarker},</if>
@@ -221,31 +177,22 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text,dict1.dict_label as
-    piecewiseText
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_prevent_foreign t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
-    LEFT JOIN sys_dict_data dict1 ON (t.piecewise = dict1.dict_value AND dict1.dict_type =
-    'piecewise')
     WHERE t.del_flag='0' and id = #{id}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text,dict1.dict_label as
-    piecewiseText
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_prevent_foreign t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
-    LEFT JOIN sys_dict_data dict1 ON (t.piecewise = dict1.dict_value AND dict1.dict_type =
-    'piecewise')
     <where>
       t.del_flag='0'
-      <if test="piecewise!=null and piecewise!=''">
-        and t.piecewise=#{piecewise}
-      </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
       </if>

+ 2 - 55
railway-business/src/main/resources/mapper/baseinfo/BasePreventIceMapper.xml

@@ -5,7 +5,6 @@
 
   <resultMap id="BaseResultMap" type="com.railway.business.baseinfo.domain.BasePreventIce">
     <result column="id" property="id"/>
-    <result column="piecewise" property="piecewise"/>
     <result column="dept_id" property="deptId"/>
     <result column="dept_name" property="deptName"/>
     <result column="line_id" property="lineId"/>
@@ -31,7 +30,6 @@
 
   <sql id="Base_Column_List">
     t.id,
-    t.piecewise,
     v.dept_id,
     v.dept_name,
     v.line_id,
@@ -60,30 +58,12 @@
     </selectKey>
     INSERT INTO base_prevent_ice
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test='null != piecewise'>
-        piecewise,
-      </if>
-      <if test='null != deptId'>
-        dept_id,
-      </if>
-      <if test='null != deptName'>
-        dept_name,
-      </if>
-      <if test='null != lineId'>
-        line_id,
-      </if>
-      <if test='null != lineName'>
-        line_name,
-      </if>
       <if test='null != xingbie'>
         xingbie,
       </if>
       <if test='null != deptStationId'>
         dept_station_id,
       </if>
-      <if test='null != stationName'>
-        station_name,
-      </if>
       <if test='null != pillarCode'>
         pillar_code,
       </if>
@@ -122,30 +102,12 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test='null != piecewise'>
-        #{piecewise},
-      </if>
-      <if test='null != deptId'>
-        #{deptId},
-      </if>
-      <if test='null != deptName'>
-        #{deptName},
-      </if>
-      <if test='null != lineId'>
-        #{lineId},
-      </if>
-      <if test='null != lineName'>
-        #{lineName},
-      </if>
       <if test='null != xingbie'>
         #{xingbie},
       </if>
       <if test='null != deptStationId'>
         #{deptStationId},
       </if>
-      <if test='null != stationName'>
-        #{stationName},
-      </if>
       <if test='null != pillarCode'>
         #{pillarCode},
       </if>
@@ -194,14 +156,8 @@
   <update id="update" parameterType="com.railway.business.baseinfo.domain.BasePreventIce">
     UPDATE base_prevent_ice
     <set>
-      <if test='null != piecewise'>piecewise = #{piecewise},</if>
-      <if test='null != deptId'>dept_id = #{deptId},</if>
-      <if test='null != deptName'>dept_name = #{deptName},</if>
-      <if test='null != lineId'>line_id = #{lineId},</if>
-      <if test='null != lineName'>line_name = #{lineName},</if>
       <if test='null != xingbie'>xingbie = #{xingbie},</if>
       <if test='null != deptStationId'>dept_station_id = #{deptStationId},</if>
-      <if test='null != stationName'>station_name = #{stationName},</if>
       <if test='null != pillarCode'>pillar_code = #{pillarCode},</if>
       <if test='null != marker'>marker = #{marker},</if>
       <if test='null != startMarker'>start_marker = #{startMarker},</if>
@@ -221,31 +177,22 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text,dict1.dict_label as
-    piecewiseText
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_prevent_ice t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
-    LEFT JOIN sys_dict_data dict1 ON (t.piecewise = dict1.dict_value AND dict1.dict_type =
-    'piecewise')
     WHERE t.del_flag='0' and id = #{id}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text,dict1.dict_label as
-    piecewiseText
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_prevent_ice t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
-    LEFT JOIN sys_dict_data dict1 ON (t.piecewise = dict1.dict_value AND dict1.dict_type =
-    'piecewise')
     <where>
       t.del_flag='0'
-      <if test="piecewise!=null and piecewise!=''">
-        and t.piecewise=#{piecewise}
-      </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
       </if>

+ 2 - 55
railway-business/src/main/resources/mapper/baseinfo/BasePreventRustMapper.xml

@@ -5,7 +5,6 @@
 
   <resultMap id="BaseResultMap" type="com.railway.business.baseinfo.domain.BasePreventRust">
     <result column="id" property="id"/>
-    <result column="piecewise" property="piecewise"/>
     <result column="dept_id" property="deptId"/>
     <result column="dept_name" property="deptName"/>
     <result column="line_id" property="lineId"/>
@@ -32,7 +31,6 @@
 
   <sql id="Base_Column_List">
     t.id,
-    t.piecewise,
     v.dept_id,
     v.dept_name,
     v.line_id,
@@ -62,30 +60,12 @@
     </selectKey>
     INSERT INTO base_prevent_rust
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test='null != piecewise'>
-        piecewise,
-      </if>
-      <if test='null != deptId'>
-        dept_id,
-      </if>
-      <if test='null != deptName'>
-        dept_name,
-      </if>
-      <if test='null != lineId'>
-        line_id,
-      </if>
-      <if test='null != lineName'>
-        line_name,
-      </if>
       <if test='null != xingbie'>
         xingbie,
       </if>
       <if test='null != deptStationId'>
         dept_station_id,
       </if>
-      <if test='null != stationName'>
-        station_name,
-      </if>
       <if test='null != pillarCode'>
         pillar_code,
       </if>
@@ -127,30 +107,12 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test='null != piecewise'>
-        #{piecewise},
-      </if>
-      <if test='null != deptId'>
-        #{deptId},
-      </if>
-      <if test='null != deptName'>
-        #{deptName},
-      </if>
-      <if test='null != lineId'>
-        #{lineId},
-      </if>
-      <if test='null != lineName'>
-        #{lineName},
-      </if>
       <if test='null != xingbie'>
         #{xingbie},
       </if>
       <if test='null != deptStationId'>
         #{deptStationId},
       </if>
-      <if test='null != stationName'>
-        #{stationName},
-      </if>
       <if test='null != pillarCode'>
         #{pillarCode},
       </if>
@@ -202,14 +164,8 @@
   <update id="update" parameterType="com.railway.business.baseinfo.domain.BasePreventRust">
     UPDATE base_prevent_rust
     <set>
-      <if test='null != piecewise'>piecewise = #{piecewise},</if>
-      <if test='null != deptId'>dept_id = #{deptId},</if>
-      <if test='null != deptName'>dept_name = #{deptName},</if>
-      <if test='null != lineId'>line_id = #{lineId},</if>
-      <if test='null != lineName'>line_name = #{lineName},</if>
       <if test='null != xingbie'>xingbie = #{xingbie},</if>
       <if test='null != deptStationId'>dept_station_id = #{deptStationId},</if>
-      <if test='null != stationName'>station_name = #{stationName},</if>
       <if test='null != pillarCode'>pillar_code = #{pillarCode},</if>
       <if test='null != marker'>marker = #{marker},</if>
       <if test='null != startMarker'>start_marker = #{startMarker},</if>
@@ -230,31 +186,22 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text,dict1.dict_label as
-    piecewiseText
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_prevent_rust t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
-    LEFT JOIN sys_dict_data dict1 ON (t.piecewise = dict1.dict_value AND dict1.dict_type =
-    'piecewise')
     WHERE t.del_flag='0' and id = #{id}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text,dict1.dict_label as
-    piecewiseText
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_prevent_rust t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
-    LEFT JOIN sys_dict_data dict1 ON (t.piecewise = dict1.dict_value AND dict1.dict_type =
-    'piecewise')
     <where>
       t.del_flag='0'
-      <if test="piecewise!=null and piecewise!=''">
-        and t.piecewise=#{piecewise}
-      </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
       </if>

+ 2 - 55
railway-business/src/main/resources/mapper/baseinfo/BasePreventThawMapper.xml

@@ -5,7 +5,6 @@
 
   <resultMap id="BaseResultMap" type="com.railway.business.baseinfo.domain.BasePreventThaw">
     <result column="id" property="id"/>
-    <result column="piecewise" property="piecewise"/>
     <result column="dept_id" property="deptId"/>
     <result column="dept_name" property="deptName"/>
     <result column="line_id" property="lineId"/>
@@ -35,7 +34,6 @@
 
   <sql id="Base_Column_List">
     t.id,
-    t.piecewise,
     v.dept_id,
     v.dept_name,
     v.line_id,
@@ -68,30 +66,12 @@
     </selectKey>
     INSERT INTO base_prevent_thaw
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test='null != piecewise'>
-        piecewise,
-      </if>
-      <if test='null != deptId'>
-        dept_id,
-      </if>
-      <if test='null != deptName'>
-        dept_name,
-      </if>
-      <if test='null != lineId'>
-        line_id,
-      </if>
-      <if test='null != lineName'>
-        line_name,
-      </if>
       <if test='null != xingbie'>
         xingbie,
       </if>
       <if test='null != deptStationId'>
         dept_station_id,
       </if>
-      <if test='null != stationName'>
-        station_name,
-      </if>
       <if test='null != pillarArea'>
         pillar_area,
       </if>
@@ -142,30 +122,12 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test='null != piecewise'>
-        #{piecewise},
-      </if>
-      <if test='null != deptId'>
-        #{deptId},
-      </if>
-      <if test='null != deptName'>
-        #{deptName},
-      </if>
-      <if test='null != lineId'>
-        #{lineId},
-      </if>
-      <if test='null != lineName'>
-        #{lineName},
-      </if>
       <if test='null != xingbie'>
         #{xingbie},
       </if>
       <if test='null != deptStationId'>
         #{deptStationId},
       </if>
-      <if test='null != stationName'>
-        #{stationName},
-      </if>
       <if test='null != pillarArea'>
         #{pillarArea},
       </if>
@@ -226,14 +188,8 @@
   <update id="update" parameterType="com.railway.business.baseinfo.domain.BasePreventThaw">
     UPDATE base_prevent_thaw
     <set>
-      <if test='null != piecewise'>piecewise = #{piecewise},</if>
-      <if test='null != deptId'>dept_id = #{deptId},</if>
-      <if test='null != deptName'>dept_name = #{deptName},</if>
-      <if test='null != lineId'>line_id = #{lineId},</if>
-      <if test='null != lineName'>line_name = #{lineName},</if>
       <if test='null != xingbie'>xingbie = #{xingbie},</if>
       <if test='null != deptStationId'>dept_station_id = #{deptStationId},</if>
-      <if test='null != stationName'>station_name = #{stationName},</if>
       <if test='null != pillarArea'>pillar_area = #{pillarArea},</if>
       <if test='null != pillarCount'>pillar_count = #{pillarCount},</if>
       <if test='null != lineType'>line_type = #{lineType},</if>
@@ -257,31 +213,22 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text,dict1.dict_label as
-    piecewiseText
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_prevent_thaw t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
-    LEFT JOIN sys_dict_data dict1 ON (t.piecewise = dict1.dict_value AND dict1.dict_type =
-    'piecewise')
     WHERE t.del_flag='0' and id = #{id}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text,dict1.dict_label as
-    piecewiseText
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_prevent_thaw t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
-    LEFT JOIN sys_dict_data dict1 ON (t.piecewise = dict1.dict_value AND dict1.dict_type =
-    'piecewise')
     <where>
       t.del_flag='0'
-      <if test="piecewise!=null and piecewise!=''">
-        and t.piecewise=#{piecewise}
-      </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
       </if>

+ 2 - 55
railway-business/src/main/resources/mapper/baseinfo/BasePreventThunderMapper.xml

@@ -5,7 +5,6 @@
 
   <resultMap id="BaseResultMap" type="com.railway.business.baseinfo.domain.BasePreventThunder">
     <result column="id" property="id"/>
-    <result column="piecewise" property="piecewise"/>
     <result column="dept_id" property="deptId"/>
     <result column="dept_name" property="deptName"/>
     <result column="line_id" property="lineId"/>
@@ -30,7 +29,6 @@
 
   <sql id="Base_Column_List">
     t.id,
-    t.piecewise,
     v.dept_id,
     v.dept_name,
     v.line_id,
@@ -58,30 +56,12 @@
     </selectKey>
     INSERT INTO base_prevent_thunder
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test='null != piecewise'>
-        piecewise,
-      </if>
-      <if test='null != deptId'>
-        dept_id,
-      </if>
-      <if test='null != deptName'>
-        dept_name,
-      </if>
-      <if test='null != lineId'>
-        line_id,
-      </if>
-      <if test='null != lineName'>
-        line_name,
-      </if>
       <if test='null != xingbie'>
         xingbie,
       </if>
       <if test='null != deptStationId'>
         dept_station_id,
       </if>
-      <if test='null != stationName'>
-        station_name,
-      </if>
       <if test='null != pillarCode'>
         pillar_code,
       </if>
@@ -117,30 +97,12 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test='null != piecewise'>
-        #{piecewise},
-      </if>
-      <if test='null != deptId'>
-        #{deptId},
-      </if>
-      <if test='null != deptName'>
-        #{deptName},
-      </if>
-      <if test='null != lineId'>
-        #{lineId},
-      </if>
-      <if test='null != lineName'>
-        #{lineName},
-      </if>
       <if test='null != xingbie'>
         #{xingbie},
       </if>
       <if test='null != deptStationId'>
         #{deptStationId},
       </if>
-      <if test='null != stationName'>
-        #{stationName},
-      </if>
       <if test='null != pillarCode'>
         #{pillarCode},
       </if>
@@ -186,14 +148,8 @@
   <update id="update" parameterType="com.railway.business.baseinfo.domain.BasePreventThunder">
     UPDATE base_prevent_thunder
     <set>
-      <if test='null != piecewise'>piecewise = #{piecewise},</if>
-      <if test='null != deptId'>dept_id = #{deptId},</if>
-      <if test='null != deptName'>dept_name = #{deptName},</if>
-      <if test='null != lineId'>line_id = #{lineId},</if>
-      <if test='null != lineName'>line_name = #{lineName},</if>
       <if test='null != xingbie'>xingbie = #{xingbie},</if>
       <if test='null != deptStationId'>dept_station_id = #{deptStationId},</if>
-      <if test='null != stationName'>station_name = #{stationName},</if>
       <if test='null != pillarCode'>pillar_code = #{pillarCode},</if>
       <if test='null != marker'>marker = #{marker},</if>
       <if test='null != startMarker'>start_marker = #{startMarker},</if>
@@ -212,31 +168,22 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text,dict1.dict_label as
-    piecewiseText
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_prevent_thunder t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
-    LEFT JOIN sys_dict_data dict1 ON (t.piecewise = dict1.dict_value AND dict1.dict_type =
-    'piecewise')
     WHERE t.del_flag='0' and id = #{id}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text,dict1.dict_label as
-    piecewiseText
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_prevent_thunder t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
-    LEFT JOIN sys_dict_data dict1 ON (t.piecewise = dict1.dict_value AND dict1.dict_type =
-    'piecewise')
     <where>
       t.del_flag='0'
-      <if test="piecewise!=null and piecewise!=''">
-        and t.piecewise=#{piecewise}
-      </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
       </if>

+ 2 - 55
railway-business/src/main/resources/mapper/baseinfo/BasePreventTreeMapper.xml

@@ -5,7 +5,6 @@
 
   <resultMap id="BaseResultMap" type="com.railway.business.baseinfo.domain.BasePreventTree">
     <result column="id" property="id"/>
-    <result column="piecewise" property="piecewise"/>
     <result column="dept_id" property="deptId"/>
     <result column="dept_name" property="deptName"/>
     <result column="line_id" property="lineId"/>
@@ -36,7 +35,6 @@
 
   <sql id="Base_Column_List">
     t.id,
-    t.piecewise,
     v.dept_id,
     v.dept_name,
     v.line_id,
@@ -70,30 +68,12 @@
     </selectKey>
     INSERT INTO base_prevent_tree
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test='null != piecewise'>
-        piecewise,
-      </if>
-      <if test='null != deptId'>
-        dept_id,
-      </if>
-      <if test='null != deptName'>
-        dept_name,
-      </if>
-      <if test='null != lineId'>
-        line_id,
-      </if>
-      <if test='null != lineName'>
-        line_name,
-      </if>
       <if test='null != xingbie'>
         xingbie,
       </if>
       <if test='null != deptStationId'>
         dept_station_id,
       </if>
-      <if test='null != stationName'>
-        station_name,
-      </if>
       <if test='null != pillarCode'>
         pillar_code,
       </if>
@@ -147,30 +127,12 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test='null != piecewise'>
-        #{piecewise},
-      </if>
-      <if test='null != deptId'>
-        #{deptId},
-      </if>
-      <if test='null != deptName'>
-        #{deptName},
-      </if>
-      <if test='null != lineId'>
-        #{lineId},
-      </if>
-      <if test='null != lineName'>
-        #{lineName},
-      </if>
       <if test='null != xingbie'>
         #{xingbie},
       </if>
       <if test='null != deptStationId'>
         #{deptStationId},
       </if>
-      <if test='null != stationName'>
-        #{stationName},
-      </if>
       <if test='null != pillarCode'>
         #{pillarCode},
       </if>
@@ -234,14 +196,8 @@
   <update id="update" parameterType="com.railway.business.baseinfo.domain.BasePreventTree">
     UPDATE base_prevent_tree
     <set>
-      <if test='null != piecewise'>piecewise = #{piecewise},</if>
-      <if test='null != deptId'>dept_id = #{deptId},</if>
-      <if test='null != deptName'>dept_name = #{deptName},</if>
-      <if test='null != lineId'>line_id = #{lineId},</if>
-      <if test='null != lineName'>line_name = #{lineName},</if>
       <if test='null != xingbie'>xingbie = #{xingbie},</if>
       <if test='null != deptStationId'>dept_station_id = #{deptStationId},</if>
-      <if test='null != stationName'>station_name = #{stationName},</if>
       <if test='null != pillarCode'>pillar_code = #{pillarCode},</if>
       <if test='null != marker'>marker = #{marker},</if>
       <if test='null != startMarker'>start_marker = #{startMarker},</if>
@@ -266,31 +222,22 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text,dict1.dict_label as
-    piecewiseText
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_prevent_tree t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
-    LEFT JOIN sys_dict_data dict1 ON (t.piecewise = dict1.dict_value AND dict1.dict_type =
-    'piecewise')
     WHERE t.del_flag='0' and id = #{id}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text,dict1.dict_label as
-    piecewiseText
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_prevent_tree t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
-    LEFT JOIN sys_dict_data dict1 ON (t.piecewise = dict1.dict_value AND dict1.dict_type =
-    'piecewise')
     <where>
       t.del_flag='0'
-      <if test="piecewise!=null and piecewise!=''">
-        and t.piecewise=#{piecewise}
-      </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
       </if>

+ 2 - 55
railway-business/src/main/resources/mapper/baseinfo/BasePreventWindMapper.xml

@@ -5,7 +5,6 @@
 
   <resultMap id="BaseResultMap" type="com.railway.business.baseinfo.domain.BasePreventWind">
     <result column="id" property="id"/>
-    <result column="piecewise" property="piecewise"/>
     <result column="dept_id" property="deptId"/>
     <result column="dept_name" property="deptName"/>
     <result column="line_id" property="lineId"/>
@@ -31,7 +30,6 @@
 
   <sql id="Base_Column_List">
     t.id,
-    t.piecewise,
     v.dept_id,
     v.dept_name,
     v.line_id,
@@ -60,30 +58,12 @@
     </selectKey>
     INSERT INTO base_prevent_wind
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test='null != piecewise'>
-        piecewise,
-      </if>
-      <if test='null != deptId'>
-        dept_id,
-      </if>
-      <if test='null != deptName'>
-        dept_name,
-      </if>
-      <if test='null != lineId'>
-        line_id,
-      </if>
-      <if test='null != lineName'>
-        line_name,
-      </if>
       <if test='null != xingbie'>
         xingbie,
       </if>
       <if test='null != deptStationId'>
         dept_station_id,
       </if>
-      <if test='null != stationName'>
-        station_name,
-      </if>
       <if test='null != pillarCode'>
         pillar_code,
       </if>
@@ -122,30 +102,12 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test='null != piecewise'>
-        #{piecewise},
-      </if>
-      <if test='null != deptId'>
-        #{deptId},
-      </if>
-      <if test='null != deptName'>
-        #{deptName},
-      </if>
-      <if test='null != lineId'>
-        #{lineId},
-      </if>
-      <if test='null != lineName'>
-        #{lineName},
-      </if>
       <if test='null != xingbie'>
         #{xingbie},
       </if>
       <if test='null != deptStationId'>
         #{deptStationId},
       </if>
-      <if test='null != stationName'>
-        #{stationName},
-      </if>
       <if test='null != pillarCode'>
         #{pillarCode},
       </if>
@@ -194,14 +156,8 @@
   <update id="update" parameterType="com.railway.business.baseinfo.domain.BasePreventWind">
     UPDATE base_prevent_wind
     <set>
-      <if test='null != piecewise'>piecewise = #{piecewise},</if>
-      <if test='null != deptId'>dept_id = #{deptId},</if>
-      <if test='null != deptName'>dept_name = #{deptName},</if>
-      <if test='null != lineId'>line_id = #{lineId},</if>
-      <if test='null != lineName'>line_name = #{lineName},</if>
       <if test='null != xingbie'>xingbie = #{xingbie},</if>
       <if test='null != deptStationId'>dept_station_id = #{deptStationId},</if>
-      <if test='null != stationName'>station_name = #{stationName},</if>
       <if test='null != pillarCode'>pillar_code = #{pillarCode},</if>
       <if test='null != marker'>marker = #{marker},</if>
       <if test='null != startMarker'>start_marker = #{startMarker},</if>
@@ -221,31 +177,22 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text,dict1.dict_label as
-    piecewiseText
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_prevent_wind t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
-    LEFT JOIN sys_dict_data dict1 ON (t.piecewise = dict1.dict_value AND dict1.dict_type =
-    'piecewise')
     WHERE t.del_flag='0' and id = #{id}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text,dict1.dict_label as
-    piecewiseText
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_prevent_wind t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
-    LEFT JOIN sys_dict_data dict1 ON (t.piecewise = dict1.dict_value AND dict1.dict_type =
-    'piecewise')
     <where>
       t.del_flag='0'
-      <if test="piecewise!=null and piecewise!=''">
-        and t.piecewise=#{piecewise}
-      </if>
       <if test="deptId!=null and deptId!=''">
         and v.dept_id=#{deptId}
       </if>