潘钊 / bsth_control · Commits

Commit 5d83333ccd57da13380676e4f5059fd4d0ab6b83

Authored by youxiw2000
1 parent d143649f

1

Inline Side-by-side
Showing 4 changed files with 16 additions and 4 deletions
src/main/java/com/bsth/repository/LsStationRouteRepository.java
  View file @5d83333
@@ -67,12 +67,14 @@ public interface LsStationRouteRepository extends BaseRepository<LsStationRoute, @@ -67,12 +67,14 @@ public interface LsStationRouteRepository extends BaseRepository<LsStationRoute,
67 "b.destroy AS 'station.destroy'," + 67 "b.destroy AS 'station.destroy'," +
68 "b.versions AS 'station.versions'," + 68 "b.versions AS 'station.versions'," +
69 "b.descriptions AS 'station.descriptions', " + 69 "b.descriptions AS 'station.descriptions', " +
70 - "a.`stationRoute.industryCode` " + 70 + "a.`stationRoute.industryCode`, " +
  71 + "a.`stationRoute.stationNameEn` " +
71 " FROM (" + 72 " FROM (" +
72 "SELECT r.id AS 'stationRoute.id'," + 73 "SELECT r.id AS 'stationRoute.id'," +
73 " r.line AS 'stationRoute.line'," + 74 " r.line AS 'stationRoute.line'," +
74 "r.station AS 'stationRoute.station'," + 75 "r.station AS 'stationRoute.station'," +
75 "r.station_name AS 'stationRoute.stationName'," + 76 "r.station_name AS 'stationRoute.stationName'," +
  77 + "r.station_name_en AS 'stationRoute.stationNameEn'," +
76 "r.station_route_code as 'stationRoute.stationRouteCode'," + 78 "r.station_route_code as 'stationRoute.stationRouteCode'," +
77 "r.line_code AS 'stationRoute.lineCode'," + 79 "r.line_code AS 'stationRoute.lineCode'," +
78 "r.station_mark AS 'stationRoute.stationMark'," + 80 "r.station_mark AS 'stationRoute.stationMark'," +
@@ -132,11 +134,13 @@ public interface LsStationRouteRepository extends BaseRepository<LsStationRoute, @@ -132,11 +134,13 @@ public interface LsStationRouteRepository extends BaseRepository<LsStationRoute,
132 " b.update_date AS stationUpdateDate," + 134 " b.update_date AS stationUpdateDate," +
133 " a.stationRouteId," + 135 " a.stationRouteId," +
134 "b.station_name as zdmc, "+ 136 "b.station_name as zdmc, "+
135 - "a.industryCode "+ 137 + "a.industryCode, "+
  138 + "a.stationNameEn "+
136 " FROM ( SELECT s.id AS stationRouteId," + 139 " FROM ( SELECT s.id AS stationRouteId," +
137 " s.line AS stationRouteLine," + 140 " s.line AS stationRouteLine," +
138 " s.station as stationRouteStation," + 141 " s.station as stationRouteStation," +
139 " s.station_name AS stationRouteName," + 142 " s.station_name AS stationRouteName," +
  143 + " s.station_name_en AS stationNameEn," +
140 " s.station_route_code as stationRouteCode," + 144 " s.station_route_code as stationRouteCode," +
141 " s.industry_code as industryCode," + 145 " s.industry_code as industryCode," +
142 " s.line_code AS stationRouteLIneCode," + 146 " s.line_code AS stationRouteLIneCode," +
src/main/java/com/bsth/repository/StationRouteRepository.java
  View file @5d83333
@@ -67,12 +67,14 @@ public interface StationRouteRepository extends BaseRepository<StationRoute, Int @@ -67,12 +67,14 @@ public interface StationRouteRepository extends BaseRepository<StationRoute, Int
67 "b.destroy AS 'station.destroy'," + 67 "b.destroy AS 'station.destroy'," +
68 "b.versions AS 'station.versions'," + 68 "b.versions AS 'station.versions'," +
69 "b.descriptions AS 'station.descriptions', " + 69 "b.descriptions AS 'station.descriptions', " +
70 - "a.`stationRoute.industryCode` " + 70 + "a.`stationRoute.industryCode`," +
  71 + "a.`stationRoute.stationNameEn` " +
71 " FROM (" + 72 " FROM (" +
72 "SELECT r.id AS 'stationRoute.id'," + 73 "SELECT r.id AS 'stationRoute.id'," +
73 " r.line AS 'stationRoute.line'," + 74 " r.line AS 'stationRoute.line'," +
74 "r.station AS 'stationRoute.station'," + 75 "r.station AS 'stationRoute.station'," +
75 "r.station_name AS 'stationRoute.stationName'," + 76 "r.station_name AS 'stationRoute.stationName'," +
  77 + "r.station_name_en AS 'stationRoute.stationNameEn'," +
76 "r.station_route_code as 'stationRoute.stationRouteCode'," + 78 "r.station_route_code as 'stationRoute.stationRouteCode'," +
77 "r.line_code AS 'stationRoute.lineCode'," + 79 "r.line_code AS 'stationRoute.lineCode'," +
78 "r.station_mark AS 'stationRoute.stationMark'," + 80 "r.station_mark AS 'stationRoute.stationMark'," +
@@ -365,11 +367,13 @@ public interface StationRouteRepository extends BaseRepository<StationRoute, Int @@ -365,11 +367,13 @@ public interface StationRouteRepository extends BaseRepository<StationRoute, Int
365 " b.update_date AS stationUpdateDate," + 367 " b.update_date AS stationUpdateDate," +
366 " a.stationRouteId," + 368 " a.stationRouteId," +
367 "b.station_name as zdmc, "+ 369 "b.station_name as zdmc, "+
368 - "a.industryCode "+ 370 + "a.industryCode, "+
  371 + "a.stationNameEn "+
369 " FROM ( SELECT s.id AS stationRouteId," + 372 " FROM ( SELECT s.id AS stationRouteId," +
370 " s.line AS stationRouteLine," + 373 " s.line AS stationRouteLine," +
371 " s.station as stationRouteStation," + 374 " s.station as stationRouteStation," +
372 " s.station_name AS stationRouteName," + 375 " s.station_name AS stationRouteName," +
  376 + " s.station_name_en AS stationNameEn," +
373 " s.station_route_code as stationRouteCode," + 377 " s.station_route_code as stationRouteCode," +
374 " s.industry_code as industryCode," + 378 " s.industry_code as industryCode," +
375 " s.line_code AS stationRouteLIneCode," + 379 " s.line_code AS stationRouteLIneCode," +
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
  View file @5d83333
@@ -351,6 +351,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl<StationRoute, Integ @@ -351,6 +351,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl<StationRoute, Integ
351 tempM.put("stationDescriptions", stationList.get(i)[31]); 351 tempM.put("stationDescriptions", stationList.get(i)[31]);
352 // 行业标准 352 // 行业标准
353 tempM.put("industryCode", stationList.get(i)[32]); 353 tempM.put("industryCode", stationList.get(i)[32]);
  354 + tempM.put("stationNameEn", stationList.get(i)[33]);
354 tempM.put("zdmc", stationList.get(i)[3]); 355 tempM.put("zdmc", stationList.get(i)[3]);
355 tempM.put("text", stationList.get(i)[3]); 356 tempM.put("text", stationList.get(i)[3]);
356 tempM.put("icon", "fa fa-bus"); 357 tempM.put("icon", "fa fa-bus");
@@ -682,6 +683,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl<StationRoute, Integ @@ -682,6 +683,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl<StationRoute, Integ
682 tempM.put("zdmc", objects.get(i)[40]); 683 tempM.put("zdmc", objects.get(i)[40]);
683 // 行业编码 684 // 行业编码
684 tempM.put("industryCode", objects.get(i)[41]); 685 tempM.put("industryCode", objects.get(i)[41]);
  686 + tempM.put("stationNameEn", objects.get(i)[42]);
685 687
686 resultList.add(tempM); 688 resultList.add(tempM);
687 } 689 }
src/main/resources/static/pages/base/stationroute/js/stationroute-list-function.js
  View file @5d83333
@@ -515,6 +515,8 @@ var PublicFunctions = function () { @@ -515,6 +515,8 @@ var PublicFunctions = function () {
515 $('#zdmcInput').val(editStationParmas.stationStationName); 515 $('#zdmcInput').val(editStationParmas.stationStationName);
516 // 获取站点路由名称元素设值 516 // 获取站点路由名称元素设值
517 $('#stationNameInput').val(editStationParmas.stationStationName); 517 $('#stationNameInput').val(editStationParmas.stationStationName);
  518 + // 获取站点路由名称元素设值
  519 + $('#stationNameEnInput').val(editStationParmas.stationNameEn);
518 // 获取站点编码元素设值 520 // 获取站点编码元素设值
519 $('#stationCodInput').val(editStationParmas.stationCode); 521 $('#stationCodInput').val(editStationParmas.stationCode);
520 // 获取站点类型元素设值 522 // 获取站点类型元素设值