路单数据里程

廖磊
1 parent 59d320de
Showing 1 changed file with 13 additions and 4 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
@@ -734,19 +734,28 @@ public class FormsServiceImpl implements FormsService {
 					String line=y.getXlbm();
 					String clzbh=y.getNbbm();
 					List<ScheduleRealInfo>  newList=new ArrayList<ScheduleRealInfo>();
+					List<ScheduleRealInfo>  newList_=new ArrayList<ScheduleRealInfo>();
 					for (int j = 0; j < listReal.size(); j++) {
 						ScheduleRealInfo s=listReal.get(j);
 						if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh)
 								&&s.getXlBm().equals(line)){
 							newList.add(s);
+							 Set<ChildTaskPlan> cts = s.getcTasks();
+				            if(cts != null && cts.size() > 0){
+				            	newList_.add(s);
+				            }else{
+					            if(s.getZdsjActual()!=null){
+					            	newList_.add(s);
+					            }
+				            }
 						}
 					}
 					double jhgl=culateMileageService.culateJhgl(newList);
 					double jhjcc=culateMileageService.culateJhJccgl(newList);
-					double yygl=culateMileageService.culateSjgl(newList);
-					double ljgl=culateMileageService.culateLjgl(newList);
-					double ksgl=culateMileageService.culateKsgl(newList);
-					double jcgl=culateMileageService.culateJccgl(newList);
+					double yygl=culateMileageService.culateSjgl(newList_);
+					double ljgl=culateMileageService.culateLjgl(newList_);
+					double ksgl=culateMileageService.culateKsgl(newList_);
+					double jcgl=culateMileageService.culateJccgl(newList_);
 					double zyygl=Arith.add(yygl, ljgl);
 					double zksgl=Arith.add(ksgl, jcgl);