【CHG】统一基础字段名称。

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

@@ -63,7 +63,7 @@ public class BusFjxgmdController extends BaseController {
         return getDataTable(list);
     }
 
-    @ApiOperation(value = "通过支柱信息获取对锚列表", notes = "通过支柱信息获取对锚列表", response = AjaxResult.class)
+    @ApiOperation(value = "通过支柱信息获取对锚列表", notes = "通过支柱信息获取对锚列表,需要传查询条件", response = AjaxResult.class)
     @GetMapping("/getListByZz")
     public TableDataInfo getListByZz(BusFjxgmd busFjxgmd) {
         startPage();

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

@@ -5,51 +5,58 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import java.util.Date;
+
 import org.hibernate.validator.constraints.Length;
+import javax.validation.constraints.NotNull;
 /**
- * 附加悬挂锚段
- * @author author 2021-10-26
+ * 基础数据-附加悬挂锚段
+ * @author author 2021-11-04
  */
 @Data
-@ApiModel("附加悬挂锚段")
+@ApiModel("基础数据-附加悬挂锚段")
 @EqualsAndHashCode(callSuper = true)
 public class BusFjxgmd extends BaseEntity{
 
-    @ApiModelProperty(value = "主键")
+    @ApiModelProperty(value = "主键", hidden = true)
     private String id;
 
-    @ApiModelProperty(value = "段别")
-    @Length(min = 1, max = 100, message = "【段别】长度必须介于 {min} 和 {max} 之间")
-    private String db;
-
-    @ApiModelProperty(value = "部门/车间")
-    @Length(min = 1, max = 100, message = "【部门/车间】长度必须介于 {min} 和 {max} 之间")
-    private String bm;
+    @ApiModelProperty(value = "部门id")
+    private Long deptId;
 
-    @ApiModelProperty(value = "所属部门名称")
+    @ApiModelProperty(value = "所属部门")
+    @Length(min = 1, max = 100, message = "【所属部门】长度必须介于 {min} 和 {max} 之间")
     private String deptName;
 
+    @ApiModelProperty(value = "线路id")
+    private Long lineId;
+
     @ApiModelProperty(value = "线别")
     @Length(min = 1, max = 100, message = "【线别】长度必须介于 {min} 和 {max} 之间")
-    private String xb;
-
-    @ApiModelProperty(value = "线别名称")
     private String lineName;
 
+    @ApiModelProperty(value = "区间站场id")
+    private Long stationId;
+
     @ApiModelProperty(value = "站/区间")
     @Length(min = 1, max = 100, message = "【站/区间】长度必须介于 {min} 和 {max} 之间")
-    private String qj;
-
-    @ApiModelProperty(value = "区间名称")
     private String stationName;
 
     @ApiModelProperty(value = "行别")
     @Length(min = 1, max = 100, message = "【行别】长度必须介于 {min} 和 {max} 之间")
-    private String hb;
+    private String xingbie;
 
     @ApiModelProperty(value = "行别字典中文")
     private String xingbieText;
 
+    @ApiModelProperty(value = "股道")
+    @Length(min = 1, max = 100, message = "【股道】长度必须介于 {min} 和 {max} 之间")
+    private String stationTrack;
+
+    @ApiModelProperty(value = "管辖模式")
+    @Length(min = 1, max = 100, message = "【管辖模式】长度必须介于 {min} 和 {max} 之间")
+    private String gxms;
+
     @ApiModelProperty(value = "附加类型")
     @Length(min = 1, max = 100, message = "【附加类型】长度必须介于 {min} 和 {max} 之间")
     private String fjlx;
@@ -57,14 +64,86 @@ public class BusFjxgmd extends BaseEntity{
     @ApiModelProperty(value = "附加类型字典中文")
     private String fjlxText;
 
+    @ApiModelProperty(value = "锚段号")
+    @Length(min = 1, max = 100, message = "【锚段号】长度必须介于 {min} 和 {max} 之间")
+    private String mdh;
+
+    @ApiModelProperty(value = "锚段长度(m)")
+    @Length(min = 1, max = 100, message = "【锚段长度(m)】长度必须介于 {min} 和 {max} 之间")
+    private String mdcd;
+
+    @ApiModelProperty(value = "投运日期")
+    @Length(min = 1, max = 100, message = "【投运日期】长度必须介于 {min} 和 {max} 之间")
+    private String tyrq;
+
     @ApiModelProperty(value = "起始公里标(km)")
     @Length(min = 1, max = 100, message = "【起始公里标(km)】长度必须介于 {min} 和 {max} 之间")
     private String qsglb;
 
+    @ApiModelProperty(value = "结束公里标(km)")
+    @Length(min = 1, max = 100, message = "【结束公里标(km)】长度必须介于 {min} 和 {max} 之间")
+    private String jsglb;
+
     @ApiModelProperty(value = "起始杆号")
     @Length(min = 1, max = 100, message = "【起始杆号】长度必须介于 {min} 和 {max} 之间")
     private String qsgh;
 
+    @ApiModelProperty(value = "截止杆号")
+    @Length(min = 1, max = 100, message = "【截止杆号】长度必须介于 {min} 和 {max} 之间")
+    private String jzgh;
+
+    @ApiModelProperty(value = "线索材质")
+    @Length(min = 1, max = 100, message = "【线索材质】长度必须介于 {min} 和 {max} 之间")
+    private String xscz;
+
+    @ApiModelProperty(value = "线索型号")
+    @Length(min = 1, max = 100, message = "【线索型号】长度必须介于 {min} 和 {max} 之间")
+    private String xsxh;
+
+    @ApiModelProperty(value = "线索张力(kn)")
+    @Length(min = 1, max = 100, message = "【线索张力(kn)】长度必须介于 {min} 和 {max} 之间")
+    private String xszl;
+
+    @ApiModelProperty(value = "线索厂家")
+    @Length(min = 1, max = 100, message = "【线索厂家】长度必须介于 {min} 和 {max} 之间")
+    private String xscj;
+
+    @ApiModelProperty(value = "接头数量")
+    @Length(min = 1, max = 100, message = "【接头数量】长度必须介于 {min} 和 {max} 之间")
+    private String jtsl;
+
+    @ApiModelProperty(value = "补强数量")
+    @Length(min = 1, max = 100, message = "【补强数量】长度必须介于 {min} 和 {max} 之间")
+    private String bqsl;
+
+    @ApiModelProperty(value = "af线")
+    @Length(min = 1, max = 100, message = "【af线】长度必须介于 {min} 和 {max} 之间")
+    private String afx;
+
+    @ApiModelProperty(value = "避雷线")
+    @Length(min = 1, max = 100, message = "【避雷线】长度必须介于 {min} 和 {max} 之间")
+    private String blx;
+
+    @ApiModelProperty(value = "其它")
+    @Length(min = 1, max = 100, message = "【其它】长度必须介于 {min} 和 {max} 之间")
+    private String qt;
+
+    @ApiModelProperty(value = "附件")
+    @Length(min = 1, max = 100, message = "【附件】长度必须介于 {min} 和 {max} 之间")
+    private String fj;
+
+    @ApiModelProperty(value = "数量")
+    @Length(min = 1, max = 100, message = "【数量】长度必须介于 {min} 和 {max} 之间")
+    private String sl;
+
+    @ApiModelProperty(value = "单位")
+    @Length(min = 1, max = 100, message = "【单位】长度必须介于 {min} 和 {max} 之间")
+    private String dw;
+
+    @ApiModelProperty(value = "数据编号")
+    @Length(min = 1, max = 100, message = "【数据编号】长度必须介于 {min} 和 {max} 之间")
+    private String slbh;
+
     @ApiModelProperty(value = "del_flag")
     @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
     private String delFlag;

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

@@ -5,58 +5,57 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import java.util.Date;
+
 import org.hibernate.validator.constraints.Length;
+import javax.validation.constraints.NotNull;
 /**
  * 基础数据-检查表-隔离开关
- * @author author 2021-10-26
+ * @author author 2021-11-04
  */
 @Data
 @ApiModel("基础数据-检查表-隔离开关")
 @EqualsAndHashCode(callSuper = true)
 public class BusGlkg extends BaseEntity{
 
-    @ApiModelProperty(value = "主键")
+    @ApiModelProperty(value = "主键", hidden = true)
     private String id;
 
-    @ApiModelProperty(value = "段别")
-    @Length(min = 1, max = 100, message = "【段别】长度必须介于 {min} 和 {max} 之间")
-    private String db;
+    @ApiModelProperty(value = "部门id")
+    private Long deptId;
 
     @ApiModelProperty(value = "所属部门")
     @Length(min = 1, max = 100, message = "【所属部门】长度必须介于 {min} 和 {max} 之间")
-    private String bm;
-
-    @ApiModelProperty(value = "所属部门名称")
     private String deptName;
 
+    @ApiModelProperty(value = "线路id")
+    private Long lineId;
+
     @ApiModelProperty(value = "线别")
     @Length(min = 1, max = 100, message = "【线别】长度必须介于 {min} 和 {max} 之间")
-    private String xb;
-
-    @ApiModelProperty(value = "线别名称")
     private String lineName;
 
+    @ApiModelProperty(value = "区间站场id")
+    private Long stationId;
+
     @ApiModelProperty(value = "区间")
     @Length(min = 1, max = 100, message = "【区间】长度必须介于 {min} 和 {max} 之间")
-    private String qj;
-
-    @ApiModelProperty(value = "区间名称")
     private String stationName;
 
     @ApiModelProperty(value = "行别")
     @Length(min = 1, max = 100, message = "【行别】长度必须介于 {min} 和 {max} 之间")
-    private String hb;
+    private String xingbie;
 
     @ApiModelProperty(value = "行别字典中文")
     private String xingbieText;
 
     @ApiModelProperty(value = "支柱号")
     @Length(min = 1, max = 100, message = "【支柱号】长度必须介于 {min} 和 {max} 之间")
-    private String zzh;
+    private String pillarCode;
 
     @ApiModelProperty(value = "公里标")
     @Length(min = 1, max = 100, message = "【公里标】长度必须介于 {min} 和 {max} 之间")
-    private String glb;
+    private String stationTrack;
 
     @ApiModelProperty(value = "开关编号")
     @Length(min = 1, max = 100, message = "【开关编号】长度必须介于 {min} 和 {max} 之间")

railway-business/src/main/java/com/railway/business/catenary/domain/BusJcbGlkg.java

@@ -5,29 +5,50 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import java.util.Date;
+
 import org.hibernate.validator.constraints.Length;
+import javax.validation.constraints.NotNull;
 /**
- * 隔离开关检查表
- * @author author 2021-10-13
+ * 检查表-隔离开关检查
+ * @author author 2021-11-04
  */
 @Data
-@ApiModel("隔离开关检查表")
+@ApiModel("检查表-隔离开关检查")
 @EqualsAndHashCode(callSuper = true)
 public class BusJcbGlkg extends BaseEntity{
 
-    @ApiModelProperty(value = "主键")
+    @ApiModelProperty(value = "主键", hidden = true)
     private String id;
 
+    @ApiModelProperty(value = "部门id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "所属部门")
+    @Length(min = 1, max = 100, message = "【所属部门】长度必须介于 {min} 和 {max} 之间")
+    private String deptName;
+
+    @ApiModelProperty(value = "线路id")
+    private Long lineId;
+
+    @ApiModelProperty(value = "线别")
+    @Length(min = 1, max = 100, message = "【线别】长度必须介于 {min} 和 {max} 之间")
+    private String lineName;
+
+    @ApiModelProperty(value = "区间站场id")
+    private Long stationId;
+
     @ApiModelProperty(value = "区间")
     @Length(min = 1, max = 100, message = "【区间】长度必须介于 {min} 和 {max} 之间")
-    private String qj;
-
-    @ApiModelProperty(value = "区间名称")
     private String stationName;
 
+    @ApiModelProperty(value = "行别")
+    @Length(min = 1, max = 100, message = "【行别】长度必须介于 {min} 和 {max} 之间")
+    private String xingbie;
+
     @ApiModelProperty(value = "支柱号")
     @Length(min = 1, max = 100, message = "【支柱号】长度必须介于 {min} 和 {max} 之间")
-    private String zzh;
+    private String pillarCode;
 
     @ApiModelProperty(value = "开关号")
     @Length(min = 1, max = 100, message = "【开关号】长度必须介于 {min} 和 {max} 之间")

railway-business/src/main/java/com/railway/business/catenary/domain/BusJcebLbjghjl.java

@@ -11,7 +11,7 @@ import org.hibernate.validator.constraints.Length;
 import javax.validation.constraints.NotNull;
 /**
  * 检测表-零部件更换记录
- * @author author 2021-10-19
+ * @author author 2021-11-05
  */
 @Data
 @ApiModel("检测表-零部件更换记录")
@@ -21,11 +21,11 @@ public class BusJcebLbjghjl extends BaseEntity{
     @ApiModelProperty(value = "主键", hidden = true)
     private String id;
 
+    @ApiModelProperty(value = "区间站场id")
+    private Long stationId;
+
     @ApiModelProperty(value = "站场(区间)")
     @Length(min = 1, max = 100, message = "【站场(区间)】长度必须介于 {min} 和 {max} 之间")
-    private String qj;
-
-    @ApiModelProperty(value = "站场(区间)名称")
     private String stationName;
 
     @ApiModelProperty(value = "地点")

railway-business/src/main/java/com/railway/business/catenary/domain/BusJcebQmjcjl.java

@@ -11,26 +11,26 @@ import org.hibernate.validator.constraints.Length;
 import javax.validation.constraints.NotNull;
 /**
  * 检测表-全面检查记录
- * @author author 2021-10-19
+ * @author author 2021-11-05
  */
 @Data
 @ApiModel("检测表-全面检查记录")
 @EqualsAndHashCode(callSuper = true)
 public class BusJcebQmjcjl extends BaseEntity{
 
-    @ApiModelProperty(value = "主键")
+    @ApiModelProperty(value = "主键", hidden = true)
     private String id;
 
+    @ApiModelProperty(value = "区间站场id")
+    private Long stationId;
+
     @ApiModelProperty(value = "站场(区间)")
     @Length(min = 1, max = 100, message = "【站场(区间)】长度必须介于 {min} 和 {max} 之间")
-    private String qj;
-
-    @ApiModelProperty(value = "站场(区间)名称")
     private String stationName;
 
     @ApiModelProperty(value = "支柱号（或悬挂点）")
-    @Length(min = 1, max = 20, message = "【支柱号（或悬挂点）】长度必须介于 {min} 和 {max} 之间")
-    private String zzh;
+    @Length(min = 1, max = 100, message = "【支柱号（或悬挂点）】长度必须介于 {min} 和 {max} 之间")
+    private String pillarCode;
 
     @ApiModelProperty(value = "缺陷来源")
     @Length(min = 1, max = 20, message = "【缺陷来源】长度必须介于 {min} 和 {max} 之间")

railway-business/src/main/java/com/railway/business/catenary/domain/BusJlgz.java

@@ -5,53 +5,49 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.validator.constraints.Length;
-
+import java.util.Date;
 import java.util.List;
 
+import org.hibernate.validator.constraints.Length;
+import javax.validation.constraints.NotNull;
 /**
  * 接触网-记录故障
- * @author author 2021-10-16
+ * @author author 2021-11-04
  */
 @Data
 @ApiModel("接触网-记录故障")
 @EqualsAndHashCode(callSuper = true)
 public class BusJlgz extends BaseEntity{
 
-    @ApiModelProperty(value = "主键")
+    @ApiModelProperty(value = "主键", hidden = true)
     private String id;
 
-    @ApiModelProperty(value = "线别名称")
-    private String lineName;
-
-    @ApiModelProperty(value = "所别名称")
-    private String substationName;
+    @ApiModelProperty(value = "线路id")
+    private Long lineId;
 
     @ApiModelProperty(value = "线别")
     @Length(min = 1, max = 100, message = "【线别】长度必须介于 {min} 和 {max} 之间")
-    private String xb;
+    private String lineName;
+
+    @ApiModelProperty(value = "变电所id")
+    private Long substationId;
 
     @ApiModelProperty(value = "所别")
     @Length(min = 1, max = 100, message = "【所别】长度必须介于 {min} 和 {max} 之间")
-    private String sb;
+    private String substationName;
 
     @ApiModelProperty(value = "行别")
     @Length(min = 1, max = 100, message = "【行别】长度必须介于 {min} 和 {max} 之间")
-    private String hb;
-
-    @ApiModelProperty(value = "行别字典中文")
-    private String xingbieText;
+    private String xingbie;
 
     @ApiModelProperty(value = "公里标")
-    private Integer glb;
+    @Length(min = 1, max = 20, message = "【公里标】长度必须介于 {min} 和 {max} 之间")
+    private String marker;
 
     @ApiModelProperty(value = "原因类型")
     @Length(min = 1, max = 100, message = "【原因类型】长度必须介于 {min} 和 {max} 之间")
     private String yylx;
 
-    @ApiModelProperty(value = "原因类型中文")
-    private String yylxText;
-
     @ApiModelProperty(value = "记录日期")
     @Length(min = 1, max = 100, message = "【记录日期】长度必须介于 {min} 和 {max} 之间")
     private String jlrq;
@@ -60,18 +56,11 @@ public class BusJlgz extends BaseEntity{
     @Length(min = 1, max = 1000, message = "【故障描述】长度必须介于 {min} 和 {max} 之间")
     private String gzms;
 
-    @ApiModelProperty(value = "上传照片")
-    private List<BusJlgzPic> pics;
-
     @ApiModelProperty(value = "del_flag")
     @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
     private String delFlag;
 
-    @ApiModelProperty(value = "要排序的列")
-    private String orderBy;
-
-    @ApiModelProperty(value = "1-ASC 正序排序，0-DESC 倒序排序")
-    private String isAsc;
+    private List<BusJlgzPic> pics;
 
     public BusJlgz() {
     }

railway-business/src/main/java/com/railway/business/catenary/domain/vo/BusJlgzQueryVo.java

@@ -2,6 +2,7 @@ package com.railway.business.catenary.domain.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
 import java.io.Serializable;
 
@@ -13,17 +14,17 @@ public class BusJlgzQueryVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "线别")
-    private String xb;
+    @ApiModelProperty(value = "线路id")
+    private Long lineId;
 
     @ApiModelProperty(value = "行别")
-    private String hb;
+    private String xingbie;
 
     @ApiModelProperty(value = "支柱号")
-    private String zzh;
+    private String pillarCode;
 
     @ApiModelProperty(value = "公里标")
-    private String glb;
+    private String marker;
 
     @ApiModelProperty(value = "支柱范围")
     private String zzfw;

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

@@ -4,37 +4,78 @@
 <mapper namespace="com.railway.business.baseinfo.mapper.BusFjxgmdMapper">
 
     <resultMap id="BaseResultMap" type="com.railway.business.baseinfo.domain.BusFjxgmd">
-                <result column="id" property="id"/>
-                <result column="db" property="db"/>
-                <result column="bm" property="bm"/>
-                <result column="xb" property="xb"/>
-                <result column="qj" property="qj"/>
-                <result column="hb" property="hb"/>
-                <result column="fjlx" property="fjlx"/>
-                <result column="qsglb" property="qsglb"/>
-                <result column="qsgh" property="qsgh"/>
-                <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"/>
-                <result column="dept_name" property="deptName"/>
-                <result column="line_name" property="lineName"/>
-                <result column="station_name" property="stationName"/>
-                <result column="xingbie_text" property="xingbieText"/>
-                <result column="fjlx_text" property="fjlxText"/>
+        <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="xingbie" property="xingbie"/>
+        <result column="station_track" property="stationTrack"/>
+        <result column="gxms" property="gxms"/>
+        <result column="fjlx" property="fjlx"/>
+        <result column="mdh" property="mdh"/>
+        <result column="mdcd" property="mdcd"/>
+        <result column="tyrq" property="tyrq"/>
+        <result column="qsglb" property="qsglb"/>
+        <result column="jsglb" property="jsglb"/>
+        <result column="qsgh" property="qsgh"/>
+        <result column="jzgh" property="jzgh"/>
+        <result column="xscz" property="xscz"/>
+        <result column="xsxh" property="xsxh"/>
+        <result column="xszl" property="xszl"/>
+        <result column="xscj" property="xscj"/>
+        <result column="jtsl" property="jtsl"/>
+        <result column="bqsl" property="bqsl"/>
+        <result column="afx" property="afx"/>
+        <result column="blx" property="blx"/>
+        <result column="qt" property="qt"/>
+        <result column="fj" property="fj"/>
+        <result column="sl" property="sl"/>
+        <result column="dw" property="dw"/>
+        <result column="slbh" property="slbh"/>
+        <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"/>
+        <result column="xingbie_text" property="xingbieText"/>
+        <result column="fjlx_text" property="fjlxText"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-                id,
-                db,
-                bm,
-                xb,
-                qj,
-                hb,
+        id,
+                dept_id,
+                dept_name,
+                line_id,
+                line_name,
+                station_id,
+                station_name,
+                xingbie,
+                station_track,
+                gxms,
                 fjlx,
+                mdh,
+                mdcd,
+                tyrq,
                 qsglb,
+                jsglb,
                 qsgh,
+                jzgh,
+                xscz,
+                xsxh,
+                xszl,
+                xscj,
+                jtsl,
+                bqsl,
+                afx,
+                blx,
+                qt,
+                fj,
+                sl,
+                dw,
+                slbh,
                 del_flag,
                 create_by,
                 create_time,
@@ -48,86 +89,218 @@
         </selectKey>
         INSERT INTO bus_fjxgmd
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                    <if test ='null != db'>
-                    db,
-                    </if>
-                    <if test ='null != bm'>
-                    bm,
-                    </if>
-                    <if test ='null != xb'>
-                    xb,
-                    </if>
-                    <if test ='null != qj'>
-                    qj,
-                    </if>
-                    <if test ='null != hb'>
-                    hb,
-                    </if>
-                    <if test ='null != fjlx'>
-                    fjlx,
-                    </if>
-                    <if test ='null != qsglb'>
-                    qsglb,
-                    </if>
-                    <if test ='null != qsgh'>
-                    qsgh,
-                    </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 != 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 != stationId'>
+                station_id,
+            </if>
+            <if test ='null != stationName'>
+                station_name,
+            </if>
+            <if test ='null != xingbie'>
+                xingbie,
+            </if>
+            <if test ='null != stationTrack'>
+                station_track,
+            </if>
+            <if test ='null != gxms'>
+                gxms,
+            </if>
+            <if test ='null != fjlx'>
+                fjlx,
+            </if>
+            <if test ='null != mdh'>
+                mdh,
+            </if>
+            <if test ='null != mdcd'>
+                mdcd,
+            </if>
+            <if test ='null != tyrq'>
+                tyrq,
+            </if>
+            <if test ='null != qsglb'>
+                qsglb,
+            </if>
+            <if test ='null != jsglb'>
+                jsglb,
+            </if>
+            <if test ='null != qsgh'>
+                qsgh,
+            </if>
+            <if test ='null != jzgh'>
+                jzgh,
+            </if>
+            <if test ='null != xscz'>
+                xscz,
+            </if>
+            <if test ='null != xsxh'>
+                xsxh,
+            </if>
+            <if test ='null != xszl'>
+                xszl,
+            </if>
+            <if test ='null != xscj'>
+                xscj,
+            </if>
+            <if test ='null != jtsl'>
+                jtsl,
+            </if>
+            <if test ='null != bqsl'>
+                bqsl,
+            </if>
+            <if test ='null != afx'>
+                afx,
+            </if>
+            <if test ='null != blx'>
+                blx,
+            </if>
+            <if test ='null != qt'>
+                qt,
+            </if>
+            <if test ='null != fj'>
+                fj,
+            </if>
+            <if test ='null != sl'>
+                sl,
+            </if>
+            <if test ='null != dw'>
+                dw,
+            </if>
+            <if test ='null != slbh'>
+                slbh,
+            </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>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                    <if test ='null != db'>
-                    #{db},
-                    </if>
-                    <if test ='null != bm'>
-                    #{bm},
-                    </if>
-                    <if test ='null != xb'>
-                    #{xb},
-                    </if>
-                    <if test ='null != qj'>
-                    #{qj},
-                    </if>
-                    <if test ='null != hb'>
-                    #{hb},
-                    </if>
-                    <if test ='null != fjlx'>
-                    #{fjlx},
-                    </if>
-                    <if test ='null != qsglb'>
-                    #{qsglb},
-                    </if>
-                    <if test ='null != qsgh'>
-                    #{qsgh},
-                    </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 != deptId'>
+                #{deptId},
+            </if>
+            <if test ='null != deptName'>
+                #{deptName},
+            </if>
+            <if test ='null != lineId'>
+                #{lineId},
+            </if>
+            <if test ='null != lineName'>
+                #{lineName},
+            </if>
+            <if test ='null != stationId'>
+                #{stationId},
+            </if>
+            <if test ='null != stationName'>
+                #{stationName},
+            </if>
+            <if test ='null != xingbie'>
+                #{xingbie},
+            </if>
+            <if test ='null != stationTrack'>
+                #{stationTrack},
+            </if>
+            <if test ='null != gxms'>
+                #{gxms},
+            </if>
+            <if test ='null != fjlx'>
+                #{fjlx},
+            </if>
+            <if test ='null != mdh'>
+                #{mdh},
+            </if>
+            <if test ='null != mdcd'>
+                #{mdcd},
+            </if>
+            <if test ='null != tyrq'>
+                #{tyrq},
+            </if>
+            <if test ='null != qsglb'>
+                #{qsglb},
+            </if>
+            <if test ='null != jsglb'>
+                #{jsglb},
+            </if>
+            <if test ='null != qsgh'>
+                #{qsgh},
+            </if>
+            <if test ='null != jzgh'>
+                #{jzgh},
+            </if>
+            <if test ='null != xscz'>
+                #{xscz},
+            </if>
+            <if test ='null != xsxh'>
+                #{xsxh},
+            </if>
+            <if test ='null != xszl'>
+                #{xszl},
+            </if>
+            <if test ='null != xscj'>
+                #{xscj},
+            </if>
+            <if test ='null != jtsl'>
+                #{jtsl},
+            </if>
+            <if test ='null != bqsl'>
+                #{bqsl},
+            </if>
+            <if test ='null != afx'>
+                #{afx},
+            </if>
+            <if test ='null != blx'>
+                #{blx},
+            </if>
+            <if test ='null != qt'>
+                #{qt},
+            </if>
+            <if test ='null != fj'>
+                #{fj},
+            </if>
+            <if test ='null != sl'>
+                #{sl},
+            </if>
+            <if test ='null != dw'>
+                #{dw},
+            </if>
+            <if test ='null != slbh'>
+                #{slbh},
+            </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>
         </trim>
     </insert>
 
@@ -140,19 +313,41 @@
     <update id="update" parameterType="com.railway.business.baseinfo.domain.BusFjxgmd">
         UPDATE bus_fjxgmd
         <set>
-                    <if test ='null != db'>db = #{db},</if>
-                    <if test ='null != bm'>bm = #{bm},</if>
-                    <if test ='null != xb'>xb = #{xb},</if>
-                    <if test ='null != qj'>qj = #{qj},</if>
-                    <if test ='null != hb'>hb = #{hb},</if>
-                    <if test ='null != fjlx'>fjlx = #{fjlx},</if>
-                    <if test ='null != qsglb'>qsglb = #{qsglb},</if>
-                    <if test ='null != qsgh'>qsgh = #{qsgh},</if>
-                    <if test ='null != delFlag'>del_flag = #{delFlag},</if>
-                    <if test ='null != createBy'>create_by = #{createBy},</if>
-                    <if test ='null != createTime'>create_time = #{createTime},</if>
-                    <if test ='null != updateBy'>update_by = #{updateBy},</if>
-                    <if test ='null != updateTime'>update_time = #{updateTime}</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 != stationId'>station_id = #{stationId},</if>
+            <if test ='null != stationName'>station_name = #{stationName},</if>
+            <if test ='null != xingbie'>xingbie = #{xingbie},</if>
+            <if test ='null != stationTrack'>station_track = #{stationTrack},</if>
+            <if test ='null != gxms'>gxms = #{gxms},</if>
+            <if test ='null != fjlx'>fjlx = #{fjlx},</if>
+            <if test ='null != mdh'>mdh = #{mdh},</if>
+            <if test ='null != mdcd'>mdcd = #{mdcd},</if>
+            <if test ='null != tyrq'>tyrq = #{tyrq},</if>
+            <if test ='null != qsglb'>qsglb = #{qsglb},</if>
+            <if test ='null != jsglb'>jsglb = #{jsglb},</if>
+            <if test ='null != qsgh'>qsgh = #{qsgh},</if>
+            <if test ='null != jzgh'>jzgh = #{jzgh},</if>
+            <if test ='null != xscz'>xscz = #{xscz},</if>
+            <if test ='null != xsxh'>xsxh = #{xsxh},</if>
+            <if test ='null != xszl'>xszl = #{xszl},</if>
+            <if test ='null != xscj'>xscj = #{xscj},</if>
+            <if test ='null != jtsl'>jtsl = #{jtsl},</if>
+            <if test ='null != bqsl'>bqsl = #{bqsl},</if>
+            <if test ='null != afx'>afx = #{afx},</if>
+            <if test ='null != blx'>blx = #{blx},</if>
+            <if test ='null != qt'>qt = #{qt},</if>
+            <if test ='null != fj'>fj = #{fj},</if>
+            <if test ='null != sl'>sl = #{sl},</if>
+            <if test ='null != dw'>dw = #{dw},</if>
+            <if test ='null != slbh'>slbh = #{slbh},</if>
+            <if test ='null != delFlag'>del_flag = #{delFlag},</if>
+            <if test ='null != createBy'>create_by = #{createBy},</if>
+            <if test ='null != createTime'>create_time = #{createTime},</if>
+            <if test ='null != updateBy'>update_by = #{updateBy},</if>
+            <if test ='null != updateTime'>update_time = #{updateTime}</if>
         </set>
         WHERE id = #{id}
     </update>
@@ -160,6 +355,7 @@
 
     <select id="getInfo" resultMap="BaseResultMap">
         SELECT
+            distinct
             dept.dept_name,
             l.line_name,
             s.station_name,
@@ -168,141 +364,207 @@
             a.*
         FROM
             bus_fjxgmd a
-        LEFT JOIN sys_dept dept ON a.bm = dept.dept_id
-        LEFT JOIN bus_line l ON a.xb = l.line_id
-        LEFT JOIN bus_station s ON a.qj = s.station_id
-        LEFT JOIN sys_dict_data dict1 ON (a.hb = dict1.dict_value AND dict1.dict_type = 'xingbie')
-        LEFT JOIN sys_dict_data dict2 ON (a.fjlx = dict2.dict_value AND dict2.dict_type = 'fjlx')
+                LEFT JOIN sys_dept dept ON a.dept_id = dept.dept_id
+                LEFT JOIN bus_line l ON a.line_id = l.line_id
+                LEFT JOIN bus_station s ON a.station_id = s.station_id
+                LEFT JOIN sys_dict_data dict1 ON (a.xingbie = dict1.dict_value AND dict1.dict_type = 'xingbie')
+                LEFT JOIN sys_dict_data dict2 ON (a.fjlx = dict2.dict_value AND dict2.dict_type = 'fjlx')
         WHERE
             a.del_flag = '0'
-            AND dept.del_flag = '0'
-            AND l.del_flag = '0'
-            AND s.del_flag = '0'
-            AND a.id = #{id}
+          AND dept.del_flag = '0'
+          AND l.del_flag = '0'
+          AND s.del_flag = '0'
+          AND a.id = #{id}
     </select>
 
     <select id="getList" resultMap="BaseResultMap">
         SELECT
-            dept.dept_name,
-            l.line_name,
-            s.station_name,
-            dict1.dict_label as xingbie_text,
-            dict2.dict_label as fjlx_text,
-            a.*
+        dept.dept_name,
+        l.line_name,
+        s.station_name,
+        dict1.dict_label as xingbie_text,
+        dict2.dict_label as fjlx_text,
+        a.*
         FROM
-            bus_fjxgmd a
-        LEFT JOIN sys_dept dept ON a.bm = dept.dept_id
-        LEFT JOIN bus_line l ON a.xb = l.line_id
-        LEFT JOIN bus_station s ON a.qj = s.station_id
-        LEFT JOIN sys_dict_data dict1 ON (a.hb = dict1.dict_value AND dict1.dict_type = 'xingbie')
+        bus_fjxgmd a
+        LEFT JOIN sys_dept dept ON a.dept_id = dept.dept_id
+        LEFT JOIN bus_line l ON a.line_id = l.line_id
+        LEFT JOIN bus_station s ON a.station_id = s.station_id
+        LEFT JOIN sys_dict_data dict1 ON (a.xingbie = dict1.dict_value AND dict1.dict_type = 'xingbie')
         LEFT JOIN sys_dict_data dict2 ON (a.fjlx = dict2.dict_value AND dict2.dict_type = 'fjlx')
         <where>
             a.del_flag = '0'
             AND dept.del_flag = '0'
             AND l.del_flag = '0'
             AND s.del_flag = '0'
-            <if test="db!=null and db!=''">
-                    and a.db=#{db}
-                </if>
-                <if test="bm!=null and bm!=''">
-                    and a.bm=#{bm}
-                </if>
-                <if test="xb!=null and xb!=''">
-                    and a.xb=#{xb}
-                </if>
-                <if test="qj!=null and qj!=''">
-                    and a.qj=#{qj}
-                </if>
-                <if test="hb!=null and hb!=''">
-                    and a.hb=#{hb}
-                </if>
-                <if test="fjlx!=null and fjlx!=''">
-                    and a.fjlx=#{fjlx}
-                </if>
-                <if test="qsglb!=null and qsglb!=''">
-                    and a.qsglb=#{qsglb}
-                </if>
-                <if test="qsgh!=null and qsgh!=''">
-                    and a.qsgh=#{qsgh}
-                </if>
-                <if test="delFlag!=null and delFlag!=''">
-                    and a.del_flag=#{delFlag}
-                </if>
-                <if test="createBy!=null and createBy!=''">
-                    and a.create_by=#{createBy}
-                </if>
-                <if test="createTime!=null and createTime!=''">
-                    and a.create_time=#{createTime}
-                </if>
-                <if test="updateBy!=null and updateBy!=''">
-                    and a.update_by=#{updateBy}
-                </if>
-                <if test="updateTime!=null and updateTime!=''">
-                    and a.update_time=#{updateTime}
-                </if>
+            <if test="deptId!=null and deptId!=''">
+                and a.dept_id=#{deptId}
+            </if>
+            <if test="deptName!=null and deptName!=''">
+                and a.dept_name=#{deptName}
+            </if>
+            <if test="lineId!=null and lineId!=''">
+                and a.line_id=#{lineId}
+            </if>
+            <if test="lineName!=null and lineName!=''">
+                and a.line_name=#{lineName}
+            </if>
+            <if test="stationId!=null and stationId!=''">
+                and a.station_id=#{stationId}
+            </if>
+            <if test="stationName!=null and stationName!=''">
+                and a.station_name=#{stationName}
+            </if>
+            <if test="xingbie!=null and xingbie!=''">
+                and a.xingbie=#{xingbie}
+            </if>
+            <if test="stationTrack!=null and stationTrack!=''">
+                and a.station_track=#{stationTrack}
+            </if>
+            <if test="gxms!=null and gxms!=''">
+                and a.gxms=#{gxms}
+            </if>
+            <if test="fjlx!=null and fjlx!=''">
+                and a.fjlx=#{fjlx}
+            </if>
+            <if test="mdh!=null and mdh!=''">
+                and a.mdh=#{mdh}
+            </if>
+            <if test="mdcd!=null and mdcd!=''">
+                and a.mdcd=#{mdcd}
+            </if>
+            <if test="tyrq!=null and tyrq!=''">
+                and a.tyrq=#{tyrq}
+            </if>
+            <if test="qsglb!=null and qsglb!=''">
+                and a.qsglb=#{qsglb}
+            </if>
+            <if test="jsglb!=null and jsglb!=''">
+                and a.jsglb=#{jsglb}
+            </if>
+            <if test="qsgh!=null and qsgh!=''">
+                and a.qsgh=#{qsgh}
+            </if>
+            <if test="jzgh!=null and jzgh!=''">
+                and a.jzgh=#{jzgh}
+            </if>
+            <if test="xscz!=null and xscz!=''">
+                and a.xscz=#{xscz}
+            </if>
+            <if test="xsxh!=null and xsxh!=''">
+                and a.xsxh=#{xsxh}
+            </if>
+            <if test="xszl!=null and xszl!=''">
+                and a.xszl=#{xszl}
+            </if>
+            <if test="xscj!=null and xscj!=''">
+                and a.xscj=#{xscj}
+            </if>
+            <if test="jtsl!=null and jtsl!=''">
+                and a.jtsl=#{jtsl}
+            </if>
+            <if test="bqsl!=null and bqsl!=''">
+                and a.bqsl=#{bqsl}
+            </if>
+            <if test="afx!=null and afx!=''">
+                and a.afx=#{afx}
+            </if>
+            <if test="blx!=null and blx!=''">
+                and a.blx=#{blx}
+            </if>
+            <if test="qt!=null and qt!=''">
+                and a.qt=#{qt}
+            </if>
+            <if test="fj!=null and fj!=''">
+                and a.fj=#{fj}
+            </if>
+            <if test="sl!=null and sl!=''">
+                and a.sl=#{sl}
+            </if>
+            <if test="dw!=null and dw!=''">
+                and a.dw=#{dw}
+            </if>
+            <if test="slbh!=null and slbh!=''">
+                and a.slbh=#{slbh}
+            </if>
+            <if test="delFlag!=null and delFlag!=''">
+                and a.del_flag=#{delFlag}
+            </if>
+            <if test="createBy!=null and createBy!=''">
+                and a.create_by=#{createBy}
+            </if>
+            <if test="createTime!=null and createTime!=''">
+                and a.create_time=#{createTime}
+            </if>
+            <if test="updateBy!=null and updateBy!=''">
+                and a.update_by=#{updateBy}
+            </if>
+            <if test="updateTime!=null and updateTime!=''">
+                and a.update_time=#{updateTime}
+            </if>
         </where>
+        order by a.dept_id, a.line_id, a.station_id
     </select>
 
     <select id="getListByZz" resultMap="BaseResultMap">
         SELECT D.* FROM
-           (
-               SELECT a.id,
-                      a.qsgh,
-                      a.qsglb,
-                      a.db,
-                      a.bm,
-                      a.xb,
-                      a.qj,
-                      a.hb,
-                      a.fjlx,
-                      dept.dept_name,
-                      l.line_name,
-                      s.station_name,
-                      dict1.dict_label AS xingbie_text,
-                      dict2.dict_label AS fjlx_text,
-                      ${query.zzfw}    AS zzfw
-               FROM bus_fjxgmd a
-                        LEFT JOIN sys_dept dept ON a.bm = dept.dept_id
-                        LEFT JOIN bus_line l ON a.xb = l.line_id
-                        LEFT JOIN bus_station s ON a.qj = s.station_id
-                        LEFT JOIN sys_dict_data dict1 ON (a.hb = dict1.dict_value AND dict1.dict_type = 'xingbie')
-                        LEFT JOIN sys_dict_data dict2 ON (a.fjlx = dict2.dict_value AND dict2.dict_type = 'fjlx')
-               WHERE a.del_flag = '0'
-                 AND dept.del_flag = '0'
-                 AND l.del_flag = '0'
-                 AND s.del_flag = '0'
-           ) D ,
-           (
-               SELECT zzdzxx.zzh
-               FROM bus_zzdzxx zzdzxx,
-                    (
-                         SELECT zz.id,
-                                zz.zzh,
-                                zz.glb
-                         FROM bus_zzdzxx zz
-                         WHERE 1 = 1
-                            <if test="query.qsgh != null and query.qsgh != ''">
-                                AND zz.zzh = #{query.qsgh}
-                            </if>
-                            <if test="query.qsglb != null and query.qsglb != ''">
-                                AND zz.qlb = #{query.qsglb}
-                            </if>
-                            <if test="query.bm != null and query.bm != ''">
-                                AND zz.bm = #{query.bm}
-                            </if>
-                            <if test="query.xb != null and query.xb != ''">
-                                AND zz.xb = #{query.xb}
-                            </if>
-                            <if test="query.qj != null and query.qj != ''">
-                                AND zz.qj = #{query.qj}
-                            </if>
-                            <if test="query.hb != null and query.hb != ''">
-                                AND zz.hb = #{query.hb}
-                            </if>
-                    ) B
-               WHERE (zzdzxx.glb + 0.0) BETWEEN (B.glb + 0.0) - (#{query.zzfw} + 0.0) AND (B.glb + 0.0) + (#{query.zzfw} + 0.0)
-           ) H
-        WHERE D.qsgh = H.zzh
+            (
+                SELECT a.id,
+                    a.qsgh,
+                    a.qsglb,
+                    a.dept_id,
+                    a.line_id,
+                    a.station_id,
+                    a.xingbie,
+                    a.fjlx,
+                    dept.dept_name,
+                    l.line_name,
+                    s.station_name,
+                    dict1.dict_label AS xingbie_text,
+                    dict2.dict_label AS fjlx_text,
+                    ${query.zzfw}    AS zzfw
+                FROM bus_fjxgmd a
+                LEFT JOIN sys_dept dept ON a.dept_id = dept.dept_id
+                LEFT JOIN bus_line l ON a.line_id = l.line_id
+                LEFT JOIN bus_station s ON a.station_id = s.station_id
+                LEFT JOIN sys_dict_data dict1 ON (a.xingbie = dict1.dict_value AND dict1.dict_type = 'xingbie')
+                LEFT JOIN sys_dict_data dict2 ON (a.fjlx = dict2.dict_value AND dict2.dict_type = 'fjlx')
+                WHERE a.del_flag = '0'
+                    AND dept.del_flag = '0'
+                    AND l.del_flag = '0'
+                    AND s.del_flag = '0'
+            ) D ,
+            (
+                SELECT zzdzxx.pillar_code
+                FROM bus_pillar zzdzxx,
+                (
+                    SELECT zz.id,
+                        zz.pillar_code,
+                        zz.marker
+                    FROM bus_pillar zz
+                    WHERE 1 = 1
+                    <if test="query.qsgh != null and query.qsgh != ''">
+                        AND zz.pillar_code = #{query.qsgh}
+                    </if>
+                    <if test="query.qsglb != null and query.qsglb != ''">
+                        AND zz.marker = #{query.qsglb}
+                    </if>
+                    <if test="query.deptId != null and query.deptId != ''">
+                        AND zz.dept_id = #{query.deptId}
+                    </if>
+                    <if test="query.lineId != null and query.lineId != ''">
+                        AND zz.line_id = #{query.lineId}
+                    </if>
+                    <if test="query.stationId != null and query.stationId != ''">
+                        AND zz.station_id = #{query.stationId}
+                    </if>
+                    <if test="query.xingbie != null and query.xingbie != ''">
+                        AND zz.xingbie = #{query.xingbie}
+                    </if>
+                ) B
+                WHERE (zzdzxx.marker + 0.0) BETWEEN (B.marker + 0.0) - (#{query.zzfw} + 0.0) AND (B.marker + 0.0) + (#{query.zzfw} + 0.0)
+            ) H
+        WHERE D.qsgh = H.pillar_code
         ORDER BY (D.qsgh + 0)
     </select>
 

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

@@ -4,37 +4,38 @@
 <mapper namespace="com.railway.business.baseinfo.mapper.BusGlkgMapper">
 
     <resultMap id="BaseResultMap" type="com.railway.business.baseinfo.domain.BusGlkg">
-                <result column="id" property="id"/>
-                <result column="db" property="db"/>
-                <result column="bm" property="bm"/>
-                <result column="xb" property="xb"/>
-                <result column="qj" property="qj"/>
-                <result column="hb" property="hb"/>
-                <result column="zzh" property="zzh"/>
-                <result column="glb" property="glb"/>
-                <result column="kgbh" property="kgbh"/>
-                <result column="sccj" property="sccj"/>
-                <result column="kgxh" property="kgxh"/>
-                <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"/>
-                <result column="dept_name" property="deptName"/>
-                <result column="line_name" property="lineName"/>
-                <result column="station_name" property="stationName"/>
-                <result column="xingbie_text" property="xingbieText"/>
+        <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="xingbie" property="xingbie"/>
+        <result column="pillar_code" property="pillarCode"/>
+        <result column="station_track" property="stationTrack"/>
+        <result column="kgbh" property="kgbh"/>
+        <result column="sccj" property="sccj"/>
+        <result column="kgxh" property="kgxh"/>
+        <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"/>
+        <result column="xingbie_text" property="xingbieText"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-                id,
-                db,
-                bm,
-                xb,
-                qj,
-                hb,
-                zzh,
-                glb,
+        id,
+                dept_id,
+                dept_name,
+                line_id,
+                line_name,
+                station_id,
+                station_name,
+                xingbie,
+                pillar_code,
+                station_track,
                 kgbh,
                 sccj,
                 kgxh,
@@ -51,98 +52,110 @@
         </selectKey>
         INSERT INTO bus_glkg
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                    <if test ='null != db'>
-                    db,
-                    </if>
-                    <if test ='null != bm'>
-                    bm,
-                    </if>
-                    <if test ='null != xb'>
-                    xb,
-                    </if>
-                    <if test ='null != qj'>
-                    qj,
-                    </if>
-                    <if test ='null != hb'>
-                    hb,
-                    </if>
-                    <if test ='null != zzh'>
-                    zzh,
-                    </if>
-                    <if test ='null != glb'>
-                    glb,
-                    </if>
-                    <if test ='null != kgbh'>
-                    kgbh,
-                    </if>
-                    <if test ='null != sccj'>
-                    sccj,
-                    </if>
-                    <if test ='null != kgxh'>
-                    kgxh,
-                    </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 != 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 != stationId'>
+                station_id,
+            </if>
+            <if test ='null != stationName'>
+                station_name,
+            </if>
+            <if test ='null != xingbie'>
+                xingbie,
+            </if>
+            <if test ='null != pillarCode'>
+                pillar_code,
+            </if>
+            <if test ='null != stationTrack'>
+                station_track,
+            </if>
+            <if test ='null != kgbh'>
+                kgbh,
+            </if>
+            <if test ='null != sccj'>
+                sccj,
+            </if>
+            <if test ='null != kgxh'>
+                kgxh,
+            </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>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                    <if test ='null != db'>
-                    #{db},
-                    </if>
-                    <if test ='null != bm'>
-                    #{bm},
-                    </if>
-                    <if test ='null != xb'>
-                    #{xb},
-                    </if>
-                    <if test ='null != qj'>
-                    #{qj},
-                    </if>
-                    <if test ='null != hb'>
-                    #{hb},
-                    </if>
-                    <if test ='null != zzh'>
-                    #{zzh},
-                    </if>
-                    <if test ='null != glb'>
-                    #{glb},
-                    </if>
-                    <if test ='null != kgbh'>
-                    #{kgbh},
-                    </if>
-                    <if test ='null != sccj'>
-                    #{sccj},
-                    </if>
-                    <if test ='null != kgxh'>
-                    #{kgxh},
-                    </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 != deptId'>
+                #{deptId},
+            </if>
+            <if test ='null != deptName'>
+                #{deptName},
+            </if>
+            <if test ='null != lineId'>
+                #{lineId},
+            </if>
+            <if test ='null != lineName'>
+                #{lineName},
+            </if>
+            <if test ='null != stationId'>
+                #{stationId},
+            </if>
+            <if test ='null != stationName'>
+                #{stationName},
+            </if>
+            <if test ='null != xingbie'>
+                #{xingbie},
+            </if>
+            <if test ='null != pillarCode'>
+                #{pillarCode},
+            </if>
+            <if test ='null != stationTrack'>
+                #{stationTrack},
+            </if>
+            <if test ='null != kgbh'>
+                #{kgbh},
+            </if>
+            <if test ='null != sccj'>
+                #{sccj},
+            </if>
+            <if test ='null != kgxh'>
+                #{kgxh},
+            </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>
         </trim>
     </insert>
 
@@ -155,21 +168,23 @@
     <update id="update" parameterType="com.railway.business.baseinfo.domain.BusGlkg">
         UPDATE bus_glkg
         <set>
-                    <if test ='null != db'>db = #{db},</if>
-                    <if test ='null != bm'>bm = #{bm},</if>
-                    <if test ='null != xb'>xb = #{xb},</if>
-                    <if test ='null != qj'>qj = #{qj},</if>
-                    <if test ='null != hb'>hb = #{hb},</if>
-                    <if test ='null != zzh'>zzh = #{zzh},</if>
-                    <if test ='null != glb'>glb = #{glb},</if>
-                    <if test ='null != kgbh'>kgbh = #{kgbh},</if>
-                    <if test ='null != sccj'>sccj = #{sccj},</if>
-                    <if test ='null != kgxh'>kgxh = #{kgxh},</if>
-                    <if test ='null != delFlag'>del_flag = #{delFlag},</if>
-                    <if test ='null != createBy'>create_by = #{createBy},</if>
-                    <if test ='null != createTime'>create_time = #{createTime},</if>
-                    <if test ='null != updateBy'>update_by = #{updateBy},</if>
-                    <if test ='null != updateTime'>update_time = #{updateTime}</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 != stationId'>station_id = #{stationId},</if>
+            <if test ='null != stationName'>station_name = #{stationName},</if>
+            <if test ='null != xingbie'>xingbie = #{xingbie},</if>
+            <if test ='null != pillarCode'>pillar_code = #{pillarCode},</if>
+            <if test ='null != stationTrack'>station_track = #{stationTrack},</if>
+            <if test ='null != kgbh'>kgbh = #{kgbh},</if>
+            <if test ='null != sccj'>sccj = #{sccj},</if>
+            <if test ='null != kgxh'>kgxh = #{kgxh},</if>
+            <if test ='null != delFlag'>del_flag = #{delFlag},</if>
+            <if test ='null != createBy'>create_by = #{createBy},</if>
+            <if test ='null != createTime'>create_time = #{createTime},</if>
+            <if test ='null != updateBy'>update_by = #{updateBy},</if>
+            <if test ='null != updateTime'>update_time = #{updateTime}</if>
         </set>
         WHERE id = #{id}
     </update>
@@ -177,6 +192,7 @@
 
     <select id="getInfo" resultMap="BaseResultMap">
         SELECT
+            distinct
             dept.dept_name,
             l.line_name,
             s.station_name,
@@ -184,84 +200,91 @@
             a.*
         FROM
             bus_glkg a
-        LEFT JOIN sys_dept dept ON a.bm = dept.dept_id
-        LEFT JOIN bus_line l ON a.xb = l.line_id
-        LEFT JOIN bus_station s ON a.qj = s.station_id
-        LEFT JOIN sys_dict_data dict ON a.hb = dict.dict_value
+                LEFT JOIN sys_dept dept ON a.dept_id = dept.dept_id
+                LEFT JOIN bus_line l ON a.line_id = l.line_id
+                LEFT JOIN bus_station s ON a.station_id = s.station_id
+                LEFT JOIN sys_dict_data dict ON a.xingbie = dict.dict_value
         WHERE
             a.del_flag = '0'
-            AND dept.del_flag = '0'
-            AND l.del_flag = '0'
-            AND s.del_flag = '0'
-            AND dict.dict_type = 'xingbie'
-            AND a.id = #{id}
+          AND dept.del_flag = '0'
+          AND l.del_flag = '0'
+          AND s.del_flag = '0'
+          AND dict.dict_type = 'xingbie'
+          AND a.id = #{id}
     </select>
 
     <select id="getList" resultMap="BaseResultMap">
         SELECT
-            dept.dept_name,
-            l.line_name,
-            s.station_name,
-            dict.dict_label as xingbie_text,
-            a.*
+        dept.dept_name,
+        l.line_name,
+        s.station_name,
+        dict.dict_label as xingbie_text,
+        a.*
         FROM
-            bus_glkg a
-        LEFT JOIN sys_dept dept ON a.bm = dept.dept_id
-        LEFT JOIN bus_line l ON a.xb = l.line_id
-        LEFT JOIN bus_station s ON a.qj = s.station_id
-        LEFT JOIN sys_dict_data dict ON a.hb = dict.dict_value
+        bus_glkg a
+        LEFT JOIN sys_dept dept ON a.dept_id = dept.dept_id
+        LEFT JOIN bus_line l ON a.line_id = l.line_id
+        LEFT JOIN bus_station s ON a.station_id = s.station_id
+        LEFT JOIN sys_dict_data dict ON a.xingbie = dict.dict_value
         <where>
             a.del_flag = '0'
             AND dept.del_flag = '0'
             AND l.del_flag = '0'
             AND s.del_flag = '0'
             AND dict.dict_type = 'xingbie'
-                <if test="db!=null and db!=''">
-                    and a.db=#{db}
-                </if>
-                <if test="bm!=null and bm!=''">
-                    and a.bm=#{bm}
-                </if>
-                <if test="xb!=null and xb!=''">
-                    and a.xb=#{xb}
-                </if>
-                <if test="qj!=null and qj!=''">
-                    and a.qj=#{qj}
-                </if>
-                <if test="hb!=null and hb!=''">
-                    and a.hb=#{hb}
-                </if>
-                <if test="zzh!=null and zzh!=''">
-                    and a.zzh=#{zzh}
-                </if>
-                <if test="glb!=null and glb!=''">
-                    and a.glb=#{glb}
-                </if>
-                <if test="kgbh!=null and kgbh!=''">
-                    and a.kgbh=#{kgbh}
-                </if>
-                <if test="sccj!=null and sccj!=''">
-                    and a.sccj=#{sccj}
-                </if>
-                <if test="kgxh!=null and kgxh!=''">
-                    and a.kgxh=#{kgxh}
-                </if>
-                <if test="delFlag!=null and delFlag!=''">
-                    and a.del_flag=#{delFlag}
-                </if>
-                <if test="createBy!=null and createBy!=''">
-                    and a.create_by=#{createBy}
-                </if>
-                <if test="createTime!=null and createTime!=''">
-                    and a.create_time=#{createTime}
-                </if>
-                <if test="updateBy!=null and updateBy!=''">
-                    and a.update_by=#{updateBy}
-                </if>
-                <if test="updateTime!=null and updateTime!=''">
-                    and a.update_time=#{updateTime}
-                </if>
+            <if test="deptId!=null and deptId!=''">
+                and a.dept_id=#{deptId}
+            </if>
+            <if test="deptName!=null and deptName!=''">
+                and a.dept_name=#{deptName}
+            </if>
+            <if test="lineId!=null and lineId!=''">
+                and a.line_id=#{lineId}
+            </if>
+            <if test="lineName!=null and lineName!=''">
+                and a.line_name=#{lineName}
+            </if>
+            <if test="stationId!=null and stationId!=''">
+                and a.station_id=#{stationId}
+            </if>
+            <if test="stationName!=null and stationName!=''">
+                and a.station_name=#{stationName}
+            </if>
+            <if test="xingbie!=null and xingbie!=''">
+                and a.xingbie=#{xingbie}
+            </if>
+            <if test="pillarCode!=null and pillarCode!=''">
+                and a.pillar_code=#{pillarCode}
+            </if>
+            <if test="stationTrack!=null and stationTrack!=''">
+                and a.station_track=#{stationTrack}
+            </if>
+            <if test="kgbh!=null and kgbh!=''">
+                and a.kgbh=#{kgbh}
+            </if>
+            <if test="sccj!=null and sccj!=''">
+                and a.sccj=#{sccj}
+            </if>
+            <if test="kgxh!=null and kgxh!=''">
+                and a.kgxh=#{kgxh}
+            </if>
+            <if test="delFlag!=null and delFlag!=''">
+                and a.del_flag=#{delFlag}
+            </if>
+            <if test="createBy!=null and createBy!=''">
+                and a.create_by=#{createBy}
+            </if>
+            <if test="createTime!=null and createTime!=''">
+                and a.create_time=#{createTime}
+            </if>
+            <if test="updateBy!=null and updateBy!=''">
+                and a.update_by=#{updateBy}
+            </if>
+            <if test="updateTime!=null and updateTime!=''">
+                and a.update_time=#{updateTime}
+            </if>
         </where>
+        order by a.create_time desc
     </select>
 
 </mapper>

railway-business/src/main/resources/mapper/catenary/BusJcebLbjghjlMapper.xml

@@ -4,31 +4,32 @@
 <mapper namespace="com.railway.business.catenary.mapper.BusJcebLbjghjlMapper">
 
     <resultMap id="BaseResultMap" type="com.railway.business.catenary.domain.BusJcebLbjghjl">
-                <result column="id" property="id"/>
-                <result column="qj" property="qj"/>
-                <result column="dd" property="dd"/>
-                <result column="ghq_mc" property="ghqMc"/>
-                <result column="ghq_ggxh" property="ghqGgxh"/>
-                <result column="ghq_sccj" property="ghqSccj"/>
-                <result column="ghh_mc" property="ghhMc"/>
-                <result column="ghh_ggxh" property="ghhGgxh"/>
-                <result column="ghh_sccj" property="ghhSccj"/>
-                <result column="ghyy" property="ghyy"/>
-                <result column="ghsj" property="ghsj"/>
-                <result column="czr" property="czr"/>
-                <result column="remark" property="remark"/>
-                <result column="submit_state" property="submitState"/>
-                <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"/>
-                <result column="station_name" property="stationName"/>
+        <result column="id" property="id"/>
+        <result column="station_id" property="stationId"/>
+        <result column="station_name" property="stationName"/>
+        <result column="dd" property="dd"/>
+        <result column="ghq_mc" property="ghqMc"/>
+        <result column="ghq_ggxh" property="ghqGgxh"/>
+        <result column="ghq_sccj" property="ghqSccj"/>
+        <result column="ghh_mc" property="ghhMc"/>
+        <result column="ghh_ggxh" property="ghhGgxh"/>
+        <result column="ghh_sccj" property="ghhSccj"/>
+        <result column="ghyy" property="ghyy"/>
+        <result column="ghsj" property="ghsj"/>
+        <result column="czr" property="czr"/>
+        <result column="remark" property="remark"/>
+        <result column="submit_state" property="submitState"/>
+        <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">
-                id,
-                qj,
+        id,
+                station_id,
+                station_name,
                 dd,
                 ghq_mc,
                 ghq_ggxh,
@@ -54,116 +55,122 @@
         </selectKey>
         INSERT INTO bus_jceb_lbjghjl
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                    <if test ='null != qj'>
-                    qj,
-                    </if>
-                    <if test ='null != dd'>
-                    dd,
-                    </if>
-                    <if test ='null != ghqMc'>
-                    ghq_mc,
-                    </if>
-                    <if test ='null != ghqGgxh'>
-                    ghq_ggxh,
-                    </if>
-                    <if test ='null != ghqSccj'>
-                    ghq_sccj,
-                    </if>
-                    <if test ='null != ghhMc'>
-                    ghh_mc,
-                    </if>
-                    <if test ='null != ghhGgxh'>
-                    ghh_ggxh,
-                    </if>
-                    <if test ='null != ghhSccj'>
-                    ghh_sccj,
-                    </if>
-                    <if test ='null != ghyy'>
-                    ghyy,
-                    </if>
-                    <if test ='null != ghsj'>
-                    ghsj,
-                    </if>
-                    <if test ='null != czr'>
-                    czr,
-                    </if>
-                    <if test ='null != remark'>
-                    remark,
-                    </if>
-                    <if test ='null != submitState'>
-                    submit_state,
-                    </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 != stationId'>
+                station_id,
+            </if>
+            <if test ='null != stationName'>
+                station_name,
+            </if>
+            <if test ='null != dd'>
+                dd,
+            </if>
+            <if test ='null != ghqMc'>
+                ghq_mc,
+            </if>
+            <if test ='null != ghqGgxh'>
+                ghq_ggxh,
+            </if>
+            <if test ='null != ghqSccj'>
+                ghq_sccj,
+            </if>
+            <if test ='null != ghhMc'>
+                ghh_mc,
+            </if>
+            <if test ='null != ghhGgxh'>
+                ghh_ggxh,
+            </if>
+            <if test ='null != ghhSccj'>
+                ghh_sccj,
+            </if>
+            <if test ='null != ghyy'>
+                ghyy,
+            </if>
+            <if test ='null != ghsj'>
+                ghsj,
+            </if>
+            <if test ='null != czr'>
+                czr,
+            </if>
+            <if test ='null != remark'>
+                remark,
+            </if>
+            <if test ='null != submitState'>
+                submit_state,
+            </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>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                    <if test ='null != qj'>
-                    #{qj},
-                    </if>
-                    <if test ='null != dd'>
-                    #{dd},
-                    </if>
-                    <if test ='null != ghqMc'>
-                    #{ghqMc},
-                    </if>
-                    <if test ='null != ghqGgxh'>
-                    #{ghqGgxh},
-                    </if>
-                    <if test ='null != ghqSccj'>
-                    #{ghqSccj},
-                    </if>
-                    <if test ='null != ghhMc'>
-                    #{ghhMc},
-                    </if>
-                    <if test ='null != ghhGgxh'>
-                    #{ghhGgxh},
-                    </if>
-                    <if test ='null != ghhSccj'>
-                    #{ghhSccj},
-                    </if>
-                    <if test ='null != ghyy'>
-                    #{ghyy},
-                    </if>
-                    <if test ='null != ghsj'>
-                    #{ghsj},
-                    </if>
-                    <if test ='null != czr'>
-                    #{czr},
-                    </if>
-                    <if test ='null != remark'>
-                    #{remark},
-                    </if>
-                    <if test ='null != submitState'>
-                    #{submitState},
-                    </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 != stationId'>
+                #{stationId},
+            </if>
+            <if test ='null != stationName'>
+                #{stationName},
+            </if>
+            <if test ='null != dd'>
+                #{dd},
+            </if>
+            <if test ='null != ghqMc'>
+                #{ghqMc},
+            </if>
+            <if test ='null != ghqGgxh'>
+                #{ghqGgxh},
+            </if>
+            <if test ='null != ghqSccj'>
+                #{ghqSccj},
+            </if>
+            <if test ='null != ghhMc'>
+                #{ghhMc},
+            </if>
+            <if test ='null != ghhGgxh'>
+                #{ghhGgxh},
+            </if>
+            <if test ='null != ghhSccj'>
+                #{ghhSccj},
+            </if>
+            <if test ='null != ghyy'>
+                #{ghyy},
+            </if>
+            <if test ='null != ghsj'>
+                #{ghsj},
+            </if>
+            <if test ='null != czr'>
+                #{czr},
+            </if>
+            <if test ='null != remark'>
+                #{remark},
+            </if>
+            <if test ='null != submitState'>
+                #{submitState},
+            </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>
         </trim>
     </insert>
 
@@ -176,24 +183,25 @@
     <update id="update" parameterType="com.railway.business.catenary.domain.BusJcebLbjghjl">
         UPDATE bus_jceb_lbjghjl
         <set>
-                    <if test ='null != qj'>qj = #{qj},</if>
-                    <if test ='null != dd'>dd = #{dd},</if>
-                    <if test ='null != ghqMc'>ghq_mc = #{ghqMc},</if>
-                    <if test ='null != ghqGgxh'>ghq_ggxh = #{ghqGgxh},</if>
-                    <if test ='null != ghqSccj'>ghq_sccj = #{ghqSccj},</if>
-                    <if test ='null != ghhMc'>ghh_mc = #{ghhMc},</if>
-                    <if test ='null != ghhGgxh'>ghh_ggxh = #{ghhGgxh},</if>
-                    <if test ='null != ghhSccj'>ghh_sccj = #{ghhSccj},</if>
-                    <if test ='null != ghyy'>ghyy = #{ghyy},</if>
-                    <if test ='null != ghsj'>ghsj = #{ghsj},</if>
-                    <if test ='null != czr'>czr = #{czr},</if>
-                    <if test ='null != remark'>remark = #{remark},</if>
-                    <if test ='null != submitState'>submit_state = #{submitState},</if>
-                    <if test ='null != delFlag'>del_flag = #{delFlag},</if>
-                    <if test ='null != createBy'>create_by = #{createBy},</if>
-                    <if test ='null != createTime'>create_time = #{createTime},</if>
-                    <if test ='null != updateBy'>update_by = #{updateBy},</if>
-                    <if test ='null != updateTime'>update_time = #{updateTime}</if>
+            <if test ='null != stationId'>station_id = #{stationId},</if>
+            <if test ='null != stationName'>station_name = #{stationName},</if>
+            <if test ='null != dd'>dd = #{dd},</if>
+            <if test ='null != ghqMc'>ghq_mc = #{ghqMc},</if>
+            <if test ='null != ghqGgxh'>ghq_ggxh = #{ghqGgxh},</if>
+            <if test ='null != ghqSccj'>ghq_sccj = #{ghqSccj},</if>
+            <if test ='null != ghhMc'>ghh_mc = #{ghhMc},</if>
+            <if test ='null != ghhGgxh'>ghh_ggxh = #{ghhGgxh},</if>
+            <if test ='null != ghhSccj'>ghh_sccj = #{ghhSccj},</if>
+            <if test ='null != ghyy'>ghyy = #{ghyy},</if>
+            <if test ='null != ghsj'>ghsj = #{ghsj},</if>
+            <if test ='null != czr'>czr = #{czr},</if>
+            <if test ='null != remark'>remark = #{remark},</if>
+            <if test ='null != submitState'>submit_state = #{submitState},</if>
+            <if test ='null != delFlag'>del_flag = #{delFlag},</if>
+            <if test ='null != createBy'>create_by = #{createBy},</if>
+            <if test ='null != createTime'>create_time = #{createTime},</if>
+            <if test ='null != updateBy'>update_by = #{updateBy},</if>
+            <if test ='null != updateTime'>update_time = #{updateTime}</if>
         </set>
         WHERE id = #{id}
     </update>
@@ -204,11 +212,11 @@
             s.station_name,
             a.*
         FROM bus_jceb_lbjghjl a
-        LEFT JOIN bus_station s ON a.qj = s.station_id
+                 LEFT JOIN bus_station s ON a.station_id = s.station_id
         WHERE
             a.del_flag = '0'
-            AND s.del_flag = '0'
-            AND a.id = #{id}
+          AND s.del_flag = '0'
+          AND a.id = #{id}
     </select>
 
     <select id="getList" resultMap="BaseResultMap">
@@ -216,65 +224,69 @@
             s.station_name,
             a.*
         FROM bus_jceb_lbjghjl a
-        LEFT JOIN bus_station s ON a.qj = s.station_id
+        LEFT JOIN bus_station s ON a.station_id = s.station_id
         <where>
             a.del_flag = '0'
             AND s.del_flag = '0'
-                <if test="qj!=null and qj!=''">
-                    and a.qj=#{qj}
-                </if>
-                <if test="dd!=null and dd!=''">
-                    and a.dd=#{dd}
-                </if>
-                <if test="ghqMc!=null and ghqMc!=''">
-                    and a.ghq_mc=#{ghqMc}
-                </if>
-                <if test="ghqGgxh!=null and ghqGgxh!=''">
-                    and a.ghq_ggxh=#{ghqGgxh}
-                </if>
-                <if test="ghqSccj!=null and ghqSccj!=''">
-                    and a.ghq_sccj=#{ghqSccj}
-                </if>
-                <if test="ghhMc!=null and ghhMc!=''">
-                    and a.ghh_mc=#{ghhMc}
-                </if>
-                <if test="ghhGgxh!=null and ghhGgxh!=''">
-                    and a.ghh_ggxh=#{ghhGgxh}
-                </if>
-                <if test="ghhSccj!=null and ghhSccj!=''">
-                    and a.ghh_sccj=#{ghhSccj}
-                </if>
-                <if test="ghyy!=null and ghyy!=''">
-                    and a.ghyy=#{ghyy}
-                </if>
-                <if test="ghsj!=null and ghsj!=''">
-                    and a.ghsj=#{ghsj}
-                </if>
-                <if test="czr!=null and czr!=''">
-                    and a.czr=#{czr}
-                </if>
-                <if test="remark!=null and remark!=''">
-                    and a.remark=#{remark}
-                </if>
-                <if test="submitState!=null and submitState!=''">
-                    and a.submit_state=#{submitState}
-                </if>
-                <if test="delFlag!=null and delFlag!=''">
-                    and a.del_flag=#{delFlag}
-                </if>
-                <if test="createBy!=null and createBy!=''">
-                    and a.create_by=#{createBy}
-                </if>
-                <if test="createTime!=null and createTime!=''">
-                    and a.create_time=#{createTime}
-                </if>
-                <if test="updateBy!=null and updateBy!=''">
-                    and a.update_by=#{updateBy}
-                </if>
-                <if test="updateTime!=null and updateTime!=''">
-                    and a.update_time=#{updateTime}
-                </if>
+            <if test="stationId!=null and stationId!=''">
+                and a.station_id=#{stationId}
+            </if>
+            <if test="stationName!=null and stationName!=''">
+                and a.station_name=#{stationName}
+            </if>
+            <if test="dd!=null and dd!=''">
+                and a.dd=#{dd}
+            </if>
+            <if test="ghqMc!=null and ghqMc!=''">
+                and a.ghq_mc=#{ghqMc}
+            </if>
+            <if test="ghqGgxh!=null and ghqGgxh!=''">
+                and a.ghq_ggxh=#{ghqGgxh}
+            </if>
+            <if test="ghqSccj!=null and ghqSccj!=''">
+                and a.ghq_sccj=#{ghqSccj}
+            </if>
+            <if test="ghhMc!=null and ghhMc!=''">
+                and a.ghh_mc=#{ghhMc}
+            </if>
+            <if test="ghhGgxh!=null and ghhGgxh!=''">
+                and a.ghh_ggxh=#{ghhGgxh}
+            </if>
+            <if test="ghhSccj!=null and ghhSccj!=''">
+                and a.ghh_sccj=#{ghhSccj}
+            </if>
+            <if test="ghyy!=null and ghyy!=''">
+                and a.ghyy=#{ghyy}
+            </if>
+            <if test="ghsj!=null and ghsj!=''">
+                and a.ghsj=#{ghsj}
+            </if>
+            <if test="czr!=null and czr!=''">
+                and a.czr=#{czr}
+            </if>
+            <if test="remark!=null and remark!=''">
+                and a.remark=#{remark}
+            </if>
+            <if test="submitState!=null and submitState!=''">
+                and a.submit_state=#{submitState}
+            </if>
+            <if test="delFlag!=null and delFlag!=''">
+                and a.del_flag=#{delFlag}
+            </if>
+            <if test="createBy!=null and createBy!=''">
+                and a.create_by=#{createBy}
+            </if>
+            <if test="createTime!=null and createTime!=''">
+                and a.create_time=#{createTime}
+            </if>
+            <if test="updateBy!=null and updateBy!=''">
+                and a.update_by=#{updateBy}
+            </if>
+            <if test="updateTime!=null and updateTime!=''">
+                and a.update_time=#{updateTime}
+            </if>
         </where>
+        order by str_to_date(a.ghsj,'%Y-%m-%d') desc
     </select>
 
 </mapper>

railway-business/src/main/resources/mapper/catenary/BusJcebQmjcjlMapper.xml

@@ -4,36 +4,37 @@
 <mapper namespace="com.railway.business.catenary.mapper.BusJcebQmjcjlMapper">
 
     <resultMap id="BaseResultMap" type="com.railway.business.catenary.domain.BusJcebQmjcjl">
-                <result column="id" property="id"/>
-                <result column="qj" property="qj"/>
-                <result column="zzh" property="zzh"/>
-                <result column="qxly" property="qxly"/>
-                <result column="wz" property="wz"/>
-                <result column="qxnr" property="qxnr"/>
-                <result column="qxdj" property="qxdj"/>
-                <result column="clcs" property="clcs"/>
-                <result column="xhzt" property="xhzt"/>
-                <result column="whby" property="whby"/>
-                <result column="jyqs" property="jyqs"/>
-                <result column="sbzt" property="sbzt"/>
-                <result column="czr" property="czr"/>
-                <result column="gzldr" property="gzldr"/>
-                <result column="ysr" property="ysr"/>
-                <result column="rq" property="rq"/>
-                <result column="remark" property="remark"/>
-                <result column="submit_state" property="submitState"/>
-                <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"/>
-                <result column="station_name" property="stationName"/>
+        <result column="id" property="id"/>
+        <result column="station_id" property="stationId"/>
+        <result column="station_name" property="stationName"/>
+        <result column="pillar_code" property="pillarCode"/>
+        <result column="qxly" property="qxly"/>
+        <result column="wz" property="wz"/>
+        <result column="qxnr" property="qxnr"/>
+        <result column="qxdj" property="qxdj"/>
+        <result column="clcs" property="clcs"/>
+        <result column="xhzt" property="xhzt"/>
+        <result column="whby" property="whby"/>
+        <result column="jyqs" property="jyqs"/>
+        <result column="sbzt" property="sbzt"/>
+        <result column="czr" property="czr"/>
+        <result column="gzldr" property="gzldr"/>
+        <result column="ysr" property="ysr"/>
+        <result column="rq" property="rq"/>
+        <result column="remark" property="remark"/>
+        <result column="submit_state" property="submitState"/>
+        <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">
-                id,
-                qj,
-                zzh,
+        id,
+                station_id,
+                station_name,
+                pillar_code,
                 qxly,
                 wz,
                 qxnr,
@@ -62,140 +63,146 @@
         </selectKey>
         INSERT INTO bus_jceb_qmjcjl
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                    <if test ='null != qj'>
-                    qj,
-                    </if>
-                    <if test ='null != zzh'>
-                    zzh,
-                    </if>
-                    <if test ='null != qxly'>
-                    qxly,
-                    </if>
-                    <if test ='null != wz'>
-                    wz,
-                    </if>
-                    <if test ='null != qxnr'>
-                    qxnr,
-                    </if>
-                    <if test ='null != qxdj'>
-                    qxdj,
-                    </if>
-                    <if test ='null != clcs'>
-                    clcs,
-                    </if>
-                    <if test ='null != xhzt'>
-                    xhzt,
-                    </if>
-                    <if test ='null != whby'>
-                    whby,
-                    </if>
-                    <if test ='null != jyqs'>
-                    jyqs,
-                    </if>
-                    <if test ='null != sbzt'>
-                    sbzt,
-                    </if>
-                    <if test ='null != czr'>
-                    czr,
-                    </if>
-                    <if test ='null != gzldr'>
-                    gzldr,
-                    </if>
-                    <if test ='null != ysr'>
-                    ysr,
-                    </if>
-                    <if test ='null != rq'>
-                    rq,
-                    </if>
-                    <if test ='null != remark'>
-                    remark,
-                    </if>
-                    <if test ='null != submitState'>
-                    submit_state,
-                    </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 != stationId'>
+                station_id,
+            </if>
+            <if test ='null != stationName'>
+                station_name,
+            </if>
+            <if test ='null != pillarCode'>
+                pillar_code,
+            </if>
+            <if test ='null != qxly'>
+                qxly,
+            </if>
+            <if test ='null != wz'>
+                wz,
+            </if>
+            <if test ='null != qxnr'>
+                qxnr,
+            </if>
+            <if test ='null != qxdj'>
+                qxdj,
+            </if>
+            <if test ='null != clcs'>
+                clcs,
+            </if>
+            <if test ='null != xhzt'>
+                xhzt,
+            </if>
+            <if test ='null != whby'>
+                whby,
+            </if>
+            <if test ='null != jyqs'>
+                jyqs,
+            </if>
+            <if test ='null != sbzt'>
+                sbzt,
+            </if>
+            <if test ='null != czr'>
+                czr,
+            </if>
+            <if test ='null != gzldr'>
+                gzldr,
+            </if>
+            <if test ='null != ysr'>
+                ysr,
+            </if>
+            <if test ='null != rq'>
+                rq,
+            </if>
+            <if test ='null != remark'>
+                remark,
+            </if>
+            <if test ='null != submitState'>
+                submit_state,
+            </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>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                    <if test ='null != qj'>
-                    #{qj},
-                    </if>
-                    <if test ='null != zzh'>
-                    #{zzh},
-                    </if>
-                    <if test ='null != qxly'>
-                    #{qxly},
-                    </if>
-                    <if test ='null != wz'>
-                    #{wz},
-                    </if>
-                    <if test ='null != qxnr'>
-                    #{qxnr},
-                    </if>
-                    <if test ='null != qxdj'>
-                    #{qxdj},
-                    </if>
-                    <if test ='null != clcs'>
-                    #{clcs},
-                    </if>
-                    <if test ='null != xhzt'>
-                    #{xhzt},
-                    </if>
-                    <if test ='null != whby'>
-                    #{whby},
-                    </if>
-                    <if test ='null != jyqs'>
-                    #{jyqs},
-                    </if>
-                    <if test ='null != sbzt'>
-                    #{sbzt},
-                    </if>
-                    <if test ='null != czr'>
-                    #{czr},
-                    </if>
-                    <if test ='null != gzldr'>
-                    #{gzldr},
-                    </if>
-                    <if test ='null != ysr'>
-                    #{ysr},
-                    </if>
-                    <if test ='null != rq'>
-                    #{rq},
-                    </if>
-                    <if test ='null != remark'>
-                    #{remark},
-                    </if>
-                    <if test ='null != submitState'>
-                    #{submitState},
-                    </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 != stationId'>
+                #{stationId},
+            </if>
+            <if test ='null != stationName'>
+                #{stationName},
+            </if>
+            <if test ='null != pillarCode'>
+                #{pillarCode},
+            </if>
+            <if test ='null != qxly'>
+                #{qxly},
+            </if>
+            <if test ='null != wz'>
+                #{wz},
+            </if>
+            <if test ='null != qxnr'>
+                #{qxnr},
+            </if>
+            <if test ='null != qxdj'>
+                #{qxdj},
+            </if>
+            <if test ='null != clcs'>
+                #{clcs},
+            </if>
+            <if test ='null != xhzt'>
+                #{xhzt},
+            </if>
+            <if test ='null != whby'>
+                #{whby},
+            </if>
+            <if test ='null != jyqs'>
+                #{jyqs},
+            </if>
+            <if test ='null != sbzt'>
+                #{sbzt},
+            </if>
+            <if test ='null != czr'>
+                #{czr},
+            </if>
+            <if test ='null != gzldr'>
+                #{gzldr},
+            </if>
+            <if test ='null != ysr'>
+                #{ysr},
+            </if>
+            <if test ='null != rq'>
+                #{rq},
+            </if>
+            <if test ='null != remark'>
+                #{remark},
+            </if>
+            <if test ='null != submitState'>
+                #{submitState},
+            </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>
         </trim>
     </insert>
 
@@ -208,28 +215,29 @@
     <update id="update" parameterType="com.railway.business.catenary.domain.BusJcebQmjcjl">
         UPDATE bus_jceb_qmjcjl
         <set>
-                    <if test ='null != qj'>qj = #{qj},</if>
-                    <if test ='null != zzh'>zzh = #{zzh},</if>
-                    <if test ='null != qxly'>qxly = #{qxly},</if>
-                    <if test ='null != wz'>wz = #{wz},</if>
-                    <if test ='null != qxnr'>qxnr = #{qxnr},</if>
-                    <if test ='null != qxdj'>qxdj = #{qxdj},</if>
-                    <if test ='null != clcs'>clcs = #{clcs},</if>
-                    <if test ='null != xhzt'>xhzt = #{xhzt},</if>
-                    <if test ='null != whby'>whby = #{whby},</if>
-                    <if test ='null != jyqs'>jyqs = #{jyqs},</if>
-                    <if test ='null != sbzt'>sbzt = #{sbzt},</if>
-                    <if test ='null != czr'>czr = #{czr},</if>
-                    <if test ='null != gzldr'>gzldr = #{gzldr},</if>
-                    <if test ='null != ysr'>ysr = #{ysr},</if>
-                    <if test ='null != rq'>rq = #{rq},</if>
-                    <if test ='null != remark'>remark = #{remark},</if>
-                    <if test ='null != submitState'>submit_state = #{submitState},</if>
-                    <if test ='null != delFlag'>del_flag = #{delFlag},</if>
-                    <if test ='null != createBy'>create_by = #{createBy},</if>
-                    <if test ='null != createTime'>create_time = #{createTime},</if>
-                    <if test ='null != updateBy'>update_by = #{updateBy},</if>
-                    <if test ='null != updateTime'>update_time = #{updateTime}</if>
+            <if test ='null != stationId'>station_id = #{stationId},</if>
+            <if test ='null != stationName'>station_name = #{stationName},</if>
+            <if test ='null != pillarCode'>pillar_code = #{pillarCode},</if>
+            <if test ='null != qxly'>qxly = #{qxly},</if>
+            <if test ='null != wz'>wz = #{wz},</if>
+            <if test ='null != qxnr'>qxnr = #{qxnr},</if>
+            <if test ='null != qxdj'>qxdj = #{qxdj},</if>
+            <if test ='null != clcs'>clcs = #{clcs},</if>
+            <if test ='null != xhzt'>xhzt = #{xhzt},</if>
+            <if test ='null != whby'>whby = #{whby},</if>
+            <if test ='null != jyqs'>jyqs = #{jyqs},</if>
+            <if test ='null != sbzt'>sbzt = #{sbzt},</if>
+            <if test ='null != czr'>czr = #{czr},</if>
+            <if test ='null != gzldr'>gzldr = #{gzldr},</if>
+            <if test ='null != ysr'>ysr = #{ysr},</if>
+            <if test ='null != rq'>rq = #{rq},</if>
+            <if test ='null != remark'>remark = #{remark},</if>
+            <if test ='null != submitState'>submit_state = #{submitState},</if>
+            <if test ='null != delFlag'>del_flag = #{delFlag},</if>
+            <if test ='null != createBy'>create_by = #{createBy},</if>
+            <if test ='null != createTime'>create_time = #{createTime},</if>
+            <if test ='null != updateBy'>update_by = #{updateBy},</if>
+            <if test ='null != updateTime'>update_time = #{updateTime}</if>
         </set>
         WHERE id = #{id}
     </update>
@@ -240,11 +248,11 @@
             s.station_name,
             a.*
         FROM bus_jceb_qmjcjl a
-        LEFT JOIN bus_station s ON a.qj = s.station_id
+        LEFT JOIN bus_station s ON a.station_id = s.station_id
         WHERE
             a.del_flag = '0'
-            AND s.del_flag = '0'
-            AND a.id = #{id}
+          AND s.del_flag = '0'
+          AND a.id = #{id}
     </select>
 
     <select id="getList" resultMap="BaseResultMap">
@@ -252,77 +260,81 @@
             s.station_name,
             a.*
         FROM bus_jceb_qmjcjl a
-        LEFT JOIN bus_station s ON a.qj = s.station_id
+        LEFT JOIN bus_station s ON a.station_id = s.station_id
         <where>
             a.del_flag = '0'
             AND s.del_flag = '0'
-                <if test="qj!=null and qj!=''">
-                    and a.qj=#{qj}
-                </if>
-                <if test="zzh!=null and zzh!=''">
-                    and a.zzh=#{zzh}
-                </if>
-                <if test="qxly!=null and qxly!=''">
-                    and a.qxly=#{qxly}
-                </if>
-                <if test="wz!=null and wz!=''">
-                    and a.wz=#{wz}
-                </if>
-                <if test="qxnr!=null and qxnr!=''">
-                    and a.qxnr=#{qxnr}
-                </if>
-                <if test="qxdj!=null and qxdj!=''">
-                    and a.qxdj=#{qxdj}
-                </if>
-                <if test="clcs!=null and clcs!=''">
-                    and a.clcs=#{clcs}
-                </if>
-                <if test="xhzt!=null and xhzt!=''">
-                    and a.xhzt=#{xhzt}
-                </if>
-                <if test="whby!=null and whby!=''">
-                    and a.whby=#{whby}
-                </if>
-                <if test="jyqs!=null and jyqs!=''">
-                    and a.jyqs=#{jyqs}
-                </if>
-                <if test="sbzt!=null and sbzt!=''">
-                    and a.sbzt=#{sbzt}
-                </if>
-                <if test="czr!=null and czr!=''">
-                    and a.czr=#{czr}
-                </if>
-                <if test="gzldr!=null and gzldr!=''">
-                    and a.gzldr=#{gzldr}
-                </if>
-                <if test="ysr!=null and ysr!=''">
-                    and a.ysr=#{ysr}
-                </if>
-                <if test="rq!=null and rq!=''">
-                    and a.rq=#{rq}
-                </if>
-                <if test="remark!=null and remark!=''">
-                    and a.remark=#{remark}
-                </if>
-                <if test="submitState!=null and submitState!=''">
-                    and a.submit_state=#{submitState}
-                </if>
-                <if test="delFlag!=null and delFlag!=''">
-                    and a.del_flag=#{delFlag}
-                </if>
-                <if test="createBy!=null and createBy!=''">
-                    and a.create_by=#{createBy}
-                </if>
-                <if test="createTime!=null and createTime!=''">
-                    and a.create_time=#{createTime}
-                </if>
-                <if test="updateBy!=null and updateBy!=''">
-                    and a.update_by=#{updateBy}
-                </if>
-                <if test="updateTime!=null and updateTime!=''">
-                    and a.update_time=#{updateTime}
-                </if>
+            <if test="stationId!=null and stationId!=''">
+                and a.station_id=#{stationId}
+            </if>
+            <if test="stationName!=null and stationName!=''">
+                and a.station_name=#{stationName}
+            </if>
+            <if test="pillarCode!=null and pillarCode!=''">
+                and a.pillar_code=#{pillarCode}
+            </if>
+            <if test="qxly!=null and qxly!=''">
+                and a.qxly=#{qxly}
+            </if>
+            <if test="wz!=null and wz!=''">
+                and a.wz=#{wz}
+            </if>
+            <if test="qxnr!=null and qxnr!=''">
+                and a.qxnr=#{qxnr}
+            </if>
+            <if test="qxdj!=null and qxdj!=''">
+                and a.qxdj=#{qxdj}
+            </if>
+            <if test="clcs!=null and clcs!=''">
+                and a.clcs=#{clcs}
+            </if>
+            <if test="xhzt!=null and xhzt!=''">
+                and a.xhzt=#{xhzt}
+            </if>
+            <if test="whby!=null and whby!=''">
+                and a.whby=#{whby}
+            </if>
+            <if test="jyqs!=null and jyqs!=''">
+                and a.jyqs=#{jyqs}
+            </if>
+            <if test="sbzt!=null and sbzt!=''">
+                and a.sbzt=#{sbzt}
+            </if>
+            <if test="czr!=null and czr!=''">
+                and a.czr=#{czr}
+            </if>
+            <if test="gzldr!=null and gzldr!=''">
+                and a.gzldr=#{gzldr}
+            </if>
+            <if test="ysr!=null and ysr!=''">
+                and a.ysr=#{ysr}
+            </if>
+            <if test="rq!=null and rq!=''">
+                and a.rq=#{rq}
+            </if>
+            <if test="remark!=null and remark!=''">
+                and a.remark=#{remark}
+            </if>
+            <if test="submitState!=null and submitState!=''">
+                and a.submit_state=#{submitState}
+            </if>
+            <if test="delFlag!=null and delFlag!=''">
+                and a.del_flag=#{delFlag}
+            </if>
+            <if test="createBy!=null and createBy!=''">
+                and a.create_by=#{createBy}
+            </if>
+            <if test="createTime!=null and createTime!=''">
+                and a.create_time=#{createTime}
+            </if>
+            <if test="updateBy!=null and updateBy!=''">
+                and a.update_by=#{updateBy}
+            </if>
+            <if test="updateTime!=null and updateTime!=''">
+                and a.update_time=#{updateTime}
+            </if>
         </where>
+        order by str_to_date(a.rq,'%Y-%m-%d') desc
     </select>
 
 </mapper>

railway-business/src/main/resources/mapper/catenary/BusJlgzMapper.xml

@@ -4,31 +4,31 @@
 <mapper namespace="com.railway.business.catenary.mapper.BusJlgzMapper">
 
     <resultMap id="BaseResultMap" type="com.railway.business.catenary.domain.BusJlgz">
-                <result column="id" property="id"/>
-                <result column="xb" property="xb"/>
-                <result column="sb" property="sb"/>
-                <result column="hb" property="hb"/>
-                <result column="glb" property="glb"/>
-                <result column="yylx" property="yylx"/>
-                <result column="jlrq" property="jlrq"/>
-                <result column="gzms" property="gzms"/>
-                <result column="create_by" property="createBy"/>
-                <result column="create_time" property="createTime"/>
-                <result column="update_by" property="updateBy"/>
-                <result column="update_time" property="updateTime"/>
-                <result column="del_flag" property="delFlag"/>
-                <result column="line_name" property="lineName"/>
-                <result column="substation_name" property="substationName"/>
-                <result column="yylx_text" property="yylxText"/>
-                <result column="xingbie_text" property="xingbieText"/>
+        <result column="id" property="id"/>
+        <result column="line_id" property="lineId"/>
+        <result column="line_name" property="lineName"/>
+        <result column="substation_id" property="substationId"/>
+        <result column="substation_name" property="substationName"/>
+        <result column="xingbie" property="xingbie"/>
+        <result column="marker" property="marker"/>
+        <result column="yylx" property="yylx"/>
+        <result column="jlrq" property="jlrq"/>
+        <result column="gzms" property="gzms"/>
+        <result column="create_by" property="createBy"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="del_flag" property="delFlag"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-                id,
-                xb,
-                sb,
-                hb,
-                glb,
+        id,
+                line_id,
+                line_name,
+                substation_id,
+                substation_name,
+                xingbie,
+                marker,
                 yylx,
                 jlrq,
                 gzms,
@@ -45,80 +45,92 @@
         </selectKey>
         INSERT INTO bus_jlgz
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                    <if test ='null != xb'>
-                    xb,
-                    </if>
-                    <if test ='null != sb'>
-                    sb,
-                    </if>
-                    <if test ='null != hb'>
-                    hb,
-                    </if>
-                    <if test ='null != glb'>
-                    glb,
-                    </if>
-                    <if test ='null != yylx'>
-                    yylx,
-                    </if>
-                    <if test ='null != jlrq'>
-                    jlrq,
-                    </if>
-                    <if test ='null != gzms'>
-                    gzms,
-                    </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 != delFlag'>
-                    del_flag
-                    </if>
+            <if test ='null != lineId'>
+                line_id,
+            </if>
+            <if test ='null != lineName'>
+                line_name,
+            </if>
+            <if test ='null != substationId'>
+                substation_id,
+            </if>
+            <if test ='null != substationName'>
+                substation_name,
+            </if>
+            <if test ='null != xingbie'>
+                xingbie,
+            </if>
+            <if test ='null != marker'>
+                marker,
+            </if>
+            <if test ='null != yylx'>
+                yylx,
+            </if>
+            <if test ='null != jlrq'>
+                jlrq,
+            </if>
+            <if test ='null != gzms'>
+                gzms,
+            </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 != delFlag'>
+                del_flag
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                    <if test ='null != xb'>
-                    #{xb},
-                    </if>
-                    <if test ='null != sb'>
-                    #{sb},
-                    </if>
-                    <if test ='null != hb'>
-                    #{hb},
-                    </if>
-                    <if test ='null != glb'>
-                    #{glb},
-                    </if>
-                    <if test ='null != yylx'>
-                    #{yylx},
-                    </if>
-                    <if test ='null != jlrq'>
-                    #{jlrq},
-                    </if>
-                    <if test ='null != gzms'>
-                    #{gzms},
-                    </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 != delFlag'>
-                    #{delFlag}
-                    </if>
+            <if test ='null != lineId'>
+                #{lineId},
+            </if>
+            <if test ='null != lineName'>
+                #{lineName},
+            </if>
+            <if test ='null != substationId'>
+                #{substationId},
+            </if>
+            <if test ='null != substationName'>
+                #{substationName},
+            </if>
+            <if test ='null != xingbie'>
+                #{xingbie},
+            </if>
+            <if test ='null != marker'>
+                #{marker},
+            </if>
+            <if test ='null != yylx'>
+                #{yylx},
+            </if>
+            <if test ='null != jlrq'>
+                #{jlrq},
+            </if>
+            <if test ='null != gzms'>
+                #{gzms},
+            </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 != delFlag'>
+                #{delFlag}
+            </if>
         </trim>
     </insert>
 
@@ -131,18 +143,20 @@
     <update id="update" parameterType="com.railway.business.catenary.domain.BusJlgz">
         UPDATE bus_jlgz
         <set>
-                    <if test ='null != xb'>xb = #{xb},</if>
-                    <if test ='null != sb'>sb = #{sb},</if>
-                    <if test ='null != hb'>hb = #{hb},</if>
-                    <if test ='null != glb'>glb = #{glb},</if>
-                    <if test ='null != yylx'>yylx = #{yylx},</if>
-                    <if test ='null != jlrq'>jlrq = #{jlrq},</if>
-                    <if test ='null != gzms'>gzms = #{gzms},</if>
-                    <if test ='null != createBy'>create_by = #{createBy},</if>
-                    <if test ='null != createTime'>create_time = #{createTime},</if>
-                    <if test ='null != updateBy'>update_by = #{updateBy},</if>
-                    <if test ='null != updateTime'>update_time = #{updateTime},</if>
-                    <if test ='null != delFlag'>del_flag = #{delFlag}</if>
+            <if test ='null != lineId'>line_id = #{lineId},</if>
+            <if test ='null != lineName'>line_name = #{lineName},</if>
+            <if test ='null != substationId'>substation_id = #{substationId},</if>
+            <if test ='null != substationName'>substation_name = #{substationName},</if>
+            <if test ='null != xingbie'>xingbie = #{xingbie},</if>
+            <if test ='null != marker'>marker = #{marker},</if>
+            <if test ='null != yylx'>yylx = #{yylx},</if>
+            <if test ='null != jlrq'>jlrq = #{jlrq},</if>
+            <if test ='null != gzms'>gzms = #{gzms},</if>
+            <if test ='null != createBy'>create_by = #{createBy},</if>
+            <if test ='null != createTime'>create_time = #{createTime},</if>
+            <if test ='null != updateBy'>update_by = #{updateBy},</if>
+            <if test ='null != updateTime'>update_time = #{updateTime},</if>
+            <if test ='null != delFlag'>del_flag = #{delFlag}</if>
         </set>
         WHERE id = #{id}
     </update>
@@ -150,6 +164,7 @@
 
     <select id="getInfo" resultMap="BaseResultMap">
         SELECT
+            distinct
             line.line_name,
             sub.substation_name,
             dict1.dict_label as xingbie_text,
@@ -157,15 +172,15 @@
             a.*
         FROM
             bus_jlgz a
-        LEFT JOIN bus_line line ON a.xb = line.line_id
-        LEFT JOIN bus_substation sub ON a.sb = sub.substation_id
-        LEFT JOIN sys_dict_data dict1 ON (a.hb = dict1.dict_value AND dict1.dict_type = 'xingbie')
-        LEFT JOIN sys_dict_data dict2 ON (a.yylx = dict2.dict_value AND dict2.dict_type = 'gzyy')
+                LEFT JOIN bus_line line ON a.line_id = line.line_id
+                LEFT JOIN bus_substation sub ON a.substation_id = sub.substation_id
+                LEFT JOIN sys_dict_data dict1 ON (a.xingbie = dict1.dict_value AND dict1.dict_type = 'xingbie')
+                LEFT JOIN sys_dict_data dict2 ON (a.yylx = dict2.dict_value AND dict2.dict_type = 'gzyy')
         WHERE
             a.del_flag = '0'
-            AND line.del_flag = '0'
-            AND sub.del_flag = '0'
-            AND a.id = #{id}
+          AND line.del_flag = '0'
+          AND sub.del_flag = '0'
+          AND a.id = #{id}
     </select>
 
     <select id="getList" resultMap="BaseResultMap">
@@ -177,25 +192,31 @@
             a.*
         FROM
             bus_jlgz a
-        LEFT JOIN bus_line line ON a.xb = line.line_id
-        LEFT JOIN bus_substation sub ON a.sb = sub.substation_id
-        LEFT JOIN sys_dict_data dict1 ON (a.hb = dict1.dict_value AND dict1.dict_type = 'xingbie')
+        LEFT JOIN bus_line line ON a.line_id = line.line_id
+        LEFT JOIN bus_substation sub ON a.substation_id = sub.substation_id
+        LEFT JOIN sys_dict_data dict1 ON (a.xingbie = dict1.dict_value AND dict1.dict_type = 'xingbie')
         LEFT JOIN sys_dict_data dict2 ON (a.yylx = dict2.dict_value AND dict2.dict_type = 'gzyy')
         <where>
             a.del_flag = '0'
             AND line.del_flag = '0'
             AND sub.del_flag = '0'
-            <if test="xb!=null and xb!=''">
-                and a.xb=#{xb}
+            <if test="lineId!=null and lineId!=''">
+                and a.line_id=#{lineId}
+            </if>
+            <if test="lineName!=null and lineName!=''">
+                and a.line_name=#{lineName}
             </if>
-            <if test="sb!=null and sb!=''">
-                and a.sb=#{sb}
+            <if test="substationId!=null and substationId!=''">
+                and a.substation_id=#{substationId}
             </if>
-            <if test="hb!=null and hb!=''">
-                and a.hb=#{hb}
+            <if test="substationName!=null and substationName!=''">
+                and a.substation_name=#{substationName}
             </if>
-            <if test="glb!=null and glb!=''">
-                and a.glb=#{glb}
+            <if test="xingbie!=null and xingbie!=''">
+                and a.xingbie=#{xingbie}
+            </if>
+            <if test="marker!=null and marker!=''">
+                and a.marker=#{marker}
             </if>
             <if test="yylx!=null and yylx!=''">
                 and a.yylx=#{yylx}
@@ -222,66 +243,47 @@
                 and a.del_flag=#{delFlag}
             </if>
         </where>
-        <if test="orderBy!=null and orderBy!=''">
-            order by a.${orderBy}
-        </if>
-        <if test="isAsc!=null and isAsc!=''">
-            <if test="isAsc == '1'.toString()" >
-                asc
-            </if>
-            <if test="isAsc == '0'.toString()" >
-                desc
-            </if>
-        </if>
-
+        order by str_to_date(a.jlrq,'%Y-%m-%d') desc
     </select>
 
     <select id="getListByZz" resultType="com.railway.business.catenary.domain.vo.BusJlgzListByZzVo">
-        SELECT dictYylx.dict_value as yylx, dictYylx.dict_label as yylxText, ifnull(res.total,0) as total FROM (
-            SELECT jlgz.yylx, jlgz.yylx_text as yylxText, count(1) as total FROM (
-                 SELECT D.* FROM (
-                          SELECT line.line_name,
-                                 sub.substation_name,
-                                 dict1.dict_label as xingbie_text,
-                                 dict2.dict_label as yylx_text,
-                                 a.*
-                          FROM bus_jlgz a
-                               LEFT JOIN bus_line line ON a.xb = line.line_id
-                               LEFT JOIN bus_substation sub ON a.sb = sub.substation_id
-                               LEFT JOIN sys_dict_data dict1 ON (a.hb = dict1.dict_value AND dict1.dict_type = 'xingbie')
-                               LEFT JOIN sys_dict_data dict2 ON (a.yylx = dict2.dict_value AND dict2.dict_type = 'gzyy')
-                          WHERE a.del_flag = '0'
-                            AND line.del_flag = '0'
-                            AND sub.del_flag = '0'
-                      ) D,
-                      (
-                          SELECT distinct zzdzxx.glb
-                          FROM bus_zzdzxx zzdzxx,
-                               (
-                                   SELECT zz.id,
-                                          zz.zzh,
-                                          zz.glb
-                                   FROM bus_zzdzxx zz
-                                   WHERE 1 = 1
-                                     <if test="query.xb != null and query.xb != ''">
-                                         AND zz.xb = #{query.xb}
-                                     </if>
-                                     <if test="query.hb != null and query.hb != ''">
-                                         AND zz.hb = #{query.hb}
-                                     </if>
-                                     <if test="query.zzh != null and query.zzh != ''">
-                                         AND zz.zzh = #{query.zzh}
-                                     </if>
-                                     <if test="query.glb != null and query.glb != ''">
-                                         AND zz.glb = #{query.glb}
-                                     </if>
-                               ) B
-                          WHERE (zzdzxx.glb + 0.0) BETWEEN (B.glb + 0.0) - (#{query.zzfw} + 0.0) AND (B.glb + 0.0) + (#{query.zzfw} + 0.0)
-                      ) H
-                 WHERE D.glb = H.glb
-             ) jlgz
+        SELECT dictYylx.dict_value as yylx, dictYylx.dict_label as yylxText, ifnull(res.total,0) as total FROM
+        (
+            SELECT jlgz.yylx, count(1) as total FROM
+            (
+                SELECT D.* FROM
+                (
+                    SELECT a.id, a.yylx, a.marker
+                    FROM bus_jlgz a
+                    WHERE a.del_flag = '0'
+                ) D,
+                (
+                    SELECT distinct zzdzxx.marker
+                    FROM bus_pillar zzdzxx,
+                    (
+                        SELECT zz.id, zz.pillar_code, zz.marker
+                        FROM bus_pillar zz
+                        WHERE 1 = 1
+                        <if test="query.lineId != null and query.lineId != ''">
+                            AND zz.line_id = #{query.lineId}
+                        </if>
+                        <if test="query.xingbie != null and query.xingbie != ''">
+                            AND zz.xingbie = #{query.xingbie}
+                        </if>
+                        <if test="query.pillarCode != null and query.pillarCode != ''">
+                            AND zz.pillar_code = #{query.pillarCode}
+                        </if>
+                        <if test="query.marker != null and query.marker != ''">
+                            AND zz.marker = #{query.marker}
+                        </if>
+                    ) B
+                    WHERE (zzdzxx.marker + 0.0) BETWEEN (B.marker + 0.0) - (#{query.zzfw} + 0.0) AND (B.marker + 0.0) + (#{query.zzfw} + 0.0)
+                ) H
+                WHERE D.marker = H.marker
+            ) jlgz
             GROUP BY jlgz.yylx
         ) res right join sys_dict_data dictYylx on res.yylx = dictYylx.dict_value
         where dictYylx.dict_type = 'gzyy'
     </select>
+
 </mapper>