Commit 764d8208d808891a378b4735dfa0dbc3eac5c061
1 parent
c41398eb
发车到站准点率报表,成都准点规则改为快2慢3。
Showing
2 changed files
with
9 additions
and
3 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
| @@ -3157,12 +3157,15 @@ public class BusIntervalServiceImpl implements BusIntervalService { | @@ -3157,12 +3157,15 @@ public class BusIntervalServiceImpl implements BusIntervalService { | ||
| 3157 | long fcsjA = Long.valueOf(split2[0])*60 + Long.valueOf(split2[1]); | 3157 | long fcsjA = Long.valueOf(split2[0])*60 + Long.valueOf(split2[1]); |
| 3158 | if(fcsj > 23*60 && fcsjA < 60) | 3158 | if(fcsj > 23*60 && fcsjA < 60) |
| 3159 | fcsjA += 1440; | 3159 | fcsjA += 1440; |
| 3160 | - if(fcsjA - fcsj <= 3 && fcsjA - fcsj >= -1){ | 3160 | + if(fcsjA - fcsj <= 5 && fcsjA - fcsj >= -2){ // 250611成都发车准点率使用快2慢5 |
| 3161 | temp.put("fcsjzd", "准点"); | 3161 | temp.put("fcsjzd", "准点"); |
| 3162 | } else { | 3162 | } else { |
| 3163 | temp.put("fcsjzd", "不准点"); | 3163 | temp.put("fcsjzd", "不准点"); |
| 3164 | temp.put("fcsjflag", 1); | 3164 | temp.put("fcsjflag", 1); |
| 3165 | } | 3165 | } |
| 3166 | + } else { | ||
| 3167 | + temp.put("fcsjzd", "不准点"); | ||
| 3168 | + temp.put("fcsjflag", 1); | ||
| 3166 | } | 3169 | } |
| 3167 | if(s.getZdsj() != null && s.getZdsjActual()!=null){ | 3170 | if(s.getZdsj() != null && s.getZdsjActual()!=null){ |
| 3168 | String[] split1 = s.getZdsj().split(":"); | 3171 | String[] split1 = s.getZdsj().split(":"); |
| @@ -3171,12 +3174,15 @@ public class BusIntervalServiceImpl implements BusIntervalService { | @@ -3171,12 +3174,15 @@ public class BusIntervalServiceImpl implements BusIntervalService { | ||
| 3171 | long zdsjA = Long.valueOf(split2[0])*60 + Long.valueOf(split2[1]); | 3174 | long zdsjA = Long.valueOf(split2[0])*60 + Long.valueOf(split2[1]); |
| 3172 | if(zdsj > 23*60 && zdsjA < 60) | 3175 | if(zdsj > 23*60 && zdsjA < 60) |
| 3173 | zdsjA += 1440; | 3176 | zdsjA += 1440; |
| 3174 | - if(zdsjA - zdsj <= 3 && zdsjA - zdsj >= -1){ | 3177 | + if(zdsjA - zdsj <= 5 && zdsjA - zdsj >= -2){ // 250611成都发车准点率使用快2慢5 |
| 3175 | temp.put("zdsjzd", "准点"); | 3178 | temp.put("zdsjzd", "准点"); |
| 3176 | } else { | 3179 | } else { |
| 3177 | temp.put("zdsjzd", "不准点"); | 3180 | temp.put("zdsjzd", "不准点"); |
| 3178 | temp.put("zdsjflag", 1); | 3181 | temp.put("zdsjflag", 1); |
| 3179 | } | 3182 | } |
| 3183 | + } else { | ||
| 3184 | + temp.put("zdsjzd", "不准点"); | ||
| 3185 | + temp.put("zdsjflag", 1); | ||
| 3180 | } | 3186 | } |
| 3181 | tempList.add(temp); | 3187 | tempList.add(temp); |
| 3182 | } | 3188 | } |
src/main/resources/static/pages/punctual/onTime.html