潘钊 / bsth_control · Commits

Commit 5d90b218198754d86d0af54989f7f537b21be2c1

Authored by panzhaov5
2 parents 7613fd06 1008b078
build: skipped

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control into pudong

Inline Side-by-side
Showing 4 changed files with 4 additions and 4 deletions
src/main/java/com/bsth/repository/LineVersionsRepository.java
  View file @5d90b21
@@ -43,7 +43,7 @@ public interface LineVersionsRepository extends BaseRepository<LineVersions, Int @@ -43,7 +43,7 @@ public interface LineVersionsRepository extends BaseRepository<LineVersions, Int
43 /** 43 /**
44 * 查询待更新线路的线路版本 44 * 查询待更新线路的线路版本
45 */ 45 */
46 - @Query(value = "SELECT lv FROM LineVersions lv where lv.status = 2 and lv.startDate<sysdate() and lv.endDate > sysdate()") 46 + @Query(value = "SELECT lv FROM LineVersions lv where lv.status = 2 and lv.startDate<sysdate() and lv.endDate > sysdate() and lv.isupdate != 1")
47 public List<LineVersions> findupdated(); 47 public List<LineVersions> findupdated();
48 48
49 /** 49 /**
src/main/java/com/bsth/repository/LsSectionRouteRepository.java
  View file @5d90b21
@@ -28,7 +28,7 @@ public interface LsSectionRouteRepository extends BaseRepository&lt;LsSectionRoute, @@ -28,7 +28,7 @@ public interface LsSectionRouteRepository extends BaseRepository&lt;LsSectionRoute,
28 /** 28 /**
29 * 查询待更新线路的路段路由 29 * 查询待更新线路的路段路由
30 */ 30 */
31 - @Query(value = "SELECT sr FROM LsSectionRoute sr where sr.line.id =?1 and sr.lineCode=?2 and sr.versions=?3") 31 + @Query(value = "SELECT sr FROM LsSectionRoute sr where sr.line.id =?1 and sr.lineCode=?2 and sr.versions=?3 and sr.destroy=0")
32 public List<LsSectionRoute> findupdated(Integer lineId,String lineCode,Integer versions); 32 public List<LsSectionRoute> findupdated(Integer lineId,String lineCode,Integer versions);
33 33
34 /** 34 /**
src/main/java/com/bsth/repository/LsStationRouteRepository.java
  View file @5d90b21
@@ -30,7 +30,7 @@ public interface LsStationRouteRepository extends BaseRepository&lt;LsStationRoute, @@ -30,7 +30,7 @@ public interface LsStationRouteRepository extends BaseRepository&lt;LsStationRoute,
30 * 查询待更新线路的站点路由 30 * 查询待更新线路的站点路由
31 */ 31 */
32 @EntityGraph(value = "ls_stationRoute_station", type = EntityGraph.EntityGraphType.FETCH) 32 @EntityGraph(value = "ls_stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
33 - @Query(value = "SELECT DISTINCT sr FROM LsStationRoute sr where sr.line.id =?1 and sr.lineCode=?2 and sr.versions=?3") 33 + @Query(value = "SELECT DISTINCT sr FROM LsStationRoute sr where sr.line.id =?1 and sr.lineCode=?2 and sr.versions=?3 and sr.destroy=0")
34 List<LsStationRoute> findupdated(Integer lineId, String lineCode, Integer versions); 34 List<LsStationRoute> findupdated(Integer lineId, String lineCode, Integer versions);
35 35
36 /** 36 /**
src/main/resources/static/pages/base/stationroute/js/stationroute-list-map.js
  View file @5d90b21
@@ -1103,7 +1103,7 @@ window.WorldsBMap = function () { @@ -1103,7 +1103,7 @@ window.WorldsBMap = function () {
1103 params.sectionTime = 0; 1103 params.sectionTime = 0;
1104 params.sectionDistance = 60; 1104 params.sectionDistance = 60;
1105 params.speedLimit = 0; 1105 params.speedLimit = 0;
1106 - params.versions = beforeSection.sectionVersion; 1106 + params.versions = beforeSection.sectionRouteVersions;
1107 params.destroy = 0; 1107 params.destroy = 0;
1108 params.directions = dir; 1108 params.directions = dir;
1109 params.descriptions = ''; 1109 params.descriptions = '';