Commit 5e58c7bf3c30249d4d0e597c9e5dafbd7f6dae49
1 parent
6d3954cf
修改票价为整型
Showing
4 changed files
with
5 additions
and
6 deletions
src/main/java/com/bsth/entity/Line.java
| @@ -164,7 +164,7 @@ public class Line implements Serializable { | @@ -164,7 +164,7 @@ public class Line implements Serializable { | ||
| 164 | /** 是否在使用 <1:是;0:否> bit length(50) */ | 164 | /** 是否在使用 <1:是;0:否> bit length(50) */ |
| 165 | private Integer inUse; | 165 | private Integer inUse; |
| 166 | 166 | ||
| 167 | - private Double ticketPrice; | 167 | + private int ticketPrice = 0; |
| 168 | 168 | ||
| 169 | /** | 169 | /** |
| 170 | * 逻辑删除标记 为 1:标识已删除 | 170 | * 逻辑删除标记 为 1:标识已删除 |
| @@ -519,11 +519,11 @@ public class Line implements Serializable { | @@ -519,11 +519,11 @@ public class Line implements Serializable { | ||
| 519 | this.remove = remove; | 519 | this.remove = remove; |
| 520 | } | 520 | } |
| 521 | 521 | ||
| 522 | - public Double getTicketPrice() { | 522 | + public int getTicketPrice() { |
| 523 | return ticketPrice; | 523 | return ticketPrice; |
| 524 | } | 524 | } |
| 525 | 525 | ||
| 526 | - public void setTicketPrice(Double ticketPrice) { | 526 | + public void setTicketPrice(int ticketPrice) { |
| 527 | this.ticketPrice = ticketPrice; | 527 | this.ticketPrice = ticketPrice; |
| 528 | } | 528 | } |
| 529 | 529 |
src/main/java/com/bsth/repository/LineRepository.java
| @@ -67,7 +67,7 @@ public interface LineRepository extends BaseRepository<Line, Integer> { | @@ -67,7 +67,7 @@ public interface LineRepository extends BaseRepository<Line, Integer> { | ||
| 67 | String endStationFirstTime, String endStationEndTime, Integer linePlayType, Date openDate, String es, | 67 | String endStationFirstTime, String endStationEndTime, Integer linePlayType, Date openDate, String es, |
| 68 | String shortName, String shanghaiLinecode, String eqLinecode, String startPhone, String endPhone, | 68 | String shortName, String shanghaiLinecode, String eqLinecode, String startPhone, String endPhone, |
| 69 | Integer carSumNumber, Integer hvacCarNumber, Integer ordCarNumber, String history, String descriptions, | 69 | Integer carSumNumber, Integer hvacCarNumber, Integer ordCarNumber, String history, String descriptions, |
| 70 | - Integer destroy, Integer supperLine, Integer spacGrade, Integer warrantCar, String lineCode, Integer region, Integer inUser, Double ticketPrice); | 70 | + Integer destroy, Integer supperLine, Integer spacGrade, Integer warrantCar, String lineCode, Integer region, Integer inUser, int ticketPrice); |
| 71 | 71 | ||
| 72 | /** | 72 | /** |
| 73 | * 查询线路版本文件 | 73 | * 查询线路版本文件 |
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
| @@ -936,7 +936,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl<StationRoute, Integ | @@ -936,7 +936,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl<StationRoute, Integ | ||
| 936 | } catch (Exception e) { | 936 | } catch (Exception e) { |
| 937 | } | 937 | } |
| 938 | 938 | ||
| 939 | - String head = lineName + " " + fileVersions + " " + line.getStartStationFirstTime() + "-" + line.getStartStationEndTime() + " " + line.getEndStationFirstTime() + "-" + line.getEndStationEndTime() + " " + (line.getTicketPrice() == null ? "-" : line.getTicketPrice()) + " " + company.getBusinessName() + " " + (company.getPhoneNum()== null ? "-" : company.getPhoneNum()); | 939 | + String head = lineName + " " + fileVersions + " " + line.getStartStationFirstTime() + "-" + line.getStartStationEndTime() + " " + line.getEndStationFirstTime() + "-" + line.getEndStationEndTime() + " " + line.getTicketPrice() + " " + company.getBusinessName() + " " + (company.getPhoneNum()== null ? "-" : company.getPhoneNum()); |
| 940 | 940 | ||
| 941 | textStr = head +"\r\n" + textStr; | 941 | textStr = head +"\r\n" + textStr; |
| 942 | 942 |
src/main/resources/static/pages/base/stationroute/editRoute.html
| @@ -227,7 +227,6 @@ $('#edit_route_mobal').on('editRouteMobal.show', function(e,WorldsBMap,GetAjaxDa | @@ -227,7 +227,6 @@ $('#edit_route_mobal').on('editRouteMobal.show', function(e,WorldsBMap,GetAjaxDa | ||
| 227 | 227 | ||
| 228 | }, | 228 | }, |
| 229 | submitHandler : function(f) { | 229 | submitHandler : function(f) { |
| 230 | - debugger; | ||
| 231 | // 隐藏弹出层 | 230 | // 隐藏弹出层 |
| 232 | $('#edit_route_mobal').modal('hide'); | 231 | $('#edit_route_mobal').modal('hide'); |
| 233 | // 原坐标类型 | 232 | // 原坐标类型 |