添加子任务换车

计算添加实发添加

添加子任务换车
计算添加实发添加
廖磊
1 parent a257c2cb
Showing 6 changed files with 108 additions and 165 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/service/report/CulateMileageService.java
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/forms/statement/jobSummary.html
@@ -744,7 +744,7 @@ public class FormsServiceImpl implements FormsService {
 				            if(cts != null && cts.size() > 0){
 				            	newList_.add(s);
 				            }else{
-					            if(s.getZdsjActual()!=null){
+					            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 					            	newList_.add(s);
 					            }
 				            }
@@ -798,7 +798,7 @@ public class FormsServiceImpl implements FormsService {
 					            if(cts != null && cts.size() > 0){
 					            	newList_.add(s);
 					            }else{
-						            if(s.getZdsjActual()!=null){
+						            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 						            	newList_.add(s);
 						            }
 					            }
@@ -884,7 +884,7 @@ public class FormsServiceImpl implements FormsService {
 					            if(cts != null && cts.size() > 0){
 					            	newList_.add(s);
 					            }else{
-						            if(s.getZdsjActual()!=null){
+						            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 						            	newList_.add(s);
 						            }
 					            }
@@ -873,7 +873,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if(cts != null && cts.size() > 0){
             	lists.add(s);
             }else{
-	            if(s.getZdsjActual()!=null){
+	            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 	            	lists.add(s);
 	            }
             }
@@ -1743,30 +1743,28 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if(cts != null && cts.size() > 0){
             	lists.add(s);
             }else{
-	            if(s.getZdsjActual()!=null){
+	            if(s.getFcsjActual() !=null&&s.getZdsjActual()!=null){
 	            	lists.add(s);
 	            }
             }
         }
-        double ksgl=culateService.culateKsgl(list);
-        double sjgl=culateService.culateSjgl(lists);
-        double jccgl=culateService.culateJccgl(lists);
-        double ljgl=culateService.culateLjgl(lists);
-
-        map.put("jhlc", Arith.add(culateService.culateJhgl(list),culateService.culateJhJccgl(list))); //计划里程
+        map.put("jhbc", culateService.culateJhbc(list,""));//计划班次
+        map.put("jhlc", Arith.add(culateService.culateJhgl(list),
+        		culateService.culateJhJccgl(list))); //计划总里程
+        map.put("cjbc", culateService.culateLbbc(list));//烂班班次
         map.put("remMileage", culateService.culateLbgl(list)); //烂班公里
+        map.put("ljbc", culateService.culateLjbc(lists,""));//临加班次
+        double ljgl=culateService.culateLjgl(lists);
         map.put("addMileage", ljgl); //临加公里
-        map.put("yygl",Arith.add(sjgl,ljgl)); //实际公里
-        map.put("ksgl", ksgl);//空驶公里
-        map.put("realMileage",Arith.add(Arith.add(ksgl,jccgl ),Arith.add(sjgl,ljgl)));
-//         map.put("realMileage", format.format(yygl + ksgl + jcclc+addMileage));
-        map.put("jhbc", culateService.culateJhbc(list,""));
-        map.put("cjbc", culateService.culateLbbc(list));
-        map.put("ljbc", culateService.culateLjbc(lists,""));
         map.put("sjbc", culateService.culateSjbc(lists,"") + culateService.culateLjbc(lists,""));
-        map.put("jcclc", jccgl);
+        double ksgl=culateService.culateKsgl(list);//子任务空驶公里
+        double jccgl=culateService.culateJccgl(lists);//空驶班次公里
+        map.put("ksgl", ksgl);//空驶公里
+        double sjgl=culateService.culateSjgl(lists);//实际营运公里
+        map.put("realMileage",Arith.add(Arith.add(ksgl,jccgl ),Arith.add(sjgl,ljgl)));//总公里
         map.put("zkslc", Arith.add(ksgl,jccgl));
-//         map.put("zkslc", format.format(ksgl + jcclc+addMileageJc));
+        map.put("jcclc", jccgl);
+        map.put("yygl",Arith.add(sjgl,ljgl)); //总营运公里
         return map;
     }
@@ -1789,7 +1787,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if(cts != null && cts.size() > 0){
                 lists.add(s);
             }else{
-                if(s.getZdsjActual()!=null){
+                if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
                     lists.add(s);
                 }
             }
@@ -2139,20 +2137,24 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 for (int j = 0; j < listit.size(); j++) {
                     ScheduleRealInfo t = new ScheduleRealInfo();
                     ChildTaskPlan childTaskPlan = listit.get(j);
-                    if (childTaskPlan.isDestroy()) {
-                        t.setFcsjActual("");
-                        t.setZdsjActual("");
-                        t.setJhlc(0.0);
-                    } else {
-                        t.setFcsjActual(childTaskPlan.getStartDate());
-                        t.setZdsjActual(childTaskPlan.getEndDate());
-                        t.setJhlc(Double.parseDouble(String.valueOf(childTaskPlan.getMileage())));
+                    if(childTaskPlan.getCcId()==null){
+                    	 if (childTaskPlan.isDestroy()) {
+                             t.setFcsjActual("");
+                             t.setZdsjActual("");
+                             t.setJhlc(0.0);
+                         } else {
+                             t.setFcsjActual(childTaskPlan.getStartDate());
+                             t.setZdsjActual(childTaskPlan.getEndDate());
+                             t.setJhlc(Double.parseDouble(String.valueOf(childTaskPlan.getMileage())));
+                         }
+                         t.setFcsj(childTaskPlan.getStartDate());
+                         t.setZdsj(childTaskPlan.getEndDate());
+                         t.setQdzName(childTaskPlan.getStartStationName());
+                         t.setZdzName(childTaskPlan.getEndStationName());
+                         t.setRemarks(childTaskPlan.getRemarks());
+                         t.setAdjustExps("子");
+                         listSchedule.add(t);
                     }
-                    t.setQdzName(childTaskPlan.getStartStationName());
-                    t.setZdzName(childTaskPlan.getEndStationName());
-                    t.setRemarks(childTaskPlan.getRemarks());
-                    t.setAdjustExps("子");
-                    listSchedule.add(t);
                 }
             }
         }
@@ -2295,7 +2297,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if(cts != null && cts.size() > 0){
             	lists.add(s);
             }else{
-	            if(s.getZdsjActual()!=null){
+	            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 	            	lists.add(s);
 	            }
             }
@@ -2370,7 +2372,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if(cts != null && cts.size() > 0){
                 lists.add(s);
             }else{
-                if(s.getZdsjActual()!=null){
+                if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
                     lists.add(s);
                 }
             }
@@ -2433,7 +2435,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if(cts != null && cts.size() > 0){
             	lists.add(s);
             }else{
-	            if(s.getZdsjActual()!=null){
+	            if(s.getZdsjActual()!=null&& s.getFcsjActual()!=null){
 	            	lists.add(s);
 	            }
             }
@@ -2487,10 +2489,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	        map.put("dtbc", 0);
 	        map.put("dtbc_m", 0);
 	        map.put("dtbc_a", 0);
-	        map.put("djg", 0);
-	        map.put("djg_m", 0);
-	        map.put("djg_a", 0);
-	        map.put("djg_time", 0);
+	        Map<String, Object> m_=culateService.culateDjg(lists, list.get(0).getXlBm());
+	        map.put("djg", m_.get("djgcsq"));
+	        map.put("djg_m", m_.get("djgcsz"));
+	        map.put("djg_a", m_.get("djgcsw"));
+	        map.put("djg_time", m_.get("djgsj"));
     	}
         return map;
     }
@@ -2515,7 +2518,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if(cts != null && cts.size() > 0){
             	 list_s.add(s);
             }else{
-	            if(s.getZdsjActual()!=null){
+	            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 	                list_s.add(s);
 	            }
             }
@@ -2592,10 +2595,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("dtbc", 0);
         map.put("dtbc_m", 0);
         map.put("dtbc_a", 0);
-        map.put("djg", 0);
-        map.put("djg_m", 0);
-        map.put("djg_a", 0);
-        map.put("djg_time", 0);
+        Map<String, Object> m_=culateService.culateDjg(list_s, list.get(0).getXlBm());
+        map.put("djg", m_.get("djgcsq"));
+        map.put("djg_m", m_.get("djgcsz"));
+        map.put("djg_a", m_.get("djgcsw"));
+        map.put("djg_time", m_.get("djgsj"));
         lMap.add(map);
         if (type != null && type.length() != 0 && type.equals("export")) {
             SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
@@ -4211,7 +4215,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
           if(cts != null && cts.size() > 0){
           	lists.add(s);
           }else{
-	            if(s.getZdsjActual()!=null){
+	            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 	            	lists.add(s);
 	            }
           }
@@ -39,6 +39,8 @@ public interface CulateMileageService {
 	 Map<String, Object> culateWdbcs(List<ScheduleRealInfo> lists);
 	 int culateDtfzbc(List<ScheduleRealInfo> lists,String type,String status,String item);
+	 
+
 	 //以下计算方法供新报表使用
 	 Map<String, Double> culateSjlcMap(List<ScheduleRealInfo> lists);//计划内营运and计划外营运
@@ -179,10 +179,12 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
 	                while (it.hasNext()) {
 	                    ChildTaskPlan childTaskPlan = it.next();
-	                    if(childTaskPlan.getMileageType().equals("service")){
-		                    if (childTaskPlan.isDestroy()) {
-		    					zlblc=Arith.add(zlblc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
-		                    } 
+	                    if(childTaskPlan.getCcId()==null){
+		                    if(childTaskPlan.getMileageType().equals("service")){
+			                    if (childTaskPlan.isDestroy()) {
+			    					zlblc=Arith.add(zlblc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
+			                    } 
+		                    }
 	                    }
 	                }
 				}
@@ -198,30 +200,11 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
 			if (!isInOut(scheduleRealInfo)) {
-//				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-//				if(childTaskPlans.isEmpty()){
+				if(!scheduleRealInfo.isCcService()){
 					if(scheduleRealInfo.getStatus() == -1){
 						lbbc++;
 					}
-//				}
-				/*else{
-					if(scheduleRealInfo.getStatus() == -1){
-						boolean fage=true;
-						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-						if(it.hasNext()){
-							ChildTaskPlan childTaskPlan = it.next();
-							if(!childTaskPlan.isDestroy()){
-								if(childTaskPlan.getMileageType().equals("service")){
-									fage=false;
-								}
-							}
-							
-						}
-						if(fage){
-							lbbc++;
-						}
-					}
-				}*/
+				}
 			}
 		}
 		return lbbc;
@@ -399,11 +382,13 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 							Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
 			                while (it.hasNext()) {
 			                    ChildTaskPlan childTaskPlan = it.next();
-			                    if("service".equals(childTaskPlan.getMileageType())&&"临加".equals(childTaskPlan.getType1())){
-			                    	 if (!childTaskPlan.isDestroy()) {
-			 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
-			 	                    	ljgl=Arith.add(ljgl,jhgl);
-			 	                    } 
+			                    if(childTaskPlan.getCcId()==null){
+				                    if("service".equals(childTaskPlan.getMileageType())&&"临加".equals(childTaskPlan.getType1())){
+				                    	 if (!childTaskPlan.isDestroy()) {
+				 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+				 	                    	ljgl=Arith.add(ljgl,jhgl);
+				 	                    } 
+				                    }
 			                    }
 			                }
 						}
@@ -463,7 +448,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
 			if (!isInOut(scheduleRealInfo)) {
-				if(!scheduleRealInfo.isSflj()){
+				if(!scheduleRealInfo.isSflj() && !scheduleRealInfo.isCcService()){
 					jhgl=Arith.add(jhgl,scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
 				}
 			}
@@ -504,7 +489,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
 			if (!isInOut(scheduleRealInfo)) {
-				if(!scheduleRealInfo.isSflj()){
+				if(!scheduleRealInfo.isSflj() && !scheduleRealInfo.isCcService()){
 					String[] fcsjStr = scheduleRealInfo.getFcsj().split(":");
 					long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
 					if(item.equals("zgf")){
@@ -535,21 +520,23 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
 					if(!scheduleRealInfo.isSflj()){
 						if(childTaskPlans.isEmpty()){
-								if(!scheduleRealInfo.isDestroy()){
-									double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
-									double jhlc=scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
-									if(jhlc-jhlcOrig>0){
-										sjgl=Arith.add(sjgl,jhlcOrig);
-									}else{
-										sjgl=Arith.add(sjgl,jhlc);
-									}
-									
+							if(!scheduleRealInfo.isDestroy()){
+								double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
+								double jhlc=scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+								if(jhlc-jhlcOrig>0){
+									sjgl=Arith.add(sjgl,jhlcOrig);
+								}else{
+									sjgl=Arith.add(sjgl,jhlc);
 								}
+								
+							}
 						}else{
 							Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
 			                while (it.hasNext()) {
 			                    ChildTaskPlan childTaskPlan = it.next();
-			                    if(childTaskPlan.getMileageType().equals("service")&&"正常".equals(childTaskPlan.getType1())){
+			                    if(childTaskPlan.getMileageType().equals("service")
+			                    		&&"正常".equals(childTaskPlan.getType1())
+			                    		&& childTaskPlan.getCcId()==null){
 			                    	 if (!childTaskPlan.isDestroy()) {
 			 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
 			 	                    	sjgl=Arith.add(sjgl,jhgl);
@@ -649,8 +636,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
 			if (!isInOut(scheduleRealInfo)) {
-				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-				if(!scheduleRealInfo.isSflj()){
+				if(!scheduleRealInfo.isSflj() && !scheduleRealInfo.isCcService()){
 					String time="";
 					if(item.equals("zgf") || item.equals("wgf")){
 						if(scheduleRealInfo.getFcsjActual()!=null){
@@ -681,62 +667,6 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 							}
 						}
-						/*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++;
-								}
-								
-							}
-						}else{
-							if(scheduleRealInfo.getStatus() == -1){
-								boolean fage=false;
-								Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-								while(it.hasNext()){
-									ChildTaskPlan childTaskPlan = it.next();
-									if(!childTaskPlan.isDestroy()){
-										if(childTaskPlan.getMileageType().equals("service")){
-											fage=true;
-										}
-									}
-									
-								}
-								if(fage){
-									if(item.equals("zgf")){
-										if(fcsj>=zgf1 && fcsj<=zgf2){
-											sjbc++;
-										}
-									}else if(item.equals("wgf")){
-										if(fcsj>=wgf1 && fcsj<=wgf2){
-											sjbc++;
-										}
-									}else{
-										sjbc++;
-									}
-								}
-								
-							}else{
-								if(item.equals("zgf")){
-									if(fcsj>=zgf1 && fcsj<=zgf2){
-										sjbc++;
-									}
-								}else if(item.equals("wgf")){
-									if(fcsj>=wgf1 && fcsj<=wgf2){
-										sjbc++;
-									}
-								}else{
-									sjbc++;
-								}
-							}
-						}*/
 					}
 				}
 			}
@@ -750,14 +680,13 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		double ksgl =0;
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
-			if (!(scheduleRealInfo.getBcType().equals("in") 
-					|| scheduleRealInfo.getBcType().equals("out"))) {
+			if (!isInOut(scheduleRealInfo)) {
 				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
 				if(!childTaskPlans.isEmpty()){
 					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
 	                while (it.hasNext()) {
 	                    ChildTaskPlan childTaskPlan = it.next();
-	                    if(childTaskPlan.getMileageType().equals("empty")){
+	                    if(childTaskPlan.getMileageType().equals("empty") && childTaskPlan.getCcId()==null){
 	                    	 if (!childTaskPlan.isDestroy()) {
 	 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
 	 	                    	ksgl=Arith.add(ksgl,jhgl);
@@ -786,7 +715,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
 	                while (it.hasNext()) {
 	                    ChildTaskPlan childTaskPlan = it.next();
-	                    if(childTaskPlan.getMileageType().equals("empty")){
+	                    if(childTaskPlan.getMileageType().equals("empty") && childTaskPlan.getCcId()==null){
 	                    	 if (!childTaskPlan.isDestroy()) {
 	 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
 	 	                    	jcclc=Arith.add(jcclc,jhgl);
@@ -907,7 +836,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		double jcclc =0;
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
-			if(!scheduleRealInfo.isSflj()){
+			if(!scheduleRealInfo.isSflj() && !scheduleRealInfo.isCcService()){
 				if (scheduleRealInfo.getBcType().equals("in") 
 						|| scheduleRealInfo.getBcType().equals("out")|| scheduleRealInfo.getBcType().equals("ldks")) {
 					if(!scheduleRealInfo.isSflj()){
@@ -946,16 +875,17 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
             //有子任务
             if (cts != null && cts.size() > 0) {
                 for(ChildTaskPlan c : cts){
-                	if(item.equals("其他")){
-                		if(c.isDestroy() && 
-                				((c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item)||
-                						(c.getDestroyReason()==null?"": c.getDestroyReason()).equals("")))
-                            sum = Arith.add(sum, c.getMileage());
-                	}else{
-                		if(c.isDestroy() && (c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item))
-                            sum = Arith.add(sum, c.getMileage());
+                	if(c.getCcId()==null){
+	                	if(item.equals("其他")){
+	                		if(c.isDestroy() && 
+	                				((c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item)||
+	                						(c.getDestroyReason()==null?"": c.getDestroyReason()).equals("")))
+	                            sum = Arith.add(sum, c.getMileage());
+	                	}else{
+	                		if(c.isDestroy() && (c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item))
+	                            sum = Arith.add(sum, c.getMileage());
+	                	}
                 	}
-                    
                 }
             }
             else if(isInOut(sch))
@@ -984,7 +914,8 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		int fzbc=0;
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
-			if (scheduleRealInfo.getBcType().equals("venting")) {
+			if (scheduleRealInfo.getBcType().equals("venting")
+					|| scheduleRealInfo.getBcType().equals("major")) {
 //				if(!scheduleRealInfo.isSflj()){
 					String[] fcsjStr = scheduleRealInfo.getFcsj().split(":");
 					long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
@@ -1916,7 +1916,7 @@ public class ReportServiceImpl implements ReportService{
 	            if(cts != null && cts.size() > 0){
 	            	lists.add(s);
 	            }else{
-		            if(s.getZdsjActual()!=null){
+		            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 		            	lists.add(s);
 		            }
 	            }
@@ -2534,7 +2534,7 @@ public class ReportServiceImpl implements ReportService{
 			if(cts != null && cts.size() > 0){
 				lists.add(s);
 			}else{
-				if(s.getZdsjActual()!=null){
+				if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
 					lists.add(s);
 				}
 			}
@@ -273,7 +273,13 @@
 				})
 				$get('/report/jobHzxx',{line:line,date:date},function(result){
-					console
+					//临加
+					$("#ljbcs").html(result.ljbc);
+					$("#ljgls").html(result.ljgl)
+					
+					//烂班
+					$("#lbbcs").html(result.lbbc);
+					$("#lbgls").html(result.lbgl)
 					var list_xxsj=template('list_xxsj',result);
 					$('#forms .list_xxsj').html(list_xxsj);