潘钊 / bsth_control · Commits

Commit 3c11b895ecaa27b5ab86bdce22ab80a7ce9bff93

Authored by 廖磊
1 parent ab516479

批量导出

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
  View file @3c11b89
@@ -2528,7 +2528,7 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -2528,7 +2528,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
2528 Map<String, Object> Map = new HashMap<String, Object>(); 2528 Map<String, Object> Map = new HashMap<String, Object>();
2529 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); 2529 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
2530 // ScheduleRealInfo s = scheduleRealInfoRepository.scheduleById(scheduleRealInfos.get(0).getId()); 2530 // ScheduleRealInfo s = scheduleRealInfoRepository.scheduleById(scheduleRealInfos.get(0).getId());
2531 - ScheduleRealInfo s = lists.get(0); 2531 + ScheduleRealInfo s = scheduleRealInfos.get(0);
2532 String fcrq = s.getScheduleDateStr(); 2532 String fcrq = s.getScheduleDateStr();
2533 String jsy = s.getjGh(); 2533 String jsy = s.getjGh();
2534 String nbbm = s.getClZbh(); 2534 String nbbm = s.getClZbh();
@@ -2604,7 +2604,7 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -2604,7 +2604,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
2604 Map.put("xlName", s.getXlName()); 2604 Map.put("xlName", s.getXlName());
2605 Map.put("clZbh", s.getClZbh()); 2605 Map.put("clZbh", s.getClZbh());
2606 Map.put("plate", BasicData.nbbmCompanyPlateMap.get(s.getClZbh())); 2606 Map.put("plate", BasicData.nbbmCompanyPlateMap.get(s.getClZbh()));
2607 - Map.put("fcsjActual", s.getFcsjActual()); 2607 + Map.put("fcsjActual", s.getFcsjActual()==null?"":s.getFcsjActual());
2608 Map.put("zdzName", s.getZdzName()); 2608 Map.put("zdzName", s.getZdzName());
2609 Map.put("scheduleDate", s.getScheduleDateStr()); 2609 Map.put("scheduleDate", s.getScheduleDateStr());
2610 Map.put("lpName", s.getLpName()); 2610 Map.put("lpName", s.getLpName());