【CHG】合并交叉线岔和无交叉线岔表

railway-admin/src/main/java/com/railway/web/controller/business/baseinfo/BusJcxcController.java

@@ -32,12 +32,15 @@ public class BusJcxcController extends BaseController {
     this.stationService = stationService;
   }
 
+  private final static String FORK_TYPE = "jcxc";
+
   @ApiOperation(value = "新增")
   @PostMapping("/add")
   public AjaxResult add(@Validated @RequestBody BusJcxc busJcxc) {
     BaseDeptStation deptStation = stationService.getInfo(busJcxc.getDeptId(),
         busJcxc.getLineId(), busJcxc.getStationId());
     busJcxc.setDeptStationId(deptStation.getId());
+    busJcxc.setXclx(FORK_TYPE);
     return toAjax(busJcxcService.create(busJcxc));
   }
 
@@ -53,6 +56,7 @@ public class BusJcxcController extends BaseController {
     BaseDeptStation deptStation = stationService.getInfo(busJcxc.getDeptId(),
         busJcxc.getLineId(), busJcxc.getStationId());
     busJcxc.setDeptStationId(deptStation.getId());
+    busJcxc.setXclx(FORK_TYPE);
     return toAjax(busJcxcService.update(busJcxc));
   }
 
@@ -69,6 +73,7 @@ public class BusJcxcController extends BaseController {
   @GetMapping(value = "list")
   public TableDataInfo getList(BusJcxc busJcxc) {
     startPage();
+    busJcxc.setXclx(FORK_TYPE);
     List<BusJcxc> list = busJcxcService.getList(busJcxc);
     return getDataTable(list);
   }

railway-admin/src/main/java/com/railway/web/controller/business/baseinfo/BusWjcxcController.java

@@ -1,18 +1,25 @@
 package com.railway.web.controller.business.baseinfo;
 
 import com.railway.business.baseinfo.domain.BaseDeptStation;
-import com.railway.business.baseinfo.domain.BusWjcxc;
+import com.railway.business.baseinfo.domain.BusJcxc;
 import com.railway.business.baseinfo.service.IBaseStationService;
-import com.railway.business.baseinfo.service.IBusWjcxcService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import com.railway.business.baseinfo.service.IBusJcxcService;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
-import javax.validation.Valid;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import java.util.List;
+import javax.validation.Valid;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author zhangcaifeng
@@ -23,43 +30,47 @@ import java.util.List;
 @RequestMapping(value = "business/catenary/bus/wjcxc")
 public class BusWjcxcController extends BaseController {
 
-  private final IBusWjcxcService busWjcxcService;
+  private final IBusJcxcService busJcxcService;
   private final IBaseStationService stationService;
 
-  public BusWjcxcController(IBusWjcxcService busWjcxcService,
+  public BusWjcxcController(IBusJcxcService busJcxcService,
       IBaseStationService stationService) {
-    this.busWjcxcService = busWjcxcService;
+    this.busJcxcService = busJcxcService;
     this.stationService = stationService;
   }
 
+  private final static String FORK_TYPE = "wjcxc";
+
   @ApiOperation(value = "新增")
   @PostMapping("/add")
-  public AjaxResult add(@Validated @RequestBody BusWjcxc busWjcxc) {
-    BaseDeptStation deptStation = stationService.getInfo(busWjcxc.getDeptId(),
-        busWjcxc.getLineId(), busWjcxc.getStationId());
-    busWjcxc.setDeptStationId(deptStation.getId());
-    return toAjax(busWjcxcService.create(busWjcxc));
+  public AjaxResult add(@Validated @RequestBody BusJcxc busJcxc) {
+    BaseDeptStation deptStation = stationService.getInfo(busJcxc.getDeptId(),
+        busJcxc.getLineId(), busJcxc.getStationId());
+    busJcxc.setDeptStationId(deptStation.getId());
+    busJcxc.setXclx(FORK_TYPE);
+    return toAjax(busJcxcService.create(busJcxc));
   }
 
   @ApiOperation(value = "删除")
   @DeleteMapping("/{ids}")
   public AjaxResult delete(@RequestParam String[] ids) {
-    return toAjax(busWjcxcService.delete(ids));
+    return toAjax(busJcxcService.delete(ids));
   }
 
   @ApiOperation(value = "更新")
   @PutMapping("/update")
-  public AjaxResult update(@RequestBody @Valid BusWjcxc busWjcxc) {
-    BaseDeptStation deptStation = stationService.getInfo(busWjcxc.getDeptId(),
-        busWjcxc.getLineId(), busWjcxc.getStationId());
-    busWjcxc.setDeptStationId(deptStation.getId());
-    return toAjax(busWjcxcService.update(busWjcxc));
+  public AjaxResult update(@RequestBody @Valid BusJcxc busJcxc) {
+    BaseDeptStation deptStation = stationService.getInfo(busJcxc.getDeptId(),
+        busJcxc.getLineId(), busJcxc.getStationId());
+    busJcxc.setDeptStationId(deptStation.getId());
+    busJcxc.setXclx(FORK_TYPE);
+    return toAjax(busJcxcService.update(busJcxc));
   }
 
   @ApiOperation(value = "单个")
   @GetMapping(value = {"/", "/{id}"})
   public AjaxResult getInfo(String id) {
-    BusWjcxc info = busWjcxcService.getInfo(id);
+    BusJcxc info = busJcxcService.getInfo(id);
     AjaxResult ajax = AjaxResult.success();
     ajax.put("info", info);
     return ajax;
@@ -67,9 +78,10 @@ public class BusWjcxcController extends BaseController {
 
   @ApiOperation(value = "列表")
   @GetMapping(value = "list")
-  public TableDataInfo getList(BusWjcxc busWjcxc) {
+  public TableDataInfo getList(BusJcxc busJcxc) {
     startPage();
-    List<BusWjcxc> list = busWjcxcService.getList(busWjcxc);
+    busJcxc.setXclx(FORK_TYPE);
+    List<BusJcxc> list = busJcxcService.getList(busJcxc);
     return getDataTable(list);
   }
 

railway-business/src/main/java/com/railway/business/baseinfo/domain/BusJcxc.java

@@ -70,10 +70,17 @@ public class BusJcxc extends BaseEntity{
     @Length(min = 1, max = 50, message = "【线岔号】长度必须介于 {min} 和 {max} 之间")
     private String xch;
 
+    @ApiModelProperty(value = "道岔编号")
+    @Length( max = 50, message = "【道岔编号】长度必须介于 {min} 和 {max} 之间")
+    private String dcbh;
+
     @ApiModelProperty(value = "线岔类型")
     @Length( max = 20, message = "【线岔类型】长度必须介于 {min} 和 {max} 之间")
     private String xclx;
 
+    @ApiModelProperty(value = "线岔类型")
+    private String xclxText;
+
     @ApiModelProperty(value = "标准定位/非标准定位")
     @Length( max = 10, message = "【标准定位/非标准定位】长度必须介于 {min} 和 {max} 之间")
     private String bzdw;

railway-business/src/main/java/com/railway/business/baseinfo/domain/BusWjcxc.java

@@ -1,81 +0,0 @@
-package com.railway.business.baseinfo.domain;
-
-import com.railway.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.hibernate.validator.constraints.Length;
-/**
- * 基础数据-无交叉线岔
- * @author zcf 2021-10-27
- */
-@Data
-@ApiModel("基础数据-无交叉线岔")
-@EqualsAndHashCode(callSuper = true)
-public class BusWjcxc extends BaseEntity{
-
-    @ApiModelProperty(value = "主键", hidden = true)
-    private String id;
-
-    @ApiModelProperty(value = "车间ID")
-    private Long deptId;
-
-    @ApiModelProperty(value = "所属部门")
-    private String deptName;
-
-    @ApiModelProperty(value = "线别ID")
-    private Long lineId;
-
-    @ApiModelProperty(value = "线别")
-    private String lineName;
-
-    @ApiModelProperty(value = "区间ID")
-    private Long stationId;
-
-    @ApiModelProperty(value = "站/区间")
-    private String stationName;
-
-    @ApiModelProperty(value = "车间-区间站场关联id")
-    private Long deptStationId;
-
-    @ApiModelProperty(value = "行别")
-    @Length(min = 1, max = 50, message = "【行别】长度必须介于 {min} 和 {max} 之间")
-    private String xingbie;
-
-    @ApiModelProperty(value = "行别")
-    private String xingbieText;
-
-    @ApiModelProperty(value = "支柱范围")
-    @Length(min = 1, max = 50, message = "【支柱号】长度必须介于 {min} 和 {max} 之间")
-    private String pillarArea;
-
-    @ApiModelProperty(value = "股道")
-    @Length( max = 100, message = "【股道】长度必须介于 {min} 和 {max} 之间")
-    private String stationTrack;
-
-    @ApiModelProperty(value = "管辖模式")
-    @Length( max = 50, message = "【管辖模式】长度必须介于 {min} 和 {max} 之间")
-    private String gxms;
-
-    @ApiModelProperty(value = "道岔编号")
-    @Length( max = 50, message = "【道岔编号】长度必须介于 {min} 和 {max} 之间")
-    private String dcbh;
-
-    @ApiModelProperty(value = "线岔号")
-    @Length(min = 1, max = 50, message = "【线岔号】长度必须介于 {min} 和 {max} 之间")
-    private String xch;
-
-    @ApiModelProperty(value = "无交叉线岔类型")
-    @Length( max = 50, message = "【无交叉线岔类型】长度必须介于 {min} 和 {max} 之间")
-    private String wjcxclx;
-
-    @ApiModelProperty(value = "数据编号")
-    @Length( max = 50, message = "【数据编号】长度必须介于 {min} 和 {max} 之间")
-    private String sjbh;
-
-    @ApiModelProperty(value = "del_flag")
-    @Length( max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
-    private String delFlag;
-
-}

railway-business/src/main/java/com/railway/business/baseinfo/mapper/BusWjcxcMapper.java

@@ -1,43 +0,0 @@
-package com.railway.business.baseinfo.mapper;
-
-import com.github.pagehelper.Page;
-import com.railway.business.baseinfo.domain.BusWjcxc;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-/**
-* 基础数据-无交叉线岔
-* @author zcf
-* @date 2021/10/27
-*/
-@Mapper
-@Repository
-public interface BusWjcxcMapper {
-
-    /**
-    * 新增
-    */
-    int insert(BusWjcxc busWjcxc);
-
-    /**
-    * 删除
-    */
-    int delete(@Param("id") String id);
-
-    /**
-    * 更新
-    */
-    int update(BusWjcxc busWjcxc);
-
-    /**
-    * 获取单个
-    */
-    BusWjcxc getInfo(@Param("id") String id);
-
-    /**
-    * 查询列表
-    */
-    Page<BusWjcxc> getList(BusWjcxc busWjcxc);
-
-}

railway-business/src/main/java/com/railway/business/baseinfo/service/IBusWjcxcService.java

@@ -1,37 +0,0 @@
-package com.railway.business.baseinfo.service;
-
-import com.railway.business.baseinfo.domain.BusWjcxc;
-import java.util.List;
-/**
-* 基础数据-无交叉线岔
-* @author zcf
-* @date 2021/10/27
-*/
-public interface IBusWjcxcService{
-
-    /**
-    * 新增
-    */
-    int create(BusWjcxc busWjcxc);
-
-    /**
-    * 删除
-    */
-    int delete(String[] ids);
-
-    /**
-    * 更新
-    */
-    int update(BusWjcxc busWjcxc);
-
-    /**
-    * 获取单个
-    */
-    BusWjcxc getInfo(String id);
-
-    /**
-    * 查询列表
-    */
-    List<BusWjcxc> getList(BusWjcxc busWjcxc);
-
-}

railway-business/src/main/java/com/railway/business/baseinfo/service/impl/BusWjcxcServiceImpl.java

@@ -1,77 +0,0 @@
-package com.railway.business.baseinfo.service.impl;
-
-import com.railway.business.baseinfo.mapper.BusWjcxcMapper;
-import com.railway.business.baseinfo.domain.BusWjcxc;
-import com.railway.business.baseinfo.service.IBusWjcxcService;
-import org.springframework.stereotype.Service;
-import com.railway.common.utils.SecurityUtils;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
-import java.util.Date;
-/**
-* 基础数据-无交叉线岔
-* @author zcf
-* @date 2021/10/27
-*/
-@Service
-@Transactional(readOnly = true)
-public class BusWjcxcServiceImpl implements IBusWjcxcService{
-
-	private final BusWjcxcMapper busWjcxcMapper;
-
-	public BusWjcxcServiceImpl(BusWjcxcMapper busWjcxcMapper) {
-		this.busWjcxcMapper = busWjcxcMapper;
-	}
-
-	/**
-	* 新增
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int create(BusWjcxc busWjcxc) {
-	    busWjcxc.setCreateTime(new Date());
-        busWjcxc.setCreateBy(SecurityUtils.getUsername());
-		return busWjcxcMapper.insert(busWjcxc);
-	}
-
-	/**
-	* 删除
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int delete(String[] ids) {
-		int r =0;
-		for (String id : ids) {
-			int j= busWjcxcMapper.delete(id);
-			r = r + j;
-		}
-		return	r;
-	}
-
-	/**
-	* 更新
-	*/
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int update(BusWjcxc busWjcxc) {
-		busWjcxc.setUpdateTime(new Date());
-    	busWjcxc.setUpdateBy(SecurityUtils.getUsername());
-		return busWjcxcMapper.update(busWjcxc);
-	}
-
-	/**
-	* 获取单个
-	*/
-	@Override
-	public BusWjcxc getInfo(String id) {
-		return busWjcxcMapper.getInfo(id);
-	}
-
-	/**
-	* 查询列表
-	*/
-	@Override
-	public List<BusWjcxc> getList(BusWjcxc busWjcxc) {
-		return busWjcxcMapper.getList(busWjcxc);
-	}
-}

railway-business/src/main/resources/mapper/baseinfo/BusJcxcMapper.xml

@@ -14,6 +14,7 @@
     <result column="dept_station_id" property="deptStationId"/>
     <result column="xingbie" property="xingbie"/>
     <result column="xingbie_text" property="xingbieText"/>
+    <result column="xclx_text" property="xclxText"/>
     <result column="pillar_area" property="pillarArea"/>
     <result column="marker" property="marker"/>
     <result column="station_track" property="stationTrack"/>
@@ -106,12 +107,6 @@
       <if test='null != createTime'>
         create_time,
       </if>
-      <if test='null != updateBy'>
-        update_by,
-      </if>
-      <if test='null != updateTime'>
-        update_time,
-      </if>
       <if test='null != sjbh'>
         sjbh
       </if>
@@ -159,12 +154,6 @@
       <if test='null != createTime'>
         #{createTime},
       </if>
-      <if test='null != updateBy'>
-        #{updateBy},
-      </if>
-      <if test='null != updateTime'>
-        #{updateTime},
-      </if>
       <if test='null != sjbh'>
         #{sjbh}
       </if>
@@ -202,20 +191,24 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>,
+    dict.dict_label as xingbie_text, dict1.dict_label as xclx_text
     FROM base_jcxc 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.xclx = dict.dict_value AND dict.dict_type = 'forkType')
     WHERE t.del_flag='0' and t.id = #{id}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>,
+    dict.dict_label as xingbie_text, dict1.dict_label as xclx_text
     FROM base_jcxc 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.xclx = dict.dict_value AND dict.dict_type = 'forkType')
     <where>
       t.del_flag='0'
       <if test="deptId!=null and deptId!=''">
@@ -236,45 +229,12 @@
       <if test="marker!=null and marker!=''">
         and t.marker=#{marker}
       </if>
-      <if test="stationTrack!=null and stationTrack!=''">
-        and t.station_track=#{stationTrack}
-      </if>
-      <if test="gxms!=null and gxms!=''">
-        and t.gxms=#{gxms}
-      </if>
-      <if test="dsgc!=null and dsgc!=''">
-        and t.dsgc=#{dsgc}
-      </if>
-      <if test="remark!=null and remark!=''">
-        and t.remark=#{remark}
-      </if>
       <if test="xch!=null and xch!=''">
         and t.xch=#{xch}
       </if>
       <if test="xclx!=null and xclx!=''">
         and t.xclx=#{xclx}
       </if>
-      <if test="bzdw!=null and bzdw!=''">
-        and t.bzdw=#{bzdw}
-      </if>
-      <if test="delFlag!=null and delFlag!=''">
-        and t.del_flag=#{delFlag}
-      </if>
-      <if test="createBy!=null and createBy!=''">
-        and t.create_by=#{createBy}
-      </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
-      </if>
-      <if test="updateBy!=null and updateBy!=''">
-        and t.update_by=#{updateBy}
-      </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
-      </if>
-      <if test="sjbh!=null and sjbh!=''">
-        and t.sjbh=#{sjbh}
-      </if>
     </where>
   </select>
 

railway-business/src/main/resources/mapper/baseinfo/BusWjcxcMapper.xml

@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-  "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.railway.business.baseinfo.mapper.BusWjcxcMapper">
-
-  <resultMap id="BaseResultMap" type="com.railway.business.baseinfo.domain.BusWjcxc">
-    <result column="id" property="id"/>
-    <result column="dept_id" property="deptId"/>
-    <result column="dept_name" property="deptName"/>
-    <result column="line_id" property="lineId"/>
-    <result column="line_name" property="lineName"/>
-    <result column="station_id" property="stationId"/>
-    <result column="station_name" property="stationName"/>
-    <result column="dept_station_id" property="deptStationId"/>
-    <result column="xingbie" property="xingbie"/>
-    <result column="xingbie_text" property="xingbieText"/>
-    <result column="pillar_area" property="pillarArea"/>
-    <result column="station_track" property="stationTrack"/>
-    <result column="gxms" property="gxms"/>
-    <result column="dcbh" property="dcbh"/>
-    <result column="xch" property="xch"/>
-    <result column="wjcxclx" property="wjcxclx"/>
-    <result column="sjbh" property="sjbh"/>
-    <result column="del_flag" property="delFlag"/>
-    <result column="create_by" property="createBy"/>
-    <result column="create_time" property="createTime"/>
-    <result column="update_by" property="updateBy"/>
-    <result column="update_time" property="updateTime"/>
-  </resultMap>
-
-  <sql id="Base_Column_List">
-    t.id,
-    v.dept_id,
-    v.dept_name,
-    v.line_id,
-    v.line_name,
-    v.station_name as station_name,
-    v.station_id,
-    t.dept_station_id,
-    t.xingbie,
-    t.pillar_area,
-    t.station_track,
-    t.gxms,
-    t.dcbh,
-    t.xch,
-    t.wjcxclx,
-    t.sjbh,
-    t.del_flag,
-    t.create_by,
-    t.create_time,
-    t.update_by,
-    t.update_time
-  </sql>
-
-  <insert id="insert" parameterType="com.railway.business.baseinfo.domain.BusWjcxc">
-    <selectKey keyProperty="id" order="AFTER" resultType="Long">
-      select @@IDENTITY as line_id
-    </selectKey>
-    INSERT INTO base_wjcxc
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test='null != deptStationId'>
-        dept_station_id,
-      </if>
-      <if test='null != xingbie'>
-        xingbie,
-      </if>
-      <if test='null != pillarArea'>
-        pillar_area,
-      </if>
-      <if test='null != stationTrack'>
-        station_track,
-      </if>
-      <if test='null != gxms'>
-        gxms,
-      </if>
-      <if test='null != dcbh'>
-        dcbh,
-      </if>
-      <if test='null != xch'>
-        xch,
-      </if>
-      <if test='null != wjcxclx'>
-        wjcxclx,
-      </if>
-      <if test='null != delFlag'>
-        del_flag,
-      </if>
-      <if test='null != createBy'>
-        create_by,
-      </if>
-      <if test='null != createTime'>
-        create_time,
-      </if>
-      <if test='null != updateBy'>
-        update_by,
-      </if>
-      <if test='null != updateTime'>
-        update_time,
-      </if>
-      <if test='null != sjbh'>
-        sjbh
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test='null != stationId'>
-        #{station_id},
-      </if>
-      <if test='null != xingbie'>
-        #{xingbie},
-      </if>
-      <if test='null != pillarArea'>
-        #{pillarArea},
-      </if>
-      <if test='null != stationTrack'>
-        #{stationTrack},
-      </if>
-      <if test='null != gxms'>
-        #{gxms},
-      </if>
-      <if test='null != dcbh'>
-        #{dcbh},
-      </if>
-      <if test='null != xch'>
-        #{xch},
-      </if>
-      <if test='null != wjcxclx'>
-        #{wjcxclx},
-      </if>
-      <if test='null != delFlag'>
-        #{delFlag},
-      </if>
-      <if test='null != createBy'>
-        #{createBy},
-      </if>
-      <if test='null != createTime'>
-        #{createTime},
-      </if>
-      <if test='null != updateBy'>
-        #{updateBy},
-      </if>
-      <if test='null != updateTime'>
-        #{updateTime},
-      </if>
-      <if test='null != sjbh'>
-        #{sjbh}
-      </if>
-    </trim>
-  </insert>
-
-  <delete id="delete">
-    UPDATE base_wjcxc
-    set del_flag='1'
-    WHERE id = #{id}
-  </delete>
-
-  <update id="update" parameterType="com.railway.business.baseinfo.domain.BusWjcxc">
-    UPDATE base_wjcxc
-    <set>
-      <if test='null != deptStationId'>dept_station_id = #{deptStationId},</if>
-      <if test='null != xingbie'>xingbie = #{xingbie},</if>
-      <if test='null != pillarArea'>pillar_area = #{pillarArea},</if>
-      <if test='null != stationTrack'>station_track = #{stationTrack},</if>
-      <if test='null != gxms'>gxms = #{gxms},</if>
-      <if test='null != dcbh'>dcbh = #{dcbh},</if>
-      <if test='null != xch'>xch = #{xch},</if>
-      <if test='null != wjcxclx'>wjcxclx = #{wjcxclx},</if>
-      <if test='null != delFlag'>del_flag = #{delFlag},</if>
-      <if test='null != updateBy'>update_by = #{updateBy},</if>
-      <if test='null != updateTime'>update_time = #{updateTime},</if>
-      <if test='null != sjbh'>sjbh = #{sjbh}</if>
-    </set>
-    WHERE id = #{id}
-  </update>
-
-
-  <select id="getInfo" resultMap="BaseResultMap">
-    SELECT
-    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
-    FROM base_wjcxc 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')
-    WHERE t.del_flag='0' and t.id = #{id}
-
-  </select>
-
-  <select id="getList" resultMap="BaseResultMap">
-    SELECT
-    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
-    FROM base_wjcxc 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')
-    <where>
-      t.del_flag='0'
-      <if test="deptId!=null and deptId!=''">
-        and v.dept_id=#{deptId}
-      </if>
-      <if test="lineId!=null and lineId!=''">
-        and v.line_id=#{lineId}
-      </if>
-      <if test="stationId!=null and stationId!=''">
-        and v.station_id=#{stationId}
-      </if>
-      <if test="xingbie!=null and xingbie!=''">
-        and t.xingbie=#{xingbie}
-      </if>
-      <if test="pillarArea!=null and pillarArea!=''">
-        and t.pillar_area=#{pillarArea}
-      </if>
-      <if test="stationTrack!=null and stationTrack!=''">
-        and t.station_track=#{stationTrack}
-      </if>
-      <if test="gxms!=null and gxms!=''">
-        and t.gxms=#{gxms}
-      </if>
-      <if test="dcbh!=null and dcbh!=''">
-        and t.dcbh=#{dcbh}
-      </if>
-      <if test="xch!=null and xch!=''">
-        and t.xch=#{xch}
-      </if>
-      <if test="wjcxclx!=null and wjcxclx!=''">
-        and t.wjcxclx=#{wjcxclx}
-      </if>
-      <if test="delFlag!=null and delFlag!=''">
-        and t.del_flag=#{delFlag}
-      </if>
-      <if test="createBy!=null and createBy!=''">
-        and t.create_by=#{createBy}
-      </if>
-      <if test="createTime!=null and createTime!=''">
-        and t.create_time=#{createTime}
-      </if>
-      <if test="updateBy!=null and updateBy!=''">
-        and t.update_by=#{updateBy}
-      </if>
-      <if test="updateTime!=null and updateTime!=''">
-        and t.update_time=#{updateTime}
-      </if>
-      <if test="sjbh!=null and sjbh!=''">
-        and t.sjbh=#{sjbh}
-      </if>
-    </where>
-  </select>
-
-</mapper>