行车路单实际班次

廖磊
1 parent 3927835c
Showing 2 changed files with 4 additions and 5 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
@@ -3611,7 +3611,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             Long fcsj3 = sdf.parse(fcrq + " 23:59").getTime();
             for (int i = 0; i < list.size(); i++) {
                 DutyEmployee t = list.get(i);
-                if(!(dbdp.indexOf(",")>0)){
+                if(dbdp.indexOf(t.getuName()) == -1){
                     if(!(dbdp.length()>0)){
                         dbdp  =t.getuName();
                     }else{
@@ -425,7 +425,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 							if(scheduleRealInfo.getStatus() == -1){
 								boolean fage=false;
 								Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-								if(it.hasNext()){
+								while(it.hasNext()){
 									ChildTaskPlan childTaskPlan = it.next();
 									if(!childTaskPlan.isDestroy()){
 										if(childTaskPlan.getMileageType().equals("service")){
@@ -448,8 +448,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 									}
 								}
-							}
-							/*else{
+							}else{
 								if(item.equals("zgf")){
 									if(fcsj>=zgf1 && fcsj<=zgf2){
 										sjbc++;
@@ -461,7 +460,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 								}else{
 									sjbc++;
 								}
-							}*/
+							}
 						}
 					}
 				}