Merge branch 'pudong' into pudong_jdk8

# Conflicts: # src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java

Merge branch 'pudong' into pudong_jdk8
# Conflicts: # src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
王通
2 parents caa62f01 c6dc0b52
Showing 9 changed files with 275 additions and 182 deletions
src/main/java/com/bsth/repository/calc/CalcWaybillRepository.java
src/main/java/com/bsth/service/calc/impl/CalcCulateMileageServiceImpl.java
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
src/main/resources/static/pages/forms/calc/calcsingledata.html
src/main/resources/static/real_control_v2/fragments/north/nav/report_register/add.html
src/main/resources/static/real_control_v2/fragments/north/nav/report_register/list.html
src/main/resources/static/real_control_v2/fragments/north/nav/report_register/manage.html
src/main/resources/static/real_control_v2/fragments/north/nav/report_register/update.html
@@ -69,7 +69,7 @@ public interface CalcWaybillRepository extends BaseRepository&lt;CalcWaybill, Integ
 	@Query(value="select DISTINCT c from CalcWaybill c where c.xl like %?1% and c.rqStr between ?2 and ?3 and c.gsdm like %?4% and c.fgsdm like %?5% and c.cl like %?6% order by c.xl")
 	List<CalcWaybill> scheduleByZbh(String line,String date,String date2,String gsdm,String fgsdm,String zbh);
 	@Query(value="select DISTINCT c from CalcWaybill c where c.xl like %?1% and c.rqStr between ?2 and ?3 and c.gsdm like %?4% and c.fgsdm like %?5% and c.cl like %?6%"
-			+ " and c.cl in (select s.carCode from Cars s where s.sfdc = ?7) order by c.xl")
+			+ " and c.cl in (select s.insideCode from Cars s where s.sfdc = ?7) order by c.xl")
 	List<CalcWaybill> scheduleByZbh(String line,String date,String date2,String gsdm,String fgsdm,String zbh,Boolean sfdc);
@@ -252,28 +252,28 @@ public class CalcCulateMileageServiceImpl  implements CalcCulateMileageService{
 						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{
+							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("empty")
-//	                    		&&"正常".equals(childTaskPlan.getType1())
-	                    		&& (!childTaskPlan.isNoClerk())
-	                    		&& childTaskPlan.getCcId()==null){
-	                    	 if (!childTaskPlan.isDestroy()) {
-	 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
-	 	                    	sjgl=Arith.add(sjgl,jhgl);
-	 	                    } 
+					}
+				}else{
+					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+					while (it.hasNext()) {
+						ChildTaskPlan childTaskPlan = it.next();
+						if(childTaskPlan.getMileageType().equals("empty")
+								&&"正常".equals(childTaskPlan.getType1())
+								&& (!childTaskPlan.isNoClerk())
+								&& childTaskPlan.getCcId()==null){
+							if (!childTaskPlan.isDestroy()) {
+								Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+								sjgl=Arith.add(sjgl,jhgl);
+							}
 	                    }
-	                }
-			   }
+					}
+				}
 			}
 		}
 		return sjgl;
@@ -421,7 +421,7 @@ public class CalcCulateMileageServiceImpl  implements CalcCulateMileageService{
 		 	                    } 
 		                    }
 		                }
-					}			    
+					}
 				}else{
 					if(childTaskPlans.isEmpty()){
 						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
@@ -451,7 +451,7 @@ public class CalcCulateMileageServiceImpl  implements CalcCulateMileageService{
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
 			Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-//			if (isInOut(scheduleRealInfo)) {
+			if (isInOut(scheduleRealInfo)) {
 				if(scheduleRealInfo.isSflj()){
 					if(childTaskPlans.isEmpty()){
 						if(!scheduleRealInfo.isDestroy() && isInOut(scheduleRealInfo))
@@ -470,48 +470,47 @@ public class CalcCulateMileageServiceImpl  implements CalcCulateMileageService{
 		                    }
 		                }
 					}
+				}else{
+					if(childTaskPlans.isEmpty()){
+						double jhlc=scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+						double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
+						double zjlc=Arith.sub(jhlc, jhlcOrig);
+						if(zjlc>0){
+							ljgl=Arith.add(zjlc, ljgl);
+						}
+					}else{
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+		                while (it.hasNext()) {
+		                    ChildTaskPlan childTaskPlan = it.next();
+		                    if("empty".equals(childTaskPlan.getMileageType())
+		                    		&&"临加".equals(childTaskPlan.getType1())
+		                    		&& childTaskPlan.getCcId() == null
+		                    		&& (!childTaskPlan.isNoClerk())){
+		                    	if (!childTaskPlan.isDestroy()) {
+		 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+		 	                    	ljgl=Arith.add(ljgl,jhgl);
+		 	                    } 
+		                    }
+		                }
+					}
 				}
-//				}else{
-//					if(childTaskPlans.isEmpty()){
-//						double jhlc=scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
-//						double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
-//						double zjlc=Arith.sub(jhlc, jhlcOrig);
-//						if(zjlc>0){
-//							ljgl=Arith.add(zjlc, ljgl);
-//						}
-//					}else{
-//						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-//		                while (it.hasNext()) {
-//		                    ChildTaskPlan childTaskPlan = it.next();
-//		                    if("empty".equals(childTaskPlan.getMileageType())
-//		                    		&&"临加".equals(childTaskPlan.getType1())
-//		                    		&& childTaskPlan.getCcId() == null
-//		                    		&& (!childTaskPlan.isNoClerk())){
-//		                    	if (!childTaskPlan.isDestroy()) {
-//		 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
-//		 	                    	ljgl=Arith.add(ljgl,jhgl);
-//		 	                    } 
-//		                    }
-//		                }
-//					}
-//				}
-//			}else{
-//				if (!childTaskPlans.isEmpty()) {
-//					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-//					while (it.hasNext()) {
-//						ChildTaskPlan childTaskPlan = it.next();
-//						if ("empty".equals(childTaskPlan.getMileageType())
-//								&& "临加".equals(childTaskPlan.getType1())
-//								&& childTaskPlan.getCcId() == null
-//								&& (!childTaskPlan.isNoClerk())) {
-//							if (!childTaskPlan.isDestroy()) {
-//								Float jhgl = childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
-//								ljgl = Arith.add(ljgl, jhgl);
-//							}
-//						}
-//					}
-//				}
-//			}
+			}else{
+				if (!childTaskPlans.isEmpty()) {
+					Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+					while (it.hasNext()) {
+						ChildTaskPlan childTaskPlan = it.next();
+						if ("empty".equals(childTaskPlan.getMileageType())
+								&& "临加".equals(childTaskPlan.getType1())
+								&& childTaskPlan.getCcId() == null
+								&& (!childTaskPlan.isNoClerk())) {
+							if (!childTaskPlan.isDestroy()) {
+								Float jhgl = childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
+								ljgl = Arith.add(ljgl, jhgl);
+							}
+						}
+					}
+				}
+			}
 		}
 		return ljgl;
 	}
@@ -522,7 +521,7 @@ public class CalcCulateMileageServiceImpl  implements CalcCulateMileageService{
 		double ljgl =0;
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=lists.get(i);
-//			if (!isInOut(scheduleRealInfo)) {
+			if (!isInOut(scheduleRealInfo)) {
 				Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
 				if(scheduleRealInfo.isSflj()){
 					if(!childTaskPlans.isEmpty()){
@@ -538,24 +537,24 @@ public class CalcCulateMileageServiceImpl  implements CalcCulateMileageService{
 		 	                    } 
 		                    }
 		                }
-					}			    
-//				}else{
-//					if(childTaskPlans.isEmpty()){
-//						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-//		                while (it.hasNext()) {
-//		                    ChildTaskPlan childTaskPlan = it.next();
-//		                    if("empty".equals(childTaskPlan.getMileageType())
-//		                    		&&"临加".equals(childTaskPlan.getType1())
-//		                    		&& childTaskPlan.getCcId()==null
-//		                    		&& childTaskPlan.isNoClerk()){
-//		                    	if (!childTaskPlan.isDestroy()) {
-//		 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
-//		 	                    	ljgl=Arith.add(ljgl,jhgl);
-//		 	                    }
-//		                    }
-//		                }
-//					}
-//			    }
+					}
+				}else{
+					if(childTaskPlans.isEmpty()){
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+		                while (it.hasNext()) {
+		                    ChildTaskPlan childTaskPlan = it.next();
+		                    if("empty".equals(childTaskPlan.getMileageType())
+		                    		&&"临加".equals(childTaskPlan.getType1())
+		                    		&& childTaskPlan.getCcId()==null
+		                    		&& childTaskPlan.isNoClerk()){
+		                    	if (!childTaskPlan.isDestroy()) {
+		 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+		 	                    	ljgl=Arith.add(ljgl,jhgl);
+		 	                    }
+		                    }
+		                }
+					}
+			    }
 			}
 		}
 		return ljgl;
@@ -95,7 +95,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
     private ReportService reportService;
     @Autowired
 	CarsRepository carsRepository;
-
+    
 	@Autowired
 	JdbcTemplate jdbcTemplate;
@@ -109,10 +109,9 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		if(date == null || date.trim().length() == 0){
 			Date d = new Date();
 			d.setTime(d.getTime() - (4l * 1000 * 60 * 60 * 24));
-			for(long i = 0; i < 3; i++){
-				d.setTime(d.getTime() + (i * 1000 * 60 * 60 * 24));
-				dateList.add(sdf.format(d));
-			}
+			dateList.add(sdf.format(d));
+			d.setTime(d.getTime() - (1l * 1000 * 60 * 60 * 24));
+			dateList.add(sdf.format(d));
 		} else {
 			date = date.trim();
 			dateList.add(date);
@@ -130,21 +129,21 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 				m.put("generateNew", generateNew);
 			} catch (Exception e) {
 				// TODO: handle exception
-				logger.info("重新统计保存失败！");
+				logger.info("date="+d+";line="+line+";重新统计保存失败！");
 			}
 			try {
 				Map<String, Object> calcLineMileage = calcLineMileage(d, line);
 				m.put("lineMileage", calcLineMileage);
 			} catch (Exception e) {
 				// TODO: handle exception
-				logger.info("线路公里审计保存失败！");
+				logger.info("date="+d+";line="+line+";线路公里审计保存失败！");
 			}
 			try {
 				Map<String, Object> calcBusMileage = calcBusMileage(d, line);
 				m.put("busMileage", calcBusMileage);
 			} catch (Exception e) {
 				// TODO: handle exception
-				logger.info("路单数据审计保存失败！");
+				logger.info("date="+d+";line="+line+";路单数据审计保存失败！");
 			}
 		}
@@ -473,6 +472,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 	public String calcDaily(String rq, String line) throws Exception{
 		String result = "";
 		try {
+			List<String> dateList = new ArrayList<String>();
 			if(rq == null || rq.trim().length() == 0){
 				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 				Date dNow = new Date();   //当前时间
@@ -481,101 +481,115 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 				calendar.setTime(dNow);//把当前时间赋给日历
 				calendar.add(Calendar.DAY_OF_MONTH, -4);  //设置为前一天
 				dBefore = calendar.getTime();   //得到前一天的时间
-				rq = sdf.format(dBefore);
+//				rq = sdf.format(dBefore);
+				dateList.add(sdf.format(dBefore));
+				Date date = new Date();
+				date.setTime(dBefore.getTime() - 1l*1000*60*60*24);
+				dateList.add(sdf.format(date));
 			} else {
-				rq = rq.trim();
+//				rq = rq.trim();
+				dateList.add(rq.trim());
 			}
 			if(line == null || line.trim().length() == 0){
 				line = "";
 			} else {
 				line = line.trim();
 			}
-	        List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
-	        List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>();
-	        List<ScheduleRealInfo> lists = new ArrayList<ScheduleRealInfo>();
-	        
-	        String gsSql="select gs_bm, fgs_bm from bsth_c_s_sp_info_real where schedule_date_str = '"+rq+"'";
-	        if(line.trim().length() > 0)
-	        	gsSql += " and xl_bm = '"+line+"'";
-			gsSql += " group by gs_bm, fgs_bm";
-			List<Map<String, String>> gsList=jdbcTemplate.query(gsSql, new RowMapper<Map<String, String>>() {
-				@Override
-				public Map<String, String> mapRow(ResultSet arg0, int arg1) throws SQLException {
-					Map<String, String> m = new HashMap<String, String>();
-					m.put("gsdm", arg0.getString("gs_bm"));
-					m.put("fgsdm", arg0.getString("fgs_bm"));
-					return m;
-			}});
-
-	        //查询所有线路
-			for(Map<String, String> m : gsList){
-				list.addAll(calcStatisticsRepository.scheduleByDateAndLine(line, rq, rq, m.get("gsdm"), m.get("fgsdm")));
-			}
-			List<CalcInterval> listInterval=calcIntervalRepository.selectByDateAndCompany(rq, "", "","");
-			Map<String,CalcInterval> mapInterval=new HashMap<String,CalcInterval>();
-			for (int i = 0; i < listInterval.size(); i++) {
-				CalcInterval c=listInterval.get(i);
-				mapInterval.put(c.getXlBm(), c);
-			}
-
-	        
-	        for (int i = 0; i < list.size(); i++) {
-	            ScheduleRealInfo s=list.get(i);
-	            Set<ChildTaskPlan> cts = s.getcTasks();
-	            if(cts != null && cts.size() > 0){
-	            	 list_s.add(s);
-	            }else{
-		            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
-		                list_s.add(s);
+			for(int j = 0; j < dateList.size(); j++){
+				rq = dateList.get(j);
+			
+		        List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
+		        List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>();
+		        List<ScheduleRealInfo> lists = new ArrayList<ScheduleRealInfo>();
+		        
+		        String gsSql="select gs_bm, fgs_bm from bsth_c_s_sp_info_real where schedule_date_str = '"+rq+"'";
+		        if(line.trim().length() > 0)
+		        	gsSql += " and xl_bm = '"+line+"'";
+				gsSql += " group by gs_bm, fgs_bm";
+				List<Map<String, String>> gsList=jdbcTemplate.query(gsSql, new RowMapper<Map<String, String>>() {
+					@Override
+					public Map<String, String> mapRow(ResultSet arg0, int arg1) throws SQLException {
+						Map<String, String> m = new HashMap<String, String>();
+						m.put("gsdm", arg0.getString("gs_bm"));
+						m.put("fgsdm", arg0.getString("fgs_bm"));
+						return m;
+				}});
+	
+		        //查询所有线路
+				for(Map<String, String> m : gsList){
+					list.addAll(calcStatisticsRepository.scheduleByDateAndLine(line, rq, rq, m.get("gsdm"), m.get("fgsdm")));
+				}
+				
+				List<CalcInterval> listInterval=calcIntervalRepository.selectByDateAndCompany(rq, "", "","");
+				Map<String,CalcInterval> mapInterval=new HashMap<String,CalcInterval>();
+				for (int i = 0; i < listInterval.size(); i++) {
+					CalcInterval c=listInterval.get(i);
+					mapInterval.put(c.getXlBm(), c);
+				}
+	
+		        
+		        for (int i = 0; i < list.size(); i++) {
+		            ScheduleRealInfo s=list.get(i);
+		            Set<ChildTaskPlan> cts = s.getcTasks();
+		            if(cts != null && cts.size() > 0){
+		            	 list_s.add(s);
+		            }else{
+			            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
+			                list_s.add(s);
+			            }
 		            }
-	            }
-	        }
-	        List<CalcStatistics> lMap = new ArrayList<CalcStatistics>();
-	        for (int i = 0; i < list.size(); i++) {
-	            if(i<list.size()-1){
-	                if(list.get(i+1).getXlBm().equals(list.get(i).getXlBm())){
-	                    lists.add(list.get(i));
-	                }else{
-	                    lists.add(list.get(i));
-	                    CalcInterval t=null;
-	                    if(mapInterval.get(lists.get(0).getXlBm())!=null){
-	                    	t=mapInterval.get(lists.get(0).getXlBm());
-	                    }
-	                   
-	                    CalcStatistics s=staticTj(lists,t);
-	                    lMap.add(s);
-	                    lists=new ArrayList<ScheduleRealInfo>();
-	                }
-	            }else{
-	                if(list.get(i).getXlBm().equals(list.get(i-1).getXlBm())){
-	                    lists.add(list.get(i));
-	                    CalcInterval t=null;
-	                    if(mapInterval.get(lists.get(0).getXlBm())!=null){
-	                    	t=mapInterval.get(lists.get(0).getXlBm());
-	                    }
-	                    CalcStatistics s=staticTj(lists,t);
-	                    lMap.add(s);
-	                }else{
-	                    lists=new  ArrayList<ScheduleRealInfo>();
-	                    lists.add(list.get(i));
-	                    CalcInterval t=null;
-	                    if(mapInterval.get(lists.get(0).getXlBm())!=null){
-	                    	t=mapInterval.get(lists.get(0).getXlBm());
-	                    }
-	                    CalcStatistics s=staticTj(lists,t);
-	                    lMap.add(s);
-	                }
-	            }
-	        }
-//	        Collections.sort(lMap,new AccountXlbm());
-	        
-	        if(line.trim().length() > 0){
-	        	calcStatisticsRepository.deleteByDateAndLine(rq, line);
-	        } else {
-	        	calcStatisticsRepository.deleteByDate(rq);
-	        }
-	        calcStatisticsRepository.saveAll(lMap);
+		        }
+		        List<CalcStatistics> lMap = new ArrayList<CalcStatistics>();
+		        for (int i = 0; i < list.size(); i++) {
+		            if(i<list.size()-1){
+		                if(list.get(i+1).getXlBm().equals(list.get(i).getXlBm())){
+		                    lists.add(list.get(i));
+		                }else{
+		                    lists.add(list.get(i));
+		                    CalcInterval t=null;
+		                    if(mapInterval.get(lists.get(0).getXlBm())!=null){
+		                    	t=mapInterval.get(lists.get(0).getXlBm());
+		                    }
+		                   
+		                    CalcStatistics s=staticTj(lists,t);
+		                    lMap.add(s);
+		                    lists=new ArrayList<ScheduleRealInfo>();
+		                }
+		            }else{
+		                if(list.get(i).getXlBm().equals(list.get(i-1).getXlBm())){
+		                    lists.add(list.get(i));
+		                    CalcInterval t=null;
+		                    if(mapInterval.get(lists.get(0).getXlBm())!=null){
+		                    	t=mapInterval.get(lists.get(0).getXlBm());
+		                    }
+		                    CalcStatistics s=staticTj(lists,t);
+		                    lMap.add(s);
+		                }else{
+		                    lists=new  ArrayList<ScheduleRealInfo>();
+		                    lists.add(list.get(i));
+		                    CalcInterval t=null;
+		                    if(mapInterval.get(lists.get(0).getXlBm())!=null){
+		                    	t=mapInterval.get(lists.get(0).getXlBm());
+		                    }
+		                    CalcStatistics s=staticTj(lists,t);
+		                    lMap.add(s);
+		                }
+		            }
+		        }
+	//	        Collections.sort(lMap,new AccountXlbm());
+		        
+		        if(line.trim().length() > 0){
+		        	calcStatisticsRepository.deleteByDateAndLine(rq, line);
+		        } else {
+		        	calcStatisticsRepository.deleteByDate(rq);
+		        }
+		        calcStatisticsRepository.saveAll(lMap);
+
+				System.out.println(rq);
+				System.out.println(dateList.size());
+			}
+			
 	        result = "success";
 		} catch (Exception e) {
 			// TODO: handle exception
@@ -1101,6 +1101,71 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		                }
 					}
 				}
+			} else {
+				Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
+				if(!isInOut(t)){
+					if(childTaskPlans.isEmpty()){
+						double jhlc=t.getJhlc()==null?0:t.getJhlc();
+						double jhlcOrig=t.getJhlcOrig()==null?0:t.getJhlcOrig();
+						double zjlc=Arith.sub(jhlc, jhlcOrig);
+						if(zjlc>0){
+							ljyy=Arith.add(zjlc, ljyy);
+						}
+					}else{
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+		                while (it.hasNext()) {
+		                    ChildTaskPlan childTaskPlan = it.next();
+		                    if("service".equals(childTaskPlan.getMileageType())
+		                    		&&"临加".equals(childTaskPlan.getType1())
+		                    		&& childTaskPlan.getCcId() == null
+		                    		&& (!childTaskPlan.isNoClerk())){
+		                    	 if (!childTaskPlan.isDestroy()) {
+		 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+		 	                    	ljyy=Arith.add(ljyy,jhgl);
+		 	                    } 
+		                    }
+		                }
+					}
+				} else {
+					if(childTaskPlans.isEmpty()){
+						if(t.getBcType().equals("in") || t.getBcType().equals("out")){
+							double jhlc=t.getJhlc()==null?0:t.getJhlc();
+							double jhlcOrig=t.getJhlcOrig()==null?0:t.getJhlcOrig();
+							double zjlc=Arith.sub(jhlc, jhlcOrig);
+							if(zjlc>0){
+								ljjcc=Arith.add(zjlc, ljjcc);
+							}
+						}
+						
+						if(t.getBcType().equals("ldks")){
+							double jhlc=t.getJhlc()==null?0:t.getJhlc();
+							double jhlcOrig=t.getJhlcOrig()==null?0:t.getJhlcOrig();
+							double zjlc=Arith.sub(jhlc, jhlcOrig);
+							if(zjlc>0){
+								ljkfks=Arith.add(zjlc, ljkfks);
+							}
+						}
+					}else{
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+		                while (it.hasNext()) {
+		                    ChildTaskPlan childTaskPlan = it.next();
+		                    if("empty".equals(childTaskPlan.getMileageType())
+		                    		&&"临加".equals(childTaskPlan.getType1())
+		                    		&& childTaskPlan.getCcId() == null
+		                    		&& (!childTaskPlan.isNoClerk())){
+		                    	if (!childTaskPlan.isDestroy()) {
+		 	                    	Float jhgl=childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage();
+		 	                    	if(childTaskPlan.getType2().equals("2")||childTaskPlan.getType2().equals("3")){
+		 	                    		ljjcc=Arith.add(ljjcc,jhgl);
+		 	                    	} else {
+		 	                    		ljkfks=Arith.add(ljkfks,jhgl);
+		 	                    	}
+		 	                    	
+		 	                    } 
+		                    }
+		                }
+					}
+				}
 			}
 		}
@@ -40,6 +40,14 @@
                         <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 140px;"></select>
                     </div>
+					<div style="display: inline-block; margin-left: 18px;" id="sfdcDiv">
+                        <span class="item-label" style="width: 80px;">是否电车: </span>
+                        <select class="form-control form-filter " name="sfdc" id="sfdc">
+							<option value="">请选择...</option>
+							<option value="0">否</option>
+							<option value="1">是</option>
+						</select>
+                    </div>
 					<div style="margin-top: 10px"></div>
                     <div style="display: inline-block;margin-left: 3px;">
                         <span class="item-label" style="width: 140px;">开始时间: </span>
@@ -195,6 +203,8 @@
 			}
 		});
+		$("#sfdcDiv").hide();
+		
 		var cont = "驾驶员", cont1 = "", cont2 = "", cont3 = "";
 		$("#tjtype").on("change",function(){
 			if(cont == "驾驶员"){
@@ -207,10 +217,13 @@
 			cont = $("#tjtype").val();
 			if($("#tjtype").val() == "驾驶员"){
 				$("#cont").val(cont1);
+				$("#sfdcDiv").hide();
 			} else if($("#tjtype").val() == "售票员"){
 				$("#cont").val(cont2);
+				$("#sfdcDiv").hide();
 			} else if($("#tjtype").val() == "车辆自编号"){
 				$("#cont").val(cont3);
+				$("#sfdcDiv").show();
 			}
 		});
@@ -231,9 +244,10 @@
 		    var fgsdmSing = $("#fgsdmSing").val();
 		    var tjtype=$("#tjtype").val();
 		    var cont=$("#cont").val();
+		    var sfdc=$("#sfdc").val();
 		    var params = {};
 		    var i = layer.load(2);
-		    $get("/calc_mix/singledatatj",{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,cont:cont},function(result){		        
+		    $get("/calc_mix/singledatatj",{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,cont:cont,sfdc:sfdc},function(result){		        
 				layer.close(i);
 				var singledata = template('singledata',{list:result});
 				// 把渲染好的模版html文本追加到表格中
@@ -249,11 +263,12 @@
 		    var fgsdmSing = $("#fgsdmSing").val();
 		    var tjtype=$("#tjtype").val();
 		    var cont=$("#cont").val();
+		    var sfdc=$("#sfdc").val();
 			var lineName = $('#line option:selected').text();
 			if(lineName == "全部线路")
 				lineName = $('#fgsdmSing option:selected').text();
 		    var i = layer.load(2);
-			$get('/calc_export/singledataExportTj',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,cont:cont,type:'export',lineName:lineName},function(result){
+			$get('/calc_export/singledataExportTj',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,cont:cont,sfdc:sfdc,type:'export',lineName:lineName},function(result){
 				var dateTime = "";
 				if(startDate == endDate){
 					dateTime = moment(startDate).format("YYYYMMDD");
@@ -40,7 +40,7 @@
 								<option value="1">首末班误点</option>
 								<option value="2">大间隔</option>
 								<option value="3">突发事件</option>
-<!-- 								<option value="7">绕改道</option> -->
+								<option value="7">绕改道</option>
 <!-- 								<option value="4">事故</option> -->
 								<option value="5">其他</option>
 <!-- 								<option value="6">咨询</option> -->
@@ -33,7 +33,7 @@
                 <li id="first_last_late" class="uk-active"><a>首末班误点</a></li>
                 <li id="large_interval"><a>大间隔</a></li>
                 <li id="emergency"><a>突发事件</a></li>
-<!--                 <li id="detour"><a>绕改道</a></li> -->
+                <li id="detour"><a>绕改道</a></li>
 <!--                 <li id="accident"><a>事故</a></li> -->
                 <li id="rests"><a>其他</a></li>
 <!--                 <li id="consult"><a>咨询</a></li> -->
@@ -36,7 +36,7 @@
                 <li id="first_last_late" class="uk-active"><a>首末班误点</a></li>
                 <li id="large_interval"><a>大间隔</a></li>
                 <li id="emergency"><a>突发事件</a></li>
-<!--                 <li id="detour"><a>绕改道</a></li> -->
+                <li id="detour"><a>绕改道</a></li>
 <!--                 <li id="accident"><a>事故</a></li> -->
                 <li id="rests"><a>其他</a></li>
 <!--                 <li id="consult"><a>咨询</a></li> -->
@@ -41,7 +41,7 @@
 								<option value="1">首末班误点</option>
 								<option value="2">大间隔</option>
 								<option value="3">突发事件</option>
-<!-- 								<option value="7">绕改道</option> -->
+								<option value="7">绕改道</option>
 <!-- 								<option value="4">事故</option> -->
 								<option value="5">其他</option>
 <!-- 								<option value="6">咨询</option> -->