【CHG】统一部分常见字段和表名

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

@@ -140,7 +140,7 @@ public class BusFjxgmd extends BaseEntity{
     private String slbh;
 
     @ApiModelProperty(value = "支柱范围")
-    private String zzfw;
+    private String pillarArea;
 
     @ApiModelProperty(value = "del_flag")
     @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")

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

@@ -25,6 +25,7 @@
     <result column="station_name" property="stationName"/>
     <result column="xingbie_text" property="xingbieText"/>
     <result column="fjlx_text" property="fjlxText"/>
+    <result column="pillar_area" property="pillarArea"/>
   </resultMap>
 
   <sql id="Base_Column_List">
@@ -226,7 +227,7 @@
     v.line_name,
     dict1.dict_label AS xingbie_text,
     dict2.dict_label AS fjlx_text,
-    ${query.zzfw} AS zzfw
+    ${query.pillarArea} AS pillar_area
     FROM base_fjxgmd a
     LEFT JOIN v_station v ON a.station_id = v.station_id
     LEFT JOIN sys_dict_data dict1 ON (a.xingbie = dict1.dict_value AND dict1.dict_type = 'xingbie')
@@ -262,8 +263,8 @@
       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)
+    WHERE (zzdzxx.marker + 0.0) BETWEEN (B.marker + 0.0) - (#{query.pillarArea} + 0.0) AND (B.marker + 0.0) +
+    (#{query.pillarArea} + 0.0)
     ) H
     WHERE D.qsgh = H.pillar_code
     ORDER BY (D.qsgh + 0)