油，电管理，报表修改

廖磊
1 parent 32b72df4
Showing 7 changed files with 139 additions and 110 deletions
src/main/java/com/bsth/repository/oil/YlbRepository.java
src/main/java/com/bsth/repository/oil/YlxxbRepository.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -23,8 +23,9 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	@Modifying
 	@Query(value="SELECT a.*  FROM bsth_c_ylb a   where to_days(?1)-to_days(a.rq)=1"
 			+ " and jcsx=(select max(b.jcsx)  from  bsth_c_ylb b where a.nbbm=b.nbbm and "
-			+ " to_days(?1)-to_days(b.rq)=1 )",nativeQuery=true)
-	List<Ylb> obtainYlbefore(String rq);
+			+ " to_days(?1)-to_days(b.rq)=1 ) and ssgsdm like %?2%  and fgsdm like %?3% and "
+			+ " xlbm like %?4% and nbbm like %?5% ",nativeQuery=true)
+	List<Ylb> obtainYlbefore(String rq,String gsbm,String fgsbm,String xlbm,String nbbm);
 	/**
 	 * 当天YLB信息
@@ -50,6 +51,6 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	 */
 	@Transactional
 	@Modifying
-	@Query(value="select sum(jzl) as jzl,sum(zlc) as zlc ,sum(sh) as sh from bsth_c_ylb where  nbbm=?1 and rq=?2",nativeQuery=true)
-	List<Object[]> sumLcYl(String nbbm,Date rq);
+	@Query(value="select sum(jzl) as jzl,sum(zlc) as zlc ,sum(sh) as sh from bsth_c_ylb where  nbbm=?1 and rq=?2 and xlbm like %?3%",nativeQuery=true)
+	List<Object[]> sumLcYl(String nbbm,Date rq,String xlbm);
 }
@@ -19,8 +19,8 @@ public interface YlxxbRepository extends BaseRepository&lt;Ylxxb, Integer&gt;{
 	 */
 	@Transactional
 	@Modifying
-	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and nylx=?2",nativeQuery=true)
-	List<Ylxxb> obtainYlxx(String rq,int nylx);
+	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and nylx=?2 and gsdm like %?3%",nativeQuery=true)
+	List<Ylxxb> obtainYlxx(String rq,int nylx,String gsdm);
 	@Transactional
 	@Modifying
@@ -92,7 +92,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where  s.clZbh = ?1  and s.scheduleDate = str_to_date(?2,'%Y-%m-%d') and xlBm =?3 order by realExecDate,fcsj")
 	List<ScheduleRealInfo> queryListWaybill2(String clZbh,String date,String line);
-	@Query(value="select s from ScheduleRealInfo s where s.jGh = ?1 and s.clZbh = ?2 and s.scheduleDate = str_to_date(?3,'%Y-%m-%d') order by realExecDate,fcsj")
+	@Query(value="select s from ScheduleRealInfo s where s.jGh like %?1% and s.clZbh like %?2% and s.scheduleDate = str_to_date(?3,'%Y-%m-%d') order by realExecDate,fcsj")
 	List<ScheduleRealInfo> queryListWaybill3(String jName,String clZbh,String date);
 	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between str_to_date(?3,'%Y-%m-%d') and str_to_date(?4,'%Y-%m-%d')  order by bcs")
@@ -127,8 +127,8 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m') = ?2 and s.bcType not in ('in','out') order by s.xlBm")
 	List<ScheduleRealInfo> scheduleByDateAndLine3(String line,String date);
-	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh) from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY xlBm,clZbh,jGh,scheduleDate,jGh ORDER BY xlBm,clZbh")
-	List<Map<String,Object>> yesterdayDataList(String line,String date);
+	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh) from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.gsBm like %?3% and s.fgsBm like %?4%  GROUP BY xlBm,clZbh,jGh,scheduleDate,jGh ORDER BY xlBm,clZbh")
+	List<Map<String,Object>> yesterdayDataList(String line,String date,String gsbm,String fgsbm);
 	@Query(value="select s from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 ORDER BY xlBm,lpName,clZbh,xlDir")
 	List<ScheduleRealInfo> setLD(String date);
@@ -77,6 +77,10 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 			 Cars c=carsList.get(i);
 			 carsMap.put(c.getInsideCode(), c.getSfdc());
 		}
+		 String gsbm="";
+			if(map2.get("ssgsdm_like")!=null){
+				gsbm=map2.get("ssgsdm_like").toString();
+			}
 		String rq=map2.get("rq").toString();
 		String line="";
 		if(map2.get("xlbm_eq")!=null){
@@ -91,14 +95,14 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 		//当天DLB信息
 		List<Dlb> dlList=repository.obtainDl(rq);
 		//当天YLXXB信息
-		List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq,1);
+		List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq,1,gsbm);
 		//当天加电信息表
 		List<Jdl> jdlList=jdlRepository.JdlList(rq);
 		//前一天所有车辆最后进场班次信息
 		List<Dlb> dlListBe=repository.obtainYlbefore(rq);
 		List<Cdl> cdyList=cdlRepository.obtainCdl();
 		//从排班表中计算出行驶的总里程
-		List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList(line,rq);
+		List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList(line,rq,"","","","");
 		List<Ylb> addList=new ArrayList<Ylb>();
 		List<Ylb> updateList=new ArrayList<Ylb>();
 		for(int x=0;x<listpb.size();x++){
@@ -244,14 +248,17 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 	public Map<String, Object> checkDl(Map<String, Object> map) {
 		Map<String, Object> newMap=new HashMap<String,Object>();
 		String xlbm=map.get("xlbm_eq").toString();
-		
+		String gsbm="";
+		if(map.get("ssgsdm_like")!=null){
+			gsbm=map.get("ssgsdm_like").toString();
+		}
 		// TODO Auto-generated method stub
 		try{
 			//获取车辆存油信息
 //			List<Cyl> cylList=cylRepository.findAll(new CustomerSpecs<Cyl>(newMap));
 			String rq=map.get("rq").toString();
 			List<Dlb> dlbList=repository.obtainDl(rq);
-			List<Ylxxb> ylxxbList=ylxxbRepository.obtainYlxx(rq,1);
+			List<Ylxxb> ylxxbList=ylxxbRepository.obtainYlxx(rq,1,gsbm);
 			//当天加电信息表
 			List<Jdl> jdlList=jdlRepository.JdlList(rq);
 			for (int i = 0; i < ylxxbList.size(); i++) {
@@ -97,10 +97,10 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			//当天YLXXB信息
 	//		List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq);
 			//前一天所有车辆最后进场班次信息
-			List<Ylb> ylListBe=repository.obtainYlbefore(rq);
+			List<Ylb> ylListBe=repository.obtainYlbefore(rq,"","","","");
 			List<Cyl> clyList=cylRepository.obtainCyl("","");
 			//从排班表中计算出行驶的总里程
-			List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList("",rq);
+			List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList("", rq, "", "", "", "");
 			for(int x=0;x<listpb.size();x++){
 				boolean sfdc=true;
@@ -222,14 +222,15 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			// 当天YLB信息
 			List<Ylb> ylList = repository.obtainYl(rq,gsbm,fgsbm,line,nbbm,"nbbm");
 			// 当天YLXXB信息
-			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 0);
+			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 0,gsbm);
 			// 前一天所有车辆最后进场班次信息
-			List<Ylb> ylListBe = repository.obtainYlbefore(rq);
+			List<Ylb> ylListBe = repository.obtainYlbefore(rq, gsbm, fgsbm, line, nbbm);
 			List<Cyl> clyList = cylRepository.obtainCyl(nbbm,gsbm);
 			// 从排班表中计算出行驶的总里程
-			List<Map<String, Object>> listpb = scheduleRealInfoService.yesterdayDataList(line, rq);
+			List<Map<String, Object>> listpb = scheduleRealInfoService.yesterdayDataList(line, rq, gsbm, fgsbm, "", nbbm);
 			List<Ylb> addList = new ArrayList<Ylb>();
 			List<Ylb> updateList = new ArrayList<Ylb>();
+			String ins="";
 			for (int x = 0; x < listpb.size(); x++) {
 				String type = "add";
 				boolean sfdc = true;
@@ -312,29 +313,34 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					t.setSsgsdm(map.get("company") == null ? "" : map.get("company").toString());
 					t.setFgsdm(map.get("bCompany") == null ? "" : map.get("bCompany").toString());
 					t.setRq(sdf.parse(rq));
-					/*
-					 * if(type.equals("add")){ addList.add(t); }else{
-					 * updateList.add(t); }
-					 */
-					repository.save(t);
+					
+					 if(type.equals("add")){
+						 addList.add(t); 
+					 }else{
+					     updateList.add(t); 
+					     ins += t.getId().toString()+",";
+					  }
+//					repository.save(t);
 					newMap.put("status", ResponseCode.SUCCESS);
 				}
 			}
+			if(addList.size()>0){ 
+				new BatchSaveUtils<Ylb>().saveList(addList, Ylb.class); 
+			}
+			
+			if(updateList.size()>0){
+				for (int i = 0; i < updateList.size(); i++) {
+					repository.save(updateList.get(i));
+				}
+			}
+			newMap.put("status", ResponseCode.SUCCESS);
 		} catch (ParseException e) {
 			// TODO Auto-generated catch block
 			newMap.put("status", ResponseCode.ERROR);
 			throw e;
 		}
-		/*
-		 * try { if(addList.size()>0){ new
-		 * BatchSaveUtils<Ylb>().saveList(addList, Ylb.class); }
-		 * 
-		 * if(updateList.size()>0){
-		 * 
-		 * } newMap.put("status", ResponseCode.SUCCESS); } catch (Exception e) {
-		 * // TODO: handle exception newMap.put("status", ResponseCode.ERROR); }
-		 */
+
 		return newMap;
 	}
@@ -383,7 +389,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					String nbbm_eq = ylb.getNbbm();
 					Date rq_eq = ylb.getRq();
 					// 得到一天总的加油和里程（根据车，时间）
-					List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq);
+					List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,ylb.getXlbm());
 					// 保存总的加油量
 					Double jzl = Double.valueOf(sumList.get(0)[0].toString());
 					// 保存总的里程
@@ -484,7 +490,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			String nbbm_eq = ylb.getNbbm();
 			Date rq_eq = ylb.getRq();
 			// 得到一天总的加油和里程（根据车，时间）
-			List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq);
+			List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,ylb.getXlbm());
 			// 保存总的加油量
 			Double jzl = Double.valueOf(sumList.get(0)[0].toString());
 			// 保存总的里程
@@ -610,7 +616,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				nbbm=map.get("nbbm_eq").toString();
 			}
 			List<Ylb> ylbList=repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
-			List<Ylxxb> ylxxbList=ylxxbRepository.obtainYlxx(rq,0);
+			List<Ylxxb> ylxxbList=ylxxbRepository.obtainYlxx(rq,0,gsbm);
 			for (int i = 0; i < ylxxbList.size(); i++) {
 				Boolean fage=true;
 				Ylxxb y1=ylxxbList.get(i);
@@ -126,7 +126,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<ScheduleRealInfo> realScheduleList(String line,String date);
 	List<ScheduleRealInfo> realScheduleListQp(String line,String date);
-	List<Map<String,Object>> yesterdayDataList(String line,String date);
+	List<Map<String,Object>> yesterdayDataList(String line,String date,String gsbm,String fgsbm,String jGh,String nbbm);
 	List<Map<String,Object>> yesterdayDataList(String line);
@@ -1290,7 +1290,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 //		int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
         int jhbc = 0, cjbc = 0, ljbc = 0;
         double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0, jcclc = 0;
-        float addMileage = 0l, remMileage = 0l;
+        float addMileage = 0l, remMileage = 0l,addMileageYy = 0l,addMileageJc =0l;
         Map<String, Object> map = new HashMap<String, Object>();
         for (ScheduleRealInfo scheduleRealInfo : list) {
             if (scheduleRealInfo != null) {
@@ -1301,7 +1301,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
                 if (scheduleRealInfo.isSflj()) {
                     addMileage += tempJhlc;
-                    ljbc++;
+                    if (scheduleRealInfo.getBcType().equals("in")
+                            || scheduleRealInfo.getBcType().equals("out")) {
+                    	addMileageJc +=tempJhlc;
+                    }else{
+                    	 ljbc++;
+                    	addMileageYy +=tempJhlc;
+                    }
+                   
                 } else {
                     if (!(scheduleRealInfo.getBcType().equals("in")
                             || scheduleRealInfo.getBcType().equals("out"))) {
@@ -1358,15 +1365,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("jhlc", format.format(jhlc));
         map.put("remMileage", format.format(remMileage));
         map.put("addMileage", format.format(addMileage));
-        map.put("yygl", format.format(yygl));
+        map.put("yygl", format.format(yygl+addMileageYy));
         map.put("ksgl", format.format(ksgl));
-        map.put("realMileage", format.format(yygl + ksgl + jcclc));
+        map.put("realMileage", format.format(yygl + ksgl + jcclc+addMileage));
         map.put("jhbc", jhbc);
         map.put("cjbc", cjbc);
         map.put("ljbc", ljbc);
         map.put("sjbc", jhbc - cjbc + ljbc);
         map.put("jcclc", jcclc);
-        map.put("zkslc", format.format(ksgl + jcclc));
+        map.put("zkslc", format.format(ksgl + jcclc+addMileageJc));
         return map;
     }
@@ -1500,6 +1507,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if (!childTaskPlans.isEmpty()) {
                 s.setFcsjActual("");
                 s.setZdsjActual("");
+                s.setJhlc(0.0);
             }
             if (s.isDestroy()) {
@@ -2331,86 +2339,91 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         return list;
     }
-    public List<Map<String, Object>> yesterdayDataList(String line, String date) {
+    public List<Map<String, Object>> yesterdayDataList(String line, String date,String gsbm,String fgsbm,String jGh,String nbbm) {
         //前一天日期
 //		String date = sdfMonth.format(org.apache.commons.lang.time.DateUtils.addDays(new Date(), -1));
 //		String date = "2016-09-20";
-        List<Map<String, Object>> yesterdayDataList = scheduleRealInfoRepository.yesterdayDataList(line, date);
+        List<Map<String, Object>> yesterdayDataList = scheduleRealInfoRepository.yesterdayDataList(line, date,gsbm,fgsbm);
 //		List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
+        List<ScheduleRealInfo> lists = scheduleRealInfoRepository.queryListWaybill3(jGh, nbbm, date);
         for (int x = 0; x < yesterdayDataList.size(); x++) {
             String jName = yesterdayDataList.get(x).get("jGh").toString();
             String clZbh = yesterdayDataList.get(x).get("clZbh").toString();
-            List<ScheduleRealInfo> lists = scheduleRealInfoRepository.queryListWaybill3(jName, clZbh, date);
+           
             double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0, jcclc = 0;
             float addMileage = 0l, remMileage = 0l;
             Map<String, Object> map = new HashMap<String, Object>();
             boolean fage = true;
+            String company="";
+            String bCompany="";
             for (ScheduleRealInfo scheduleRealInfo : lists) {
-                if (fage) {
-                    //根据线路代码获取公司
-                    Line li = lineRepository.findByLineCode(scheduleRealInfo.getXlBm());
-                    yesterdayDataList.get(x).put("company", li.getCompany());
-                    yesterdayDataList.get(x).put("bCompany", li.getBrancheCompany());
-                    fage = false;
-                }
-                if (scheduleRealInfo != null) {
-                    //计划里程（主任务过滤掉临加班次），
-                    //烂班里程（主任务烂班），
-                    //临加里程（主任务临加），
-                    //计划班次，烂班班次，增加班次
-                    tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
-                    if (scheduleRealInfo.isSflj()) {
-                        addMileage += tempJhlc;
-                    } else {
-                        if (!(scheduleRealInfo.getBcType().equals("in")
-                                || scheduleRealInfo.getBcType().equals("out"))) {
-                            jhlc += tempJhlc;
-                        }
-
-                        if (scheduleRealInfo.getStatus() == -1) {
-                            remMileage += tempJhlc;
-                        }
-                    }
-                    Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
-                    //计算营运里程，空驶里程
-                    if (childTaskPlans.isEmpty()) {
-                        if (scheduleRealInfo.getBcType().equals("in") ||
-                                scheduleRealInfo.getBcType().equals("out")) {
-                        	if (scheduleRealInfo.getStatus() != -1) {
-                        		jcclc += tempJhlc;
-                        	}
-                        }
-                        //主任务 放空班次属于营运
-//						else if(scheduleRealInfo.getBcType().equals("venting")){
-//							ksgl += tempJhlc;
-//						}
-                        else {
-                            if (scheduleRealInfo.getStatus() != -1) {
-                                yygl += tempJhlc;
-                            }
-                        }
-                    } else {
-                        Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-                        while (it.hasNext()) {
-                            ChildTaskPlan childTaskPlan = it.next();
-                            if (childTaskPlan.getMileageType().equals("empty")) {
-                                if (childTaskPlan.isDestroy()) {
-                                    remMileage += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
-                                } else {
-                                    ksgl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
-                                }
-                            } else {
-                                if (childTaskPlan.isDestroy()) {
-                                    remMileage += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
-                                } else {
-                                    yygl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
+            	if(scheduleRealInfo.getjGh().equals(jName) && scheduleRealInfo.getClZbh().equals(clZbh)){
+	                if (fage) {
+	                    //根据线路代码获取公司
+	                	company=scheduleRealInfo.getGsBm();
+	                	bCompany=scheduleRealInfo.getFgsBm();
+	                    fage = false;
+	                }
+	                if (scheduleRealInfo != null) {
+	                    //计划里程（主任务过滤掉临加班次），
+	                    //烂班里程（主任务烂班），
+	                    //临加里程（主任务临加），
+	                    //计划班次，烂班班次，增加班次
+	                    tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
+	                    if (scheduleRealInfo.isSflj()) {
+	                        addMileage += tempJhlc;
+	                    } else {
+	                        if (!(scheduleRealInfo.getBcType().equals("in")
+	                                || scheduleRealInfo.getBcType().equals("out"))) {
+	                            jhlc += tempJhlc;
+	                        }
+	
+	                        if (scheduleRealInfo.getStatus() == -1) {
+	                            remMileage += tempJhlc;
+	                        }
+	                    }
+	                    Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+	                    //计算营运里程，空驶里程
+	                    if (childTaskPlans.isEmpty()) {
+	                        if (scheduleRealInfo.getBcType().equals("in") ||
+	                                scheduleRealInfo.getBcType().equals("out")) {
+	                        	if (scheduleRealInfo.getStatus() != -1) {
+	                        		jcclc += tempJhlc;
+	                        	}
+	                        }
+	                        //主任务 放空班次属于营运
+	//						else if(scheduleRealInfo.getBcType().equals("venting")){
+	//							ksgl += tempJhlc;
+	//						}
+	                        else {
+	                            if (scheduleRealInfo.getStatus() != -1) {
+	                                yygl += tempJhlc;
+	                            }
+	                        }
+	                    } else {
+	                        Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+	                        while (it.hasNext()) {
+	                            ChildTaskPlan childTaskPlan = it.next();
+	                            if (childTaskPlan.getMileageType().equals("empty")) {
+	                                if (childTaskPlan.isDestroy()) {
+	                                    remMileage += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
+	                                } else {
+	                                    ksgl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
+	                                }
+	                            } else {
+	                                if (childTaskPlan.isDestroy()) {
+	                                    remMileage += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
+	                                } else {
+	                                    yygl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
+	                                }
+	                            }
+	                        }
+	                    }
+	                }
+	            }
+            }
+            yesterdayDataList.get(x).put("company", company);
+            yesterdayDataList.get(x).put("bCompany", bCompany);
             yesterdayDataList.get(x).put("totalKilometers", yygl + ksgl + jcclc);
         }
@@ -3118,7 +3131,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                         }
                         if (!c.isDestroy()) {
-                            sjlc += c.getMileage() == null ? 0 : c.getMileage();
+                        	if(c.getMileageType().equals("service")){
+                        		sjlc += c.getMileage() == null ? 0 : c.getMileage();
+                        	}
                         }
                     }