行车路单批量导出修正油耗电耗统计

娄高锋
1 parent e07a7ba9
Showing 1 changed file with 16 additions and 6 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
@@ -1843,7 +1843,16 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				}
 			}
-			sjlc = new BigDecimal(culateService.culateSjgl(keyMap.get(key)) + culateService.culateLjgl(keyMap.get(key)));
+			List<ScheduleRealInfo> tempList = new ArrayList<ScheduleRealInfo>();
+			for(ScheduleRealInfo s : keyMap.get(key)){
+				if(s.getcTasks() != null && s.getcTasks().size() > 0){
+					tempList.add(s);
+				} else if(s.getZdsjActual() != null && s.getFcsjActual() != null){
+					tempList.add(s);
+				}
+			}
+			
+			sjlc = new BigDecimal(culateService.culateSjgl(tempList) + culateService.culateLjgl(tempList));
 			lzlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "路阻"));
 			dmlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "吊慢"));
 			gzlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "故障"));
@@ -2421,13 +2430,13 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 	        }
 	        for(Ylb ylb : queryYlbByRqXlbm){
-	        	String key = sdfMonth.format(ylb.getRq()) + ylb.getXlbm();
+	        	String key = ylb.getJsy() + ylb.getNbbm();
 	        	if(!ylbMap.containsKey(key))
 	        		ylbMap.put(key, new ArrayList<Ylb>());
 	        	ylbMap.get(key).add(ylb);
 	        }
 	        for(Dlb dlb : queryDlbByRqXlbm){
-	        	String key = sdfMonth.format(dlb.getRq()) + dlb.getXlbm();
+	        	String key = dlb.getJsy() + dlb.getNbbm();
 	        	if(!dlbMap.containsKey(key))
 	        		dlbMap.put(key, new ArrayList<Dlb>());
 	        	dlbMap.get(key).add(dlb);
@@ -2480,8 +2489,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 //		        ScheduleRealInfo s = scheduleRealInfoRepository.scheduleById(scheduleRealInfos.get(0).getId());
 		        ScheduleRealInfo s = scheduleRealInfos.get(0);
-		        String xlbm = s.getXlBm();
 		        String fcrq = s.getScheduleDateStr();
+		        String jsy = s.getjGh();
+		        String nbbm = s.getClZbh();
 		        int type = 0;
 		        Double ccyl = 0.0;
@@ -2491,8 +2501,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		        Double zlc = 0.0;
 //		        List<Ylb> listYlb = ylbRepository.queryListYlb(fcrq, s.getClZbh(), s.getjGh(),xlbm);
 //		        List<Dlb> listDlb = dlbRepository.queryListDlb(fcrq, s.getClZbh(), s.getjGh(),xlbm);
-		        List<Ylb> listYlb = ylbMap.get(fcrq + xlbm);
-		        List<Dlb> listDlb = dlbMap.get(fcrq + xlbm);
+		        List<Ylb> listYlb = ylbMap.get(jsy + nbbm);
+		        List<Dlb> listDlb = dlbMap.get(jsy + nbbm);
 //		        List<Cars> listCars = carsRepository.findCarsByCode(s.getClZbh());
 		        List<Cars> listCars = carMap.get(s.getClZbh());