LGF 更新行车路单导出

娄高锋
1 parent 8aebb0a7
Showing 1 changed file with 15 additions and 10 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -2365,7 +2365,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 //		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
 		int jhbc = 0,cjbc = 0,ljbc = 0;
 		double jhlc = 0, yygl = 0, ksgl = 0,tempJhlc = 0,jcclc=0;
-		float addMileage = 0l,remMileage = 0l;
+		float addMileage = 0l,remMileage = 0l, addgl = 0, remgl = 0;
 		int xyz=1;
 		Map<String,Object> map;
 		for(ScheduleRealInfo scheduleRealInfo : scheduleRealInfos){
@@ -2375,6 +2375,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 					//烂班里程（主任务烂班），
 					//临加里程（主任务临加），
 					//计划班次，烂班班次，增加班次
+					double jh = 0, sj = 0;
 					tempJhlc = scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
 					if(scheduleRealInfo.isSflj()){
 						ljbc++;
@@ -2382,7 +2383,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 						if( !(scheduleRealInfo.getBcType().equals("in")
 								||scheduleRealInfo.getBcType().equals("out")) ){
 							jhbc++;
-							jhlc += tempJhlc;
+							jh += tempJhlc;
 						}
 						if(scheduleRealInfo.getStatus() == -1){
 							remMileage += tempJhlc;
@@ -2405,7 +2406,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 								if(scheduleRealInfo.isSflj()){
 									addMileage += tempJhlc;
 								}
-								yygl += tempJhlc;
+								sj += tempJhlc;
 							}
 						}	
 					}else{
@@ -2429,7 +2430,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 									if(scheduleRealInfo.isSflj()){
 										addMileage += tempJhlc;
 									}
-									yygl += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+									sj += childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
 								}
 							}
 						}
@@ -2480,6 +2481,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 							e.printStackTrace();
 						} 
 					}
+					jhlc += jh;
+					yygl += sj;
+					if(jh > sj){
+						remgl += jh - sj;
+					} else {
+						addgl += sj - jh;
+					}
 			}
 		}
@@ -2496,18 +2504,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		map.put("jzl", jzl);
 		map.put("jhlc", format.format(jhlc+jcclc));
 		map.put("yygljh", format.format(jhlc));
-		map.put("ssgl", format.format(remMileage));
+		map.put("ssgl", format.format(remgl));
 		map.put("ksgl", format.format(ksgl));
-//		map.put("yyglsj", format.format(yygl+remMileage));
 		map.put("yyglsj", format.format(yygl));
 		map.put("jhbc", jhbc);
 		map.put("jcclc", jcclc);
-		map.put("ljgl", format.format(addMileage));
+		map.put("ljgl", format.format(addgl));
 		map.put("ssbc", cjbc);
 		map.put("ysgl", format.format(yygl));
 		map.put("sjbc", jhbc-cjbc+ljbc);
-//		map.put("zgl", format.format(yygl+remMileage+ksgl+jcclc));
 		map.put("zgl", format.format(yygl+ksgl+jcclc));
 		map.put("ljbc", ljbc);
 		String zdp="",zwdp="",wdp="";
@@ -2559,8 +2565,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 //		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
 		int jhbc = 0,cjbc = 0,ljbc = 0;
 		double jhlc = 0, yygl = 0, ksgl = 0,tempJhlc = 0,jcclc=0;
-		float addMileage = 0l,remMileage = 0l;
-		float addgl = 0, remgl = 0;
+		float addMileage = 0l,remMileage = 0l, addgl = 0, remgl = 0;
 		Map<String,Object> map = new HashMap<String, Object>();
 		for(ScheduleRealInfo scheduleRealInfo : list){
 			if(scheduleRealInfo != null){