diff --git a/src/main/java/com/bonus/digitalSignage/basic/vo/TbProjectVo.java b/src/main/java/com/bonus/digitalSignage/basic/vo/TbProjectVo.java index efe6c5e..9941253 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/vo/TbProjectVo.java +++ b/src/main/java/com/bonus/digitalSignage/basic/vo/TbProjectVo.java @@ -40,7 +40,7 @@ public class TbProjectVo { /** * 电压等级(电压等级) */ - @Excel(name = "电压等级", sort = 3, readConverterExp = "1=110KV,2=220KV") + @Excel(name = "电压等级", sort = 3) private String voltageLevel; /** @@ -84,7 +84,7 @@ public class TbProjectVo { /** * 工程状态(字典表配置) */ - @Excel(name = "工程状态", sort = 8, readConverterExp = "1=在建,2=完工,3=筹建,4=停工,5=收尾") + @Excel(name = "工程状态", sort = 8) private String proStatus; /** diff --git a/src/main/java/com/bonus/digitalSignage/basic/vo/TbThreeSpanVo.java b/src/main/java/com/bonus/digitalSignage/basic/vo/TbThreeSpanVo.java index 93c76d1..7061a5c 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/vo/TbThreeSpanVo.java +++ b/src/main/java/com/bonus/digitalSignage/basic/vo/TbThreeSpanVo.java @@ -31,11 +31,21 @@ public class TbThreeSpanVo { */ private Long towerId; + /** + * 开始杆塔名称 + */ + private String towerName; + /** * 结束杆塔id */ private Long nextTowerId; + /** + * 结束杆塔名称 + */ + private String nextTowerName; + /** * 上层线路 */ diff --git a/src/main/resources/mappers/basic/TbThreeSpanMapper.xml b/src/main/resources/mappers/basic/TbThreeSpanMapper.xml index b7d56d3..99efa5f 100644 --- a/src/main/resources/mappers/basic/TbThreeSpanMapper.xml +++ b/src/main/resources/mappers/basic/TbThreeSpanMapper.xml @@ -64,13 +64,14 @@