报表，油量去掉分页，计算车厢存油保存整数

廖磊
1 parent 7d3ef5ea
Showing 7 changed files with 201 additions and 74 deletions
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/repository/oil/YlbRepository.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/oil/YlbService.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/oil/list_ph.html
@@ -157,6 +157,23 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 	}
+	
+
+	/**
+	 * 
+	 * @Title: list 
+	 * @Description: TODO(多条件分页查询) 
+	 * @param @param map 查询条件
+	 * @param @param page 页码
+	 * @param @param size 每页显示数量
+	 * @throws
+	 */
+	@RequestMapping(value = "/ylbList",method = RequestMethod.GET)
+	public List<Ylb> ylbList(@RequestParam Map<String, Object> map){
+		List<Ylb> ylbList=yblService.listYlb(map);
+        return ylbList;
+	}
+	
 	@RequestMapping(value="/oilListMonth")
 	public List<Ylb> oilListMonth(@RequestParam String line,@RequestParam String date){
 		return yblService.oilListMonth(line, date);
@@ -88,4 +88,14 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 			+ " and xlbm like %?4% "
 			+ " and nbbm like %?5%",nativeQuery=true)
 	List<Object[]> sumYlb2(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
+	
+	
+
+	@Query(value="select s from Ylb s "
+			+ " where to_days(?1)=to_days(s.rq) "
+			+ " and s.ssgsdm like %?2% "
+			+ " and s.fgsdm like %?3%"
+			+ " and s.xlbm like %?4% "
+			+ " and s.nbbm in ?5 ")
+	List<Ylb> listYlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
 }
@@ -125,7 +125,7 @@ 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-%d') = ?2 order by (s.lpName+1), s.realExecDate,s.fcsj")
 	List<ScheduleRealInfo> scheduleByDateAndLineQp(String line,String date);
-	@Query(value="select s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.bcType not in ('in','out') order by s.xlBm")
+	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.bcType not in ('in','out') order by s.xlBm")
 	List<ScheduleRealInfo> scheduleByDateAndLine2(String line,String date);
 	//按月统计
@@ -136,7 +136,11 @@ 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-%d') between ?2  and ?3 and s.bcType not in ('in','out') order by s.xlBm")
 	List<ScheduleRealInfo> scheduleByDateAndLineTj(String line,String date,String date2);
-	@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")
+	//按照时间段统计
+		@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between ?2  and ?3 and s.bcType not in ('in','out') order by s.xlBm")
+		List<ScheduleRealInfo> scheduleByDateAndLineTj2(String line,String date,String date2);
+	
+	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,min(s.fcsj) as fcsj ) 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 clZbh,fcsj")
 	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")
@@ -18,6 +18,6 @@ public interface YlbService extends BaseService&lt;Ylb, Integer&gt;{
 	Map<String, Object> sumYlb(Map<String, Object> map);
 	List<Ylb> oilListMonth(String line,String date);
-	
+	List<Ylb> listYlb(Map<String, Object> map);
 	StringBuffer checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm,int lx);
 }
@@ -173,6 +173,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
 						t.setSsgsdm(map.get("company")==null?"":map.get("company").toString());
 						t.setFgsdm(map.get("bCompany")==null?"":map.get("bCompany").toString());
+						t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
 						t.setRq(sdf.parse(rq));
 						repository.save(t);
@@ -323,8 +324,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					t.setJcsx(Integer.parseInt(map.get("seqNumber").toString()));
 					t.setSsgsdm(map.get("company") == null ? "" : map.get("company").toString());
 					t.setFgsdm(map.get("bCompany") == null ? "" : map.get("bCompany").toString());
+					t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
 					t.setRq(sdf.parse(rq));
-					
 					 if(type.equals("add")){
 						 addList.add(t); 
 					 }else{
@@ -381,6 +382,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			nbbm=map.get("nbbm_eq").toString();
 		}
+		List<Cyl> cylListAdd=new ArrayList<Cyl>();
+		Map<String, Object> cylMapAdd=new HashMap<String,Object>();
 		Map<String, Object> newMap=new HashMap<String,Object>();
 		Map<String, Object> map2=new HashMap<String,Object>();
 		try {
@@ -391,7 +394,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			// 获取车辆存油信息
 			List<Cyl> cylList = cylRepository.obtainCyl(nbbm,gsbm);
 			// 指定日期YLB信息
-			List<Ylb> ylbList =repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
+			List<Ylb> ylbList =repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
 			List<Ylb> iterator2=repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
 			for (int i=0;i<ylbList.size();i++) {
 				Ylb ylb = ylbList.get(i);
@@ -427,31 +430,40 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 //					Iterator<Ylb> iterator2 = repository
 //							.findAll(new CustomerSpecs<Ylb>(map), new Sort(Direction.ASC, "jcsx")).iterator();
 					for (int j = 0; j < iterator2.size(); j++) {
-						
 						Ylb t = iterator2.get(j);
 						if(t.getNbbm().equals(ylb.getNbbm())){
 							if (t.getJcsx() == 1) {
 								// 进场等于出场的操作 既 最后进场存油量等于第一次的出场存油量
 								Double yl = t.getCzyl();
 								Double jcyl = t.getCzyl();
-//								zyl = jcyl + jzl - yl;
 								zyl =Arith.sub( Arith.add(jcyl, jzl),yl);
-								Double yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
-								t.setYh(yh);
-//								nextJzyl = t.getJzl() + t.getCzyl() - yh;
+								Double yh=0.0;
+								if(zlc>0){
+									 yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
+								}
 								nextJzyl =Arith.sub( Arith.add(t.getJzl(), t.getCzyl()),yh);
-//								t.setJzyl(Double.parseDouble(df.format(nextJzyl)));
-								t.setJzyl(nextJzyl);
+								//把进场油量的小数和整数分别取出
+//								int ylxs=(int) nextJzyl; 10.6--11  10.3--10
+								long l=Math.round(nextJzyl);
+								double ylxs=l*100/100;
+//								nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
+								yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
+								t.setYh(yh);
+								t.setJzyl(ylxs);
+								nextJzyl=ylxs;
 							} else {
-//								t.setCzyl(Double.parseDouble(df.format(nextJzyl)));
 								t.setCzyl(nextJzyl);
 								Double yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
-								t.setYh(yh);
-//								nextJzyl = t.getJzl() + nextJzyl - yh;
 								nextJzyl =Arith.sub( Arith.add(t.getJzl(),nextJzyl),yh);
-//								t.setJzyl(Double.parseDouble(df.format(nextJzyl)));
-								t.setJzyl(nextJzyl);
+								long l=Math.round(nextJzyl);
+								double ylxs=l*100/100;
+//								nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
+								yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
+								t.setYh(yh);
+								t.setJzyl(ylxs);
+								nextJzyl= ylxs;
 							}
+						
 							repository.save(t);
 						}
@@ -470,17 +482,36 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						if (fage) {
 							cylRepository.save(cyl);
 						} else {
-							cyl = new Cyl();
-							cyl.setNbbm(t.getNbbm());
-							cyl.setCyl(t.getJzyl());
-							cyl.setGsdm(t.getSsgsdm());
-							cyl.setUpdatetime(t.getRq());
-							cylRepository.save(cyl);
+							if(cylMapAdd.get(t.getNbbm())!=null){
+								for (int l = 0; l < cylListAdd.size(); l++) {
+									cyl=cylListAdd.get(l);
+									if(cyl.getNbbm().equals(t.getNbbm())){
+										cyl.setNbbm(t.getNbbm());
+										cyl.setCyl(t.getJzyl());
+										cyl.setGsdm(t.getSsgsdm());
+										cyl.setFgsdm(t.getFgsdm());
+										cyl.setUpdatetime(t.getRq());
+									}
+								}
+							}else{
+								cyl = new Cyl();
+								cyl.setNbbm(t.getNbbm());
+								cyl.setCyl(t.getJzyl());
+								cyl.setGsdm(t.getSsgsdm());
+								cyl.setFgsdm(t.getFgsdm());
+								cyl.setUpdatetime(t.getRq());
+								cylListAdd.add(cyl);
+							}
+							
+							
 						}
 						map2.put("status", ResponseCode.SUCCESS);
 					}
 				}
 			}
+			for (int i = 0; i < cylListAdd.size(); i++) {
+				cylRepository.save(cylListAdd.get(i));
+			}
 		} catch (Exception e) {
 			map2.put("status", ResponseCode.ERROR);
 			logger.error("save erro.", e);
@@ -507,7 +538,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			Double sh= Double.parseDouble(map.get("sh").toString());
 			String shyy=map.get("shyy").toString();
 			Ylb ylb = repository.findOne(id);
-			
+			List<Cyl> cylListAdd=new ArrayList<Cyl>();
+			Map<String, Object> cylMapAdd=new HashMap<String,Object>();
 			String nbbm_eq = ylb.getNbbm();
 			Date rq_eq = ylb.getRq();
 			// 得到一天总的加油和里程（根据车，时间）
@@ -527,12 +559,9 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			//新的 损耗不等于 旧的损耗 总损耗从新算
 			if(Arith.sub(ylb.getSh(),sh )!=0){
-//				zsh =zsh-ylb.getSh()+sh;
 				zsh =Arith.add(Arith.sub(zsh, ylb.getSh()), sh);
-//				jzl =jzl-zsh;
 				jzl =Arith.sub(jzl, zsh);
 			}else{
-//				jzl=jzl-zsh;
 				jzl =Arith.sub(jzl, zsh);
 			}
 			map.put("nbbm_eq", nbbm_eq);
@@ -555,33 +584,37 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						t.setShyy(shyy);
 					}
 					Double jcyl = t.getCzyl();
-//					zyl = jcyl + jzl - yl;
 					zyl = Arith.sub(Arith.add(jcyl, jzl), yl);
 					Double yh = 0.0;
 					if (zlc > 0 && t.getZlc() > 0) {
 						yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
 					}
-					t.setYh(yh);
-//					nextJzyl = t.getJzl() + t.getCzyl() - yh-t.getSh();
 					nextJzyl =Arith.sub(Arith.add(t.getJzl(), t.getCzyl()), Arith.add(yh, t.getSh()));
-//					t.setJzyl(Double.parseDouble(df.format(nextJzyl)));
-					t.setJzyl(nextJzyl);
+					long l=Math.round(nextJzyl);
+					double ylxs=l*100/100;
+//					nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
+					yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
+					t.setJzyl(ylxs);
+					t.setYh(yh);
+					nextJzyl=ylxs;
 				} else {
 					if(t.getId()==id){
 						t.setSh(sh);
 						t.setShyy(shyy);
 					}
-					if (t.getZlc() != 0) {
-//						t.setCzyl(Double.parseDouble(df.format(nextJzyl)));
 						t.setCzyl(nextJzyl);
-						Double yh = Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
-						t.setYh(yh);
-//						nextJzyl = t.getJzl() + nextJzyl - yh-t.getSh();
+						Double yh =0.0;
+						if (t.getZlc() != 0) {
+							yh= Double.parseDouble(df.format(zyl * (t.getZlc() / zlc)));
+						}
 						nextJzyl = Arith.sub(Arith.add(t.getJzl(), nextJzyl), Arith.add(yh, t.getSh()));
-//						t.setJzyl(Double.parseDouble(df.format(nextJzyl)));
-						t.setJzyl(nextJzyl);
-					}
-
+						long l=Math.round(nextJzyl);
+						double ylxs=l*100/100;
+//						nextJzyl = Arith.add(nextJzyl,Arith.sub(nextJzyl,ylxs));
+						yh=Arith.add(yh, Arith.sub(ylxs,nextJzyl));
+						t.setJzyl(ylxs);
+						t.setYh(yh);
+						nextJzyl=ylxs;
 				}
 				repository.save(t);
@@ -600,16 +633,33 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				if (fage) {
 					cylRepository.save(cyl);
 				} else {
-					cyl = new Cyl();
-					cyl.setNbbm(t.getNbbm());
-					cyl.setCyl(t.getJzyl());
-					cyl.setGsdm(t.getSsgsdm());
-					cyl.setUpdatetime(t.getRq());
-					cylRepository.save(cyl);
+					if(cylMapAdd.get(t.getNbbm())!=null){
+						for (int l = 0; l < cylListAdd.size(); l++) {
+							cyl=cylListAdd.get(l);
+							if(cyl.getNbbm().equals(t.getNbbm())){
+								cyl.setNbbm(t.getNbbm());
+								cyl.setCyl(t.getJzyl());
+								cyl.setGsdm(t.getSsgsdm());
+								cyl.setFgsdm(t.getFgsdm());
+								cyl.setUpdatetime(t.getRq());
+							}
+						}
+					}else{
+						cyl = new Cyl();
+						cyl.setNbbm(t.getNbbm());
+						cyl.setCyl(t.getJzyl());
+						cyl.setGsdm(t.getSsgsdm());
+						cyl.setFgsdm(t.getFgsdm());
+						cyl.setUpdatetime(t.getRq());
+						cylListAdd.add(cyl);
+					}
 				}
 				newMap.put("status", ResponseCode.SUCCESS);
 			}
+			for (int i = 0; i < cylListAdd.size(); i++) {
+				cylRepository.save(cylListAdd.get(i));
+			}
 		} catch (Exception e) {
 			newMap.put("status", ResponseCode.ERROR);
 			logger.error("save erro.", e);
@@ -845,6 +895,55 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 //		}
 		return sumMap;
 	}
+
+	@Override
+	public List<Ylb> listYlb(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		List<Ylb> listYlb=new ArrayList<Ylb>();
+		List<String> stringList=new ArrayList<String>();
+		String rq=map.get("rq").toString();
+		String gsbm=map.get("ssgsdm_like").toString();
+		String fgsbm=map.get("fgsdm_like").toString();
+		String xlbm=map.get("xlbm_like").toString().trim();
+		String nbbm=map.get("nbbm_eq").toString();
+		String sxtj=map.get("sxtj").toString();
+		if(nbbm.trim()!=""){
+			stringList.add(nbbm);
+			listYlb=repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+		}else{
+			//全部
+			if(sxtj.equals("0")){
+				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
+				for (int i = 0; i < objectLists.size(); i++) {
+					String clbm=objectLists.get(i)[0].toString();
+					stringList.add(clbm);
+				}
+				
+				listYlb=repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+			}else{
+				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, xlbm,nbbm);
+				for (int i = 0; i < objectLists.size(); i++) {
+					String clbm=objectLists.get(i)[0].toString();
+					int cs=Integer.parseInt(objectLists.get(i)[1].toString());
+					//一车一单
+					if(sxtj.equals("1")){
+						if(cs==1){
+							stringList.add(clbm);
+						}
+					}	
+					//一车多单
+					if(sxtj.equals("2")){
+						if(cs>1){
+							stringList.add(clbm);
+						}
+					}
+				}
+				listYlb=repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+			}
+		}
+
+		return listYlb;
+	}
 }
@@ -1299,7 +1299,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 //		int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
 //		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;
+        double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0,jhlcOrig=0, jcclc = 0;
         float addMileage = 0l, remMileage = 0l,addMileageYy = 0l,addMileageJc =0l;
         Map<String, Object> map = new HashMap<String, Object>();
         for (ScheduleRealInfo scheduleRealInfo : list) {
@@ -1309,6 +1309,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 //临加里程（主任务临加），
                 //计划班次，烂班班次，增加班次
                 tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
+                jhlcOrig = scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
+                
                 if (scheduleRealInfo.isSflj()) {
                     addMileage += tempJhlc;
                     if (scheduleRealInfo.getBcType().equals("in")
@@ -1323,9 +1325,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     if (!(scheduleRealInfo.getBcType().equals("in")
                             || scheduleRealInfo.getBcType().equals("out"))) {
                     	 jhbc++;
-                         jhlc += tempJhlc;
+                         jhlc += jhlcOrig;
                          if (scheduleRealInfo.getStatus() == -1) {
-                             remMileage += tempJhlc;
+                             remMileage += jhlcOrig;
                              cjbc++;
                          }
                     }
@@ -1372,12 +1374,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 }
             }
         }
+        
+        //yygl 包含了临加的营运公里  jcclc包含了临加的进出场里程
         map.put("jhlc", format.format(jhlc));
         map.put("remMileage", format.format(remMileage));
         map.put("addMileage", format.format(addMileage));
-        map.put("yygl", format.format(yygl+addMileageYy));
+        map.put("yygl", format.format(yygl));
         map.put("ksgl", format.format(ksgl));
-        map.put("realMileage", format.format(yygl + ksgl + jcclc+addMileageYy));
+        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);
@@ -2129,7 +2133,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     public List<Map<String, Object>> statisticsDailyTj(String line, String date,String date2,
                                                      String xlName, String type) {
         List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
-            list = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, date,date2);
+        if(line!=null){
+        	list = scheduleRealInfoRepository.scheduleByDateAndLineTj2(line, date,date2);
+        }else{
+        	list = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, date,date2);
+        }
+            
         List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
         DecimalFormat format = new DecimalFormat("0.00");
@@ -2896,12 +2905,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         //前一天日期
 //		String date = sdfMonth.format(org.apache.commons.lang.time.DateUtils.addDays(new Date(), -1));
 //		String date = "2016-09-20";
-    	  System.out.println("shijian1:"+new Date());
+//    	  System.out.println("shijian1:"+new Date());
         List<Map<String, Object>> yesterdayDataList = scheduleRealInfoRepository.yesterdayDataList(line, date,gsbm,fgsbm);
-        System.out.println("shijian2:"+new Date());
+//        System.out.println("shijian2:"+new Date());
         //		List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
         List<ScheduleRealInfo> lists = scheduleRealInfoRepository.queryListWaybill3(jGh, nbbm, date,gsbm,fgsbm);
-        System.out.println("shijian3:"+new Date());
+//        System.out.println("shijian3:"+new 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();
@@ -2928,18 +2937,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	                    tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
 	                    if (scheduleRealInfo.isSflj()) {
 	                    	if(scheduleRealInfo.getStatus() == -1){
-//	                    		addMileage += tempJhlc;
 	                    		addMileage =Arith.add(addMileage, tempJhlc);
 	                    	}
 	                    } else {
 	                        if (!(scheduleRealInfo.getBcType().equals("in")
 	                                || scheduleRealInfo.getBcType().equals("out"))) {
-//	                            jhlc += tempJhlc;
 	                            jhlc =Arith.add(jhlc,tempJhlc);
 	                        }
 	                        if (scheduleRealInfo.getStatus() == -1) {
-//	                            remMileage += tempJhlc;
 	                            remMileage =Arith.add(remMileage,tempJhlc);
 	                        }
 	                    }
@@ -2949,7 +2955,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	                        if (scheduleRealInfo.getBcType().equals("in") ||
 	                                scheduleRealInfo.getBcType().equals("out")) {
 	                        	if (scheduleRealInfo.getStatus() != -1) {
-//	                        		jcclc += tempJhlc;
 	                        		jcclc=Arith.add(jcclc,tempJhlc);
 	                        	}
 	                        }
@@ -2959,7 +2964,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	//						}
 	                        else {
 	                            if (scheduleRealInfo.getStatus() != -1) {
-//	                                yygl += tempJhlc;
 	                                yygl=Arith.add(yygl,tempJhlc);
 	                            }
 	                        }
@@ -2969,19 +2973,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	                            ChildTaskPlan childTaskPlan = it.next();
 	                            if (childTaskPlan.getMileageType().equals("empty")) {
 	                                if (childTaskPlan.isDestroy()) {
-//	                                    remMileage += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
 	                                    remMileage=Arith.add(remMileage,childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage());
 	                                } else {
-//	                                    ksgl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
 	                                    ksgl += Arith.add(ksgl,childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage());
 	                                }
 	                            } else {
 	                                if (childTaskPlan.isDestroy()) {
-//	                                    remMileage += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
 	                                    remMileage=Arith.add(remMileage,childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage());
 	                                } else {
-//	                                    yygl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
 	                                    yygl=Arith.add(yygl,childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage());
 	                                }
@@ -473,25 +473,22 @@
     		} */
             var l = layer.load(2);
-            $get('/ylb', params, function (data) {
-            
-                $.each(data.content, function (i, obj) {
+            $get('/ylb/ylbList', params, function (data) {
+                $.each(data, function (i, obj) {
                     obj.rq = moment(obj.rq).format("YYYY-MM-DD");
                 });
-                var bodyHtm = template('ylb_list_temp', {list: data.content});
-				
-                $('#datatable_ylb tbody').html(bodyHtm)
+                var bodyHtm = template('ylb_list_temp', {list:data});
+                $('#datatable_ylb tbody').html(bodyHtm);
+               /*  $('#datatable_ylb tbody').html(bodyHtm)
                         .find('.icheck').iCheck(icheckOptions)
                         .on('ifChanged', iCheckChange);
                 if (pagination && data.content.length > 0) {
                     //重新分页
                     initPagination = true;
                     showPagination(data);
-                }
+                } */
                 layer.close(l);
             	$get('/ylb/sumYlb',params,function(returns){
-            		console.log(returns);
-            		console.log(returns.jzl);
             		$("#sumJzl").html(returns.jzl);
             		$("#sumYh").html(returns.yh);
             		$("#sumSh").html(returns.sh);