潘钊 / control_service_data_Interface · Commits

Commit 30fb7355c21ec524006cfd3581b49002688275b2

Authored by 娄高锋
1 parent eb82d022
build: skipped

修BUG

Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
  View file @30fb735
@@ -2163,7 +2163,7 @@ public class BigscreenService { @@ -2163,7 +2163,7 @@ public class BigscreenService {
2163 for(ScheduleRealInfo s : findAll){ 2163 for(ScheduleRealInfo s : findAll){
2164 if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路 2164 if(s.getXlBm() != null && yyLine.contains(s.getXlBm())){//营运线路
2165 if(!isInOut(s) && !s.isCcService() && s.getStatus() != -1 && s.getStatus() != 0){ 2165 if(!isInOut(s) && !s.isCcService() && s.getStatus() != -1 && s.getStatus() != 0){
2166 - if(s.getGsBm()!=null && sortMap.get(gsMap.get(s.getGsBm())!=null?s.getGsBm():"") != null){ 2166 + if(s.getGsBm()!=null && sortMap.get(gsMap.get(s.getGsBm()!=null?s.getGsBm():"")) != null){
2167 Map<String, Object> m = resList.get(sortMap.get(gsMap.get(s.getGsBm()))); 2167 Map<String, Object> m = resList.get(sortMap.get(gsMap.get(s.getGsBm())));
2168 ++jh; 2168 ++jh;
2169 mapPut(m, "bcs", 1); 2169 mapPut(m, "bcs", 1);
@@ -2202,8 +2202,8 @@ public class BigscreenService { @@ -2202,8 +2202,8 @@ public class BigscreenService {
2202 m.put("gpzdl", new BigDecimal(m.get("jhgpqqbc").toString()).doubleValue()>0? 2202 m.put("gpzdl", new BigDecimal(m.get("jhgpqqbc").toString()).doubleValue()>0?
2203 new BigDecimal(m.get("sjgpqqzd").toString()).divide(new BigDecimal(m.get("jhgpqqbc").toString()), 2203 new BigDecimal(m.get("sjgpqqzd").toString()).divide(new BigDecimal(m.get("jhgpqqbc").toString()),
2204 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0"); 2204 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
2205 - m.put("qkl", new BigDecimal(m.get("bcs").toString()).doubleValue()>0?  
2206 - new BigDecimal(m.get("qks").toString()).divide(new BigDecimal(m.get("bcs").toString()), 2205 + m.put("qkl", new BigDecimal(m.get("bcs")!=null?m.get("bcs").toString():"0").doubleValue()>0?
  2206 + new BigDecimal(m.get("qks")!=null?m.get("qks").toString():"0").divide(new BigDecimal(m.get("bcs").toString()),
2207 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0"); 2207 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).doubleValue():"0");
2208 } 2208 }
2209 2209