纯油车日报表、纯电车日报表、纯氢车日报表，优化未执行班次公里统计，不同线路相同人车被分组到一起的问题处理。

娄高锋
1 parent f2bd39ce
Showing 1 changed file with 62 additions and 23 deletions
src/main/java/com/bsth/service/impl/RefuelServiceImpl.java
@@ -425,7 +425,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 		for(ScheduleRealInfo s : scheList){
 			if(s.getClZbh() != null && nbbms.contains(s.getClZbh())){
 				if(s.getClZbh().length() > 0 && s.getjGh() != null){
-					String key = s.getClZbh() + "/" + s.getjGh();
+					String key = s.getClZbh() + "/" + s.getjGh() + "/" + s.getXlBm() + "/" + s.getXlName(); // 因为是多选线路查询，防止相同人车在两个线路执行，分组时也加上线路
 					if(!(sMap.containsKey(key))){
 						sMap.put(key, new ArrayList<ScheduleRealInfo>());
 						sKeyList.add(key);
@@ -436,24 +436,37 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 		}
 		for(String key : sKeyList){
-			Map<String, Object> m = new HashMap<String, Object>();
 			List<ScheduleRealInfo> list2 = sMap.get(key);
+			Map<String, Object> m = new HashMap<String, Object>();
+			
+			List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>(); // 实际路单（已完成班次与烂班班次等）
+			for(ScheduleRealInfo s : list2){
+				Set<ChildTaskPlan> cts = s.getcTasks();
+	            if(cts != null && cts.size() > 0){
+	            	list_s.add(s);
+	            }else{
+		            if(s.getZdsjActual()!=null&& s.getFcsjActual()!=null){
+		            	list_s.add(s);
+		            }
+	            }
+			}
+			
 			String[] split = key.split("/");
 			String realMileage = "", oil = "0", addOil = "0", consume = "", cr = "";
 			String ksMileage = "", ssMileage = "", bc = "", jhbc = "", sjbc = "";
 			String remarks = "";
-			Double sjgl = culateMileageService.culateSjgl(list2);
-			Double ksgl = culateMileageService.culateKsgl(list2);
-			Double jccgl = culateMileageService.culateJccgl(list2);
-			Double ljgl = culateMileageService.culateLjgl(list2);
+			Double sjgl = culateMileageService.culateSjgl(list_s);
+			Double ksgl = culateMileageService.culateKsgl(list_s);
+			Double jccgl = culateMileageService.culateJccgl(list_s);
+			Double ljgl = culateMileageService.culateLjgl(list_s);
 			realMileage = add(add(sjgl, ksgl), add(jccgl, ljgl));
 			ksMileage = add(ksgl, jccgl);
 			ssMileage = "" + culateMileageService.culateLbgl(list2);
 			jhbc = "" + culateMileageService.culateJhbc(list2, "");
-			sjbc = "" + culateMileageService.culateSjbc(list2, "");
+			sjbc = "" + culateMileageService.culateSjbc(list_s, "");
 			bc = "" + list2.size();
 			cr = "1";
@@ -781,7 +794,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 		for(ScheduleRealInfo s : scheList){
 			if(s.getClZbh() != null && nbbms.contains(s.getClZbh())){
 				if(s.getClZbh().length() > 0 && s.getjGh() != null){
-					String key = s.getClZbh() + "/" + s.getLpName() + "/" + s.getjGh();
+					String key = s.getClZbh() + "/" + s.getLpName() + "/" + s.getjGh() + "/" + s.getXlBm() + "/" + s.getXlName(); // 因为是多选线路查询，防止相同人车在两个线路执行，分组时也加上线路
 					if(!(sMap.containsKey(key))){
 						sMap.put(key, new ArrayList<ScheduleRealInfo>());
 						sKeyList.add(key);
@@ -792,25 +805,38 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 		}
 		for(String key : sKeyList){
-			Map<String, Object> m = new HashMap<String, Object>();
 			List<ScheduleRealInfo> list2 = sMap.get(key);
+			Map<String, Object> m = new HashMap<String, Object>();
+			
+			List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>(); // 实际路单（已完成班次与烂班班次等）
+			for(ScheduleRealInfo s : list2){
+				Set<ChildTaskPlan> cts = s.getcTasks();
+	            if(cts != null && cts.size() > 0){
+	            	list_s.add(s);
+	            }else{
+		            if(s.getZdsjActual()!=null&& s.getFcsjActual()!=null){
+		            	list_s.add(s);
+		            }
+	            }
+			}
+			
 			String[] split = key.split("/");
 			String realMileage = "", ksMileage = "", ssMileage = "",
 					bc = "", jhbc = "", sjbc = "", ljbc = "", cr = "";
 			String remarks = "";
-			Double sjgl = culateMileageService.culateSjgl(list2);
-			Double ksgl = culateMileageService.culateKsgl(list2);
-			Double jccgl = culateMileageService.culateJccgl(list2);
-			Double ljgl = culateMileageService.culateLjgl(list2);
+			Double sjgl = culateMileageService.culateSjgl(list_s);
+			Double ksgl = culateMileageService.culateKsgl(list_s);
+			Double jccgl = culateMileageService.culateJccgl(list_s);
+			Double ljgl = culateMileageService.culateLjgl(list_s);
 			realMileage = add(add(sjgl, ksgl), add(jccgl, ljgl));
 			ksMileage = add(ksgl, jccgl);
 			ssMileage = "" + culateMileageService.culateLbgl(list2);
 			jhbc = "" + culateMileageService.culateJhbc(list2, "");
-			sjbc = "" + culateMileageService.culateSjbc(list2, "");
-			ljbc = "" + culateMileageService.culateLjbc(list2, "");
+			sjbc = "" + culateMileageService.culateSjbc(list_s, "");
+			ljbc = "" + culateMileageService.culateLjbc(list_s, "");
 			int bcInt = 0;
 			for(ScheduleRealInfo s : list2){
 				if(!s.isCcService() && s.getStatus() != -1){
@@ -968,7 +994,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 		for(ScheduleRealInfo s : scheList){
 			if(s.getClZbh() != null && nbbms.contains(s.getClZbh())){
 				if(s.getClZbh().length() > 0 && s.getjGh() != null){
-					String key = s.getClZbh() + "/" + s.getLpName() + "/" + s.getjGh();
+					String key = s.getClZbh() + "/" + s.getLpName() + "/" + s.getjGh() + "/" + s.getXlBm() + "/" + s.getXlName(); // 因为是多选线路查询，防止相同人车在两个线路执行，分组时也加上线路
 					if(!(sMap.containsKey(key))){
 						sMap.put(key, new ArrayList<ScheduleRealInfo>());
 						sKeyList.add(key);
@@ -979,25 +1005,38 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 		}
 		for(String key : sKeyList){
-			Map<String, Object> m = new HashMap<String, Object>();
 			List<ScheduleRealInfo> list2 = sMap.get(key);
+			Map<String, Object> m = new HashMap<String, Object>();
+			
+			List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>(); // 实际路单（已完成班次与烂班班次等）
+			for(ScheduleRealInfo s : list2){
+				Set<ChildTaskPlan> cts = s.getcTasks();
+	            if(cts != null && cts.size() > 0){
+	            	list_s.add(s);
+	            }else{
+		            if(s.getZdsjActual()!=null&& s.getFcsjActual()!=null){
+		            	list_s.add(s);
+		            }
+	            }
+			}
+			
 			String[] split = key.split("/");
 			String realMileage = "", ksMileage = "", ssMileage = "",
 					bc = "", jhbc = "", sjbc = "", ljbc = "", cr = "";
 			String remarks = "";
-			Double sjgl = culateMileageService.culateSjgl(list2);
-			Double ksgl = culateMileageService.culateKsgl(list2);
-			Double jccgl = culateMileageService.culateJccgl(list2);
-			Double ljgl = culateMileageService.culateLjgl(list2);
+			Double sjgl = culateMileageService.culateSjgl(list_s);
+			Double ksgl = culateMileageService.culateKsgl(list_s);
+			Double jccgl = culateMileageService.culateJccgl(list_s);
+			Double ljgl = culateMileageService.culateLjgl(list_s);
 			realMileage = add(add(sjgl, ksgl), add(jccgl, ljgl));
 			ksMileage = add(ksgl, jccgl);
 			ssMileage = "" + culateMileageService.culateLbgl(list2);
 			jhbc = "" + culateMileageService.culateJhbc(list2, "");
-			sjbc = "" + culateMileageService.culateSjbc(list2, "");
-			ljbc = "" + culateMileageService.culateLjbc(list2, "");
+			sjbc = "" + culateMileageService.culateSjbc(list_s, "");
+			ljbc = "" + culateMileageService.culateLjbc(list_s, "");
 			int bcInt = 0;
 			for(ScheduleRealInfo s : list2){
 				if(!s.isCcService() && s.getStatus() != -1){