实际班次

廖磊
1 parent f353ea27
Showing 1 changed file with 16 additions and 2 deletions
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
@@ -460,7 +460,21 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 					if(!time.equals("")){
 						String[] fcsjStr = time.split(":");
 						long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
-						if(childTaskPlans.isEmpty()){
+						if(scheduleRealInfo.getStatus()!=-1){
+							if(item.equals("zgf")){
+								if(fcsj>=zgf1 && fcsj<=zgf2){
+									sjbc++;
+								}
+							}else if(item.equals("wgf")){
+								if(fcsj>=wgf1 && fcsj<=wgf2){
+									sjbc++;
+								}
+							}else{
+								sjbc++;
+							}
+							
+						}
+						/*if(childTaskPlans.isEmpty()){
 							if(scheduleRealInfo.getStatus()!=-1){
 								if(item.equals("zgf")){
 									if(fcsj>=zgf1 && fcsj<=zgf2){
@@ -515,7 +529,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 									sjbc++;
 								}
 							}
-						}
+						}*/
 					}
 				}
 			}