获取路单数据时，去掉公里为0的，油量计算排序

廖磊
1 parent b2d7e559
Showing 2 changed files with 70 additions and 20 deletions
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -31,6 +31,7 @@ import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
+import com.bsth.entity.mcy_forms.Daily;
 import com.bsth.entity.oil.Cyl;
 import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.oil.Ylxxb;
@@ -100,7 +101,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			// TODO Auto-generated method stub
 			Map<String, Object> newMap=new HashMap<String,Object>();
 			//当天YLB信息
-			List<Ylb> ylList=repository.obtainYl(rq,"","","","","nbbm");
+//			List<Ylb> ylList=repository.obtainYl(rq,"","","","","nbbm");
+			List<Ylb> ylList=this.listOrderBy(rq,"","","","","nbbm");
 			//当天YLXXB信息
 	//		List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq);
 			//前一天所有车辆最后进场班次信息
@@ -258,7 +260,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			DecimalFormat df = new DecimalFormat("#.00");
 			// TODO Auto-generated method stub
 			// 当天YLB信息
-			List<Ylb> ylList = repository.obtainYl(rq,gsbm,fgsbm,line,nbbm,"nbbm");
+			List<Ylb> ylList = this.listOrderBy(rq,gsbm,fgsbm,line,nbbm,"nbbm");
+//					repository.obtainYl(rq,gsbm,fgsbm,line,nbbm,"nbbm");
 			// 当天YLXXB信息
 			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 0,gsbm);
 			// 前一天所有车辆最后进场班次信息
@@ -482,13 +485,15 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			List<Ylb> ylbList =new ArrayList<Ylb>();
 			List<Ylb> ylbLists =new ArrayList<Ylb>();
 			List<Ylb> iterator2=new ArrayList<Ylb>();
-			if(xlbm.equals("")){
-				ylbLists=repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
-				iterator2=repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
-			}else{
-				ylbLists=repository.obtainYl_eq(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
-				iterator2=repository.obtainYl_eq(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
-			}
+//			if(xlbm.equals("")){
+				ylbLists=this.listOrderBy(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
+//						repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
+				iterator2=this.listOrderBy(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
+//						repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
+//			}else{
+//				ylbLists=repository.obtainYl_eq(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
+//				iterator2=repository.obtainYl_eq(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
+//			}
 			// 从排班表中计算出行驶的总里程
@@ -833,7 +838,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			}
 //			List<Ylb> ylListBe=repository.obtainYlbefore(rq, gsbm, "", xlbm, nbbm);
 			List<Ylb> ylListBe=repository.listMaxRqJcsx(rq, gsbm, fgsbm, xlbm, nbbm);
-			List<Ylb> ylbList=repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
+			List<Ylb> ylbList=this.listOrderBy(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
+//					repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
 			List<Ylxxb> ylxxbList=ylxxbRepository.obtainYlxx(rq,0,gsbm);
 			for (int i = 0; i < ylxxbList.size(); i++) {
 				Boolean fage=true;
@@ -1278,8 +1284,10 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				map.put("nbbm_eq", nbbm_eq);
 				map.put("rq_eq", rq_eq);
-				List<Ylb> iterator2=repository.obtainYl(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),"",
+				List<Ylb> iterator2=this.listOrderBy(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),"",
 						ylb.getNbbm(),"jcsx");
+//						repository.obtainYl(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),"",
+//						ylb.getNbbm(),"jcsx");
 				DecimalFormat df = new DecimalFormat("#.00");
 				Double zyl = 0.0;
 				Double nextJzyl = 0.0;
@@ -1395,7 +1403,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		t.setCreatetime(new Date());
 		String[] jhsjStr = jhsj.split(":");
 		long fcsjL= Long.parseLong(jhsjStr[0])*60+Long.parseLong(jhsjStr[1]);
-		List<Ylb> list=repository.obtainYl(rq, gsdm, fgsdm, xlbm, nbbm, "jhsj");
+		List<Ylb> list=this.listOrderBy(rq, gsdm, fgsdm, xlbm, nbbm, "jhsj");
+//				repository.obtainYl(rq, gsdm, fgsdm, xlbm, nbbm, "jhsj");
 		int jcsx=1;
 		if(list.size()>0){
 			for (int i = 0; i < list.size(); i++) {
@@ -1439,4 +1448,43 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		}
 		return maps;
 	}
+	
+	public  List<Ylb> listOrderBy(String rq,String gsdm,
+			String fgsdm,String xlbm,String nbbm,
+			String px) {
+		// TODO Auto-generated method stub
+		String sql="SELECT * FROM bsth_c_ylb  "
+				+ " where to_days('"+rq+"')=to_days(rq) and ssgsdm like '%"+gsdm+"%' "
+				+ " and fgsdm like '%"+fgsdm+"%'";
+		if(xlbm.equals("")){
+			sql+= " and xlbm like '%"+xlbm+"%' ";
+		}else{
+			sql+= " and xlbm = '"+xlbm+"' ";
+		}
+				
+		sql += "and nbbm like '%"+nbbm+"%' order by "+px+" asc ";
+		
+		List<Ylb> list = jdbcTemplate.query(sql, new RowMapper<Ylb>() {
+			@Override
+			public Ylb mapRow(ResultSet arg0, int arg1) throws SQLException {
+				Ylb y = new Ylb();
+				y.setId(arg0.getInt("id"));
+				return y;
+			}
+		});
+		List<Ylb> lists=new ArrayList<Ylb>();
+		List<Ylb> ylbLists=repository.obtainYl(rq,gsdm,fgsdm,xlbm,nbbm,"jcsx");
+		for (int i = 0; i < list.size(); i++) {
+			Ylb t=list.get(i);
+			for (int j = 0; j < ylbLists.size(); j++) {
+				Ylb t2=ylbLists.get(j);
+				if(t.getId().intValue()==t2.getId().intValue()){
+					lists.add(t2);
+					break;
+				}
+			}
+		}
+		
+		return lists;
+	}
 }
@@ -3267,26 +3267,28 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             yesterdayDataList.get(x).put("totalKilometers", zlc);
         }
+        List<Map<String, Object>> yesterdayDataLists = new ArrayList<Map<String, Object>>();
+
         for (int i = 0; i < yesterdayDataList.size(); i++) {
         	Map<String, Object> map=yesterdayDataList.get(i);
         	 Double zlc=map.get("totalKilometers")==null?0.0:Double.parseDouble(map.get("totalKilometers").toString());
-        	 if(zlc<=0){
-        		 yesterdayDataList.remove(map);
+        	 if(zlc>0){
+        		 yesterdayDataLists.add(map);
         	 }
         }
         //增加顺序号
-        for (int i = 0; i < yesterdayDataList.size(); i++) {
+        for (int i = 0; i < yesterdayDataLists.size(); i++) {
             if (i == 0) {
-                yesterdayDataList.get(i).put("seqNumber", 1);
+            	yesterdayDataLists.get(i).put("seqNumber", 1);
             } else {
-                if (yesterdayDataList.get(i - 1).get("clZbh").equals(yesterdayDataList.get(i).get("clZbh"))) {
-                    yesterdayDataList.get(i).put("seqNumber", 1 + (int) yesterdayDataList.get(i - 1).get("seqNumber"));
+                if (yesterdayDataLists.get(i - 1).get("clZbh").equals(yesterdayDataLists.get(i).get("clZbh"))) {
+                	yesterdayDataLists.get(i).put("seqNumber", 1 + (int) yesterdayDataLists.get(i - 1).get("seqNumber"));
                 } else {
-                    yesterdayDataList.get(i).put("seqNumber", 1);
+                	yesterdayDataLists.get(i).put("seqNumber", 1);
                 }
             }
         }
-        return yesterdayDataList;
+        return yesterdayDataLists;
     }
     /**