Commit 462ff938 authored by hkl's avatar hkl

feat:1.获取首页tree字段调整

parent 9cdd2b7d
...@@ -59,10 +59,7 @@ ...@@ -59,10 +59,7 @@
true isLeaf true isLeaf
FROM FROM
t_sn_light_rail t_sn_light_rail
<where> WHERE status = 1
1=1
AND status = 1
</where>
<!-- UNION ALL <!-- UNION ALL
SELECT SELECT
concat(id,'-2') id, concat(id,'-2') id,
......
...@@ -40,15 +40,15 @@ ...@@ -40,15 +40,15 @@
'2' level, '2' level,
t.light_rail_id parent, t.light_rail_id parent,
t.line_alias_id, t.line_alias_id,
t3.line_alias_code,
t.light_rail_id, t.light_rail_id,
t.section_starting_mileage startMileage, t.section_starting_mileage startMileage,
TRUNCATE((t.section_end_mileage + t.section_starting_mileage) / 2, 3) centerMileage, TRUNCATE((t.section_end_mileage + t.section_starting_mileage) / 2, 3) centerMileage,
t.section_end_mileage endMileage, t.section_end_mileage endMileage,
true isLeaf true isLeaf
FROM t_sn_subway_section t left join t_sn_light_rail t2 ON t.light_rail_id = t2.id FROM t_sn_subway_section t
<where> LEFT JOIN t_sn_light_rail t2 ON t.light_rail_id = t2.id
1=1 LEFT JOIN t_sn_line_alias t3 ON t.line_alias_id = t3.id
AND t2.status = 1 WHERE t2.status = 1
</where>
</select> </select>
</mapper> </mapper>
\ No newline at end of file
...@@ -39,16 +39,15 @@ ...@@ -39,16 +39,15 @@
'3' level, '3' level,
t2.section_id parent, t2.section_id parent,
t1.line_alias_id, t1.line_alias_id,
t4.line_alias_code,
t1.starting_mileage startMileage, t1.starting_mileage startMileage,
t1.center_mileage centerMileage, t1.center_mileage centerMileage,
t1.end_mileage endMileage, t1.end_mileage endMileage,
true isLeaf true isLeaf
FROM FROM t_sn_train_station t1
t_sn_train_station t1 LEFT JOIN t_sn_section_station_map t2 ON t1.id = t2.station_id LEFT JOIN t_sn_section_station_map t2 ON t1.id = t2.station_id
LEFT JOIN t_sn_light_rail t3 on t1.light_rail_id = t3.id and t2.light_rail_id = t3.id LEFT JOIN t_sn_light_rail t3 on t1.light_rail_id = t3.id and t2.light_rail_id = t3.id
<where> LEFT JOIN t_sn_line_alias t4 ON t1.line_alias_id = t4.id
1=1 WHERE t3.status = 1
AND t3.status = 1
</where>
</select> </select>
</mapper> </mapper>
\ No newline at end of file
package org.jeecg.modules.subwayNetwork.vo; package org.jeecg.modules.subwayNetwork.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -28,6 +26,9 @@ public class SectionStationNode { ...@@ -28,6 +26,9 @@ public class SectionStationNode {
@ApiModelProperty(value = "线别id") @ApiModelProperty(value = "线别id")
private String lineAliasId; private String lineAliasId;
@ApiModelProperty(value = "线别code【冠号】")
private String lineAliasCode;
@ApiModelProperty(value = "起始里程") @ApiModelProperty(value = "起始里程")
private BigDecimal startMileage; private BigDecimal startMileage;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment