【CHG】改进历史故障列表查询。

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

@@ -43,6 +43,9 @@ public class BusJlgz extends BaseEntity{
     @Length(min = 1, max = 20, message = "【公里标】长度必须介于 {min} 和 {max} 之间")
     private String marker;
 
+    @ApiModelProperty(value = "支柱范围")
+    private String pillarArea;
+
     @ApiModelProperty(value = "原因类型")
     @Length(min = 1, max = 100, message = "【原因类型】长度必须介于 {min} 和 {max} 之间")
     private String yylx;

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

@@ -172,7 +172,7 @@
       AND dict1.status =  '0'
       AND dict2.status =  '0'
       <if test="lineId!=null and lineId!=''">
-        and t.line_id=#{lineId}
+        AND v.line_id = #{lineId}
       </if>
       <if test="substationId!=null and substationId!=''">
         and t.substation_id=#{substationId}
@@ -181,7 +181,8 @@
         and t.xingbie=#{xingbie}
       </if>
       <if test="marker!=null and marker!=''">
-        and t.marker=#{marker}
+        AND (t.marker + 0.0) BETWEEN (#{marker} + 0.0) - (#{pillarArea} + 0.0)
+        AND (#{marker} + 0.0) + (#{pillarArea} + 0.0)
       </if>
       <if test="yylx!=null and yylx!=''">
         and t.yylx=#{yylx}