青浦调度，行车路单子任务排序方式修改（外加结束时间排序），实际进出场公里计算问题；班次日报表路牌拆分公里。

娄高锋
1 parent 69bcccea
Showing 3 changed files with 27 additions and 18 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/util/ComparableChild.java
@@ -3035,8 +3035,9 @@ public class FormsServiceImpl implements FormsService {
 				return daily;
 			}
 		});
-		List<Ylb> listYlb= ylbRepository.obtainYl(map.get("date").toString(), "", "", xlbm, "", "xlbm");
-		List<Dlb> listDlb= dlbRepository.obtainDl(map.get("date").toString(), "", "", xlbm, "", "xlbm");
+		//青浦油电入库方式不一样
+//		List<Ylb> listYlb= ylbRepository.obtainYl(map.get("date").toString(), "", "", xlbm, "", "xlbm");
+//		List<Dlb> listDlb= dlbRepository.obtainDl(map.get("date").toString(), "", "", xlbm, "", "xlbm");
  
 		List<ScheduleRealInfo> lists=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(map.get("line").toString(), map.get("date").toString());
 		for(int i=0;i<list.size();i++){
@@ -3044,23 +3045,25 @@ public class FormsServiceImpl implements FormsService {
 			List<ScheduleRealInfo> sList = new ArrayList<ScheduleRealInfo>();
 			Daily d=list.get(i);
 			Double yh=0.0;
-			for (int j = 0; j < listYlb.size(); j++) {
-				Ylb y=listYlb.get(j);
-				if(y.getNbbm().equals(d.getZbh())&& y.getJsy().equals(d.getJgh())){
-					yh=Arith.add(yh, y.getYh());
-				}
-			}
-			
-			for (int j = 0; j < listDlb.size(); j++) {
-				Dlb b=listDlb.get(j);
-				if(b.getNbbm().equals(d.getZbh())&& b.getJsy().equals(d.getJgh())){
-					yh=Arith.add(yh, b.getHd());
-				}
-			}
+			//青浦油电入库方式不一样
+//			for (int j = 0; j < listYlb.size(); j++) {
+//				Ylb y=listYlb.get(j);
+//				if(y.getNbbm().equals(d.getZbh())&& y.getJsy().equals(d.getJgh())){
+//					yh=Arith.add(yh, y.getYh());
+//				}
+//			}
+//			
+//			for (int j = 0; j < listDlb.size(); j++) {
+//				Dlb b=listDlb.get(j);
+//				if(b.getNbbm().equals(d.getZbh())&& b.getJsy().equals(d.getJgh())){
+//					yh=Arith.add(yh, b.getHd());
+//				}
+//			}
 			d.setYh(Arith.round(yh, 3) + "");
 			for (int j = 0; j < lists.size(); j++) {
 				ScheduleRealInfo s=lists.get(j);
-				if(d.getJgh().equals(s.getjGh()) && d.getZbh().equals(s.getClZbh())){
+				if(d.getJgh().equals(s.getjGh()) && d.getZbh().equals(s.getClZbh())
+						&& d.getLp().equals(s.getLpName())){
  
 					zList.add(s);
  
@@ -4495,7 +4495,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
           double addMileage = 0, remMileage = 0, sjssgl = 0;
           Map<String, Object> map = new HashMap<String, Object>();
           jhlc = culateMieageService.culateJhgl(lists);
-          jcclc = culateMieageService.culateJccgl(lists);
+          jcclc = culateMieageService.culateJccgl(lists_sj);
           jhzks = culateMieageService.culateJhJccgl(lists);
           jhjcclc = culateMieageService.culateJhJccgl_real(lists);
           remMileage = culateMieageService.culateLbgl(lists);
@@ -10,7 +10,13 @@ public class ComparableChild implements Comparator&lt;ChildTaskPlan&gt;{
 	@Override
 	public int compare(ChildTaskPlan o1, ChildTaskPlan o2) {
 		// TODO Auto-generated method stub
-		return o1.getStartDate().compareTo(o2.getStartDate());
+		//子任务按开始时间、结束时间排序
+		int a = o1.getStartDate().compareTo(o2.getStartDate());
+		if(a == 0){
+			return o1.getEndDate().compareTo(o2.getEndDate());
+		} else {
+			return a;
+		}
 	}
  
 }