潘钊 / bsth_control · Commits

Commit 14f7036bda0dba7780b2b9b62c10ffb15ebf1350

Authored by 廖磊
1 parent 4ac76536
build: skipped

大间隔统计表修改

Inline Side-by-side
Showing 2 changed files with 7 additions and 5 deletions
src/main/java/com/bsth/entity/calc/CalcInterval.java
  View file @14f7036
... ... @@ -34,7 +34,7 @@ public class CalcInterval {
34 34 /*大间隔等级*/
35 35 private String level;
36 36 /*等级具体时间*/
37   - private Integer levelTime;
  37 + private Double levelTime;
38 38 /*全日大间隔次数*/
39 39 private Integer djgAll;
40 40 /*高峰大间隔次数*/
... ... @@ -102,10 +102,10 @@ public class CalcInterval {
102 102 public void setLevel(String level) {
103 103 this.level = level;
104 104 }
105   - public Integer getLevelTime() {
  105 + public Double getLevelTime() {
106 106 return levelTime;
107 107 }
108   - public void setLevelTime(Integer levelTime) {
  108 + public void setLevelTime(Double levelTime) {
109 109 this.levelTime = levelTime;
110 110 }
111 111 public Integer getDjgAll() {
... ...
src/main/java/com/bsth/service/calc/impl/CalcIntervalServiceImpl.java
  View file @14f7036
... ... @@ -325,11 +325,13 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege
325 325 }
326 326 if(s.getBcType().equals("region")){
327 327 if(s.getXlDir().equals("0")){
328   - if(s.getQdzName().equals(line.getStartStationName()));
  328 + if(s.getQdzName().equals(line.getStartStationName())){
329 329 fage=true;
  330 + }
330 331 }else{
331   - if(s.getQdzName().equals(line.getEndStationName()));
  332 + if(s.getQdzName().equals(line.getEndStationName())){
332 333 fage=true;
  334 + }
333 335 }
334 336 }
335 337 if (fage) {
... ...