充电量月报表改为以路单为主

yiming
1 parent 2df18a06
Showing 1 changed file with 7 additions and 6 deletions
src/main/java/com/bsth/service/impl/RefuelServiceImpl.java
 package com.bsth.service.impl;
 import com.bsth.common.ResponseCode;
+import com.bsth.data.BasicData;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Refuel;
 import com.bsth.entity.oil.JdlReception;
@@ -1483,7 +1484,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 		String dateS=map.get("dateS");
 		String dateE=map.get("dateE");
 		List<JdlReception> jdlReceptions=jdlReceptionRepository.queryListByDateStr(dateS,dateE);
-		Set<String> carSet = new HashSet<>();
+		/*Set<String> carSet = new HashSet<>();
 		Set<String> stationSet = new HashSet<>();
 		Map<String,String> carPlate = new HashMap<>();
 		for (JdlReception jdlReception : jdlReceptions) {
@@ -1496,15 +1497,15 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 			}
 		}
-		List<String> cars = new ArrayList<>(carSet);
+		List<String> cars = new ArrayList<>(carSet);*/
 		List<String> stations = Arrays.asList(JdlReception.parks);
 		//路单分组
 		List<ScheduleRealInfo> realInfos=repository.scheduleByDate(dateS,dateE);
 		Map<String,List<ScheduleRealInfo>> sMap=realInfos.stream().collect(Collectors.groupingBy(ScheduleRealInfo::getClZbh));
-
+		Set<String> carSet =sMap.keySet();
 		//给每个站充电量赋默认值
 		Map<String, Map<String, Double>> matrix = new LinkedHashMap<>();
-		for (String car : cars) {
+		for (String car : carSet) {
 			Map<String, Double> stationMap = new HashMap<>();
 			for (String station : stations) {
 				stationMap.put(station, 0.00);
@@ -1528,9 +1529,9 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 		}
 		//数据统计
-		for (String car : cars) {
+		for (String car : carSet) {
 			Map<String, Object> row = new LinkedHashMap<>();
-			row.put("plate", carPlate.get(car));
+			row.put("plate", BasicData.nbbmCompanyPlateMap.get(car));
 			row.put("car", car);
 			String realMileage ="0";
 			List<ScheduleRealInfo> list = sMap.get(car);