bonus
/
gz_digital_signage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

三跨管理

This commit is contained in:
马三炮 2025-04-27 14:04:01 +08:00
parent 64c58e6618
commit ae3be4aff1
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/bonus/digitalSignage/basic/vo/TbProjectVo.java
View File

@ -40,7 +40,7 @@ public class TbProjectVo {
/** /**
* 电压等级（电压等级） * 电压等级（电压等级）
*/ */
@Excel(name = "电压等级", sort = 3, readConverterExp = "1=110KV,2=220KV") @Excel(name = "电压等级", sort = 3)
private String voltageLevel; 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; private String proStatus;
/** /**

10
src/main/java/com/bonus/digitalSignage/basic/vo/TbThreeSpanVo.java
View File

@ -31,11 +31,21 @@ public class TbThreeSpanVo {
*/ */
private Long towerId; private Long towerId;
/**
* 开始杆塔名称
*/
private String towerName;
/** /**
* 结束杆塔id * 结束杆塔id
*/ */
private Long nextTowerId; private Long nextTowerId;
/**
* 结束杆塔名称
*/
private String nextTowerName;
/** /**
* 上层线路 * 上层线路
*/ */

5
src/main/resources/mappers/basic/TbThreeSpanMapper.xml
View File

@ -64,13 +64,14 @@
<select id="getTbThreeSpanList" resultType="com.bonus.digitalSignage.basic.vo.TbThreeSpanVo"> <select id="getTbThreeSpanList" resultType="com.bonus.digitalSignage.basic.vo.TbThreeSpanVo">
select tts.id as id,tts.pro_id as proId,tts.span_type as spanType,tts.tower_id as towerId,tts.next_tower_id as nextTowerId, select tts.id as id,tts.pro_id as proId,tts.span_type as spanType,tts.tower_id as towerId,
tt.tower_name as towerName, tts.next_tower_id as nextTowerId,tt2.tower_name as nextTowerName,
tts.upper_line as upperLine,tts.lower_line as lowerLine,tts.intersection_angle as intersectionAngle, tts.upper_line as upperLine,tts.lower_line as lowerLine,tts.intersection_angle as intersectionAngle,
tts.vertical_distance as verticalDistance,tts.safety_margin as safetyMargin,tts.vertical_clear_distance as verticalClearDistance, tts.vertical_distance as verticalDistance,tts.safety_margin as safetyMargin,tts.vertical_clear_distance as verticalClearDistance,
tts.tower_spacing as towerSpacing,tts.highway_width as highwayWidth tts.tower_spacing as towerSpacing,tts.highway_width as highwayWidth
from tb_three_span tts from tb_three_span tts
left join tb_tower tt on tts.tower_id = tt.id left join tb_tower tt on tts.tower_id = tt.id
left join tb_tower tt2 on tts.tower_id = tt.id left join tb_tower tt2 on tts.next_tower_id = tt.id
where tts.pro_id = #{proId} and tts.is_active = '1' where tts.pro_id = #{proId} and tts.is_active = '1'
<if test="keyWord != '' and keyWord != null"> <if test="keyWord != '' and keyWord != null">
and (tt.tower_name like concat('%',#{keyWord},'%') or and (tt.tower_name like concat('%',#{keyWord},'%') or