This commit is contained in:
parent
f4b7102a5e
commit
b5c57acfa5
|
|
@ -26,7 +26,7 @@ public class TbThreeSpanVo {
|
||||||
/**
|
/**
|
||||||
* 跨越类型 1.跨线路 2.跨公路 3.跨铁路
|
* 跨越类型 1.跨线路 2.跨公路 3.跨铁路
|
||||||
*/
|
*/
|
||||||
@Excel(name = "跨越类型", sort =3,readConverterExp = "1=跨线路,2=跨公路,2=跨铁路")
|
@Excel(name = "跨越类型", sort =3,readConverterExp = "1=跨线路,2=跨公路,3=跨铁路")
|
||||||
private String spanType;
|
private String spanType;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,7 @@
|
||||||
|
|
||||||
<select id="getTbProjectList" resultType="com.bonus.digitalSignage.basic.vo.TbTowerVo">
|
<select id="getTbProjectList" resultType="com.bonus.digitalSignage.basic.vo.TbTowerVo">
|
||||||
select id as id,pro_id as proId,tower_name as towerName,lon as lon,lat as lat,
|
select id as id,pro_id as proId,tower_name as towerName,lon as lon,lat as lat,
|
||||||
baidu_lon as baiduLon,baidu_lat as baiduLat,sort as sort,central_meridian as centralMeridian
|
baidu_lon as baiduLon,baidu_lat as baiduLat,sort as sort,central_meridian as centralMeridian,upload_type as uploadType
|
||||||
from tb_tower where pro_id = #{proId} and is_actvice = '1'
|
from tb_tower where pro_id = #{proId} and is_actvice = '1'
|
||||||
<if test="towerName != '' and towerName != null">and tower_name like concat('%', #{towerName}, '%')</if>
|
<if test="towerName != '' and towerName != null">and tower_name like concat('%', #{towerName}, '%')</if>
|
||||||
ORDER BY sort
|
ORDER BY sort
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue