Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

潘钊
2 parents 33a5ac15 21dfa3a7
Showing 2 changed files with 7 additions and 3 deletions
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
src/main/java/com/bsth/service/report/impl/SheetServiceImpl.java
@@ -593,7 +593,8 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 							while (it.hasNext()) {
 								ChildTaskPlan childTaskPlan = it.next();
 								if (childTaskPlan.getMileageType().equals("service")
-										&& "正常".equals(childTaskPlan.getType1())) {
+										&& "正常".equals(childTaskPlan.getType1())
+										&& childTaskPlan.getCcId()==null) {
 									if (!childTaskPlan.isDestroy()) {
 										Float jhgl = childTaskPlan.getMileage() == null ? 0
 												: childTaskPlan.getMileage();
@@ -769,7 +770,8 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 				xxkzgf=0,xxkwgf=0,xxm=0,xxmzgf=0,xxmwgf=0;
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo s=lists.get(i);
-			if(s.getFcsjActual()!=null){
+			if(s.getFcsjActual()!=null && !s.isCcService()
+					&& !isInOut(s)){
 				String xlDir=s.getXlDir();
 				String fcsjs=s.getFcsj();
 				String[] fcsjStr = fcsjs.split(":");
@@ -779,7 +781,6 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 				long fcsjActual = Long.parseLong(fcsjActualsStr[0]) * 60 + Long.parseLong(fcsjActualsStr[1]);
 				if("0".equals(xlDir)){
-					
 					if(fcsj-fcsjActual>1){
 						sxk++;
 						if(fcsj>zgf1&&fcsj<zgf2)
@@ -80,6 +80,9 @@ public class SheetServiceImpl extends BaseServiceImpl&lt;Sheet, Integer&gt; implements
 		if(s.getBcType().equals("ldks")){
 			fage=true;
 		}
+		if(s.isCcService()){
+			fage=true;
+		}
 		return fage;
 	}