油量管理去很长的小数点

廖磊
1 parent 68f800a0
Showing 9 changed files with 307 additions and 64 deletions
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/entity/oil/Ylb.java
src/main/java/com/bsth/repository/oil/YlbRepository.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/java/com/bsth/util/Arith.java
src/main/resources/static/pages/oil/checkJyryList.html
src/main/resources/static/pages/oil/list_ph.html
@@ -163,8 +163,8 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
 	}
 	@RequestMapping(value = "/sumYlb",method = RequestMethod.GET)
-	public List<Object[]> sumYlb(@RequestParam Map<String, Object> map){
-		List<Object[]> list=yblService.sumYlb(map);
+	public Map<String, Object> sumYlb(@RequestParam Map<String, Object> map){
+		Map<String, Object> list=yblService.sumYlb(map);
 		return list;
 	}
@@ -30,7 +30,7 @@ public class Ylb {
 	private Double jzlc=0.0;
 	private Double czyl=0.0;
 	private Double jzyl=0.0;
-	private Double jzl;
+	private Double jzl=0.0;
 	private int sfkt;
 	private String jhsj;
 	private Double yh=0.0;
@@ -51,7 +51,7 @@ 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 and xlbm like %?3%",nativeQuery=true)
+	@Query(value="select ifnull(jzl,0),ifnull(zlc,0),ifnull(sh,0) 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);
 	/**
@@ -71,7 +71,7 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	List<Object[]> checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
-	@Query(value="select sum(s.jzl),sum(s.yh),sum(s.sh) from Ylb s "
+	@Query(value="select jzl,yh,sh from Ylb s "
 			+ " where to_days(?1)=to_days(s.rq)  "
 			+ " and s.ssgsdm like %?2% "
 			+ " and s.fgsdm like %?3%"
@@ -81,7 +81,7 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	@Transactional
 	@Modifying
-	@Query(value="select sum(jzl),sum(yh),sum(sh) from bsth_c_ylb "
+	@Query(value="select ifnull(jzl,0),ifnull(yh,0),ifnull(sh,0) from bsth_c_ylb "
 			+ " where to_days(?1)=to_days(rq) "
 			+ " and ssgsdm like %?2% "
 			+ " and fgsdm like %?3%"
@@ -15,7 +15,7 @@ public interface YlbService extends BaseService&lt;Ylb, Integer&gt;{
 	Map<String, Object> checkYl(Map<String, Object> map);
-	List<Object[]> sumYlb(Map<String, Object> map);
+	Map<String, Object> sumYlb(Map<String, Object> map);
 	List<Ylb> oilListMonth(String line,String date);
@@ -38,6 +38,7 @@ import com.bsth.repository.oil.YlxxbRepository;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.oil.YlbService;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
+import com.bsth.util.Arith;
 import com.bsth.util.BatchSaveUtils;
 import com.github.abel533.echarts.code.Y;
@@ -298,9 +299,16 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						Ylxxb ylxxb = ylxxList.get(j);
 						if (map.get("clZbh").toString().equals(ylxxb.getNbbm())
 								&& map.get("jGh").toString().equals(ylxxb.getJsy())) {
-							jzl += ylxxb.getJzl();
+//							jzl += ylxxb.getJzl();
+							jzl =Arith.add(jzl, ylxxb.getJzl());
 						}
 					}
+					if(map.get("clZbh").toString().equals("W0A-212")){
+						System.out.println();
+					}
+					if(map.get("clZbh").toString().equals("W0A-211")){
+						System.out.println();
+					}
 					t.setJzl(jzl);
 					t.setNbbm(map.get("clZbh").toString());
 					t.setJsy(map.get("jGh") == null ? "" : map.get("jGh").toString());
@@ -389,13 +397,17 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					// 得到一天总的加油和里程（根据车，时间）
 					List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,ylb.getXlbm());
 					// 保存总的加油量
-					Double jzl = Double.valueOf(sumList.get(0)[0].toString());
+					Double jzl = 0.0;
 					// 保存总的里程
-					Double zlc = Double.valueOf(sumList.get(0)[1].toString());
-					
-					Double zsh = Double.valueOf(sumList.get(0)[2].toString());
-					
-					jzl=jzl-zsh;
+					Double zlc = 0.0;
+					//保存总的损耗
+					Double zsh = 0.0;
+					for (int j = 0; j < sumList.size(); j++) {
+						jzl = Arith.add(jzl, Double.valueOf(sumList.get(j)[0].toString()));
+						zlc = Arith.add(zlc, Double.valueOf(sumList.get(j)[1].toString()));
+						zsh = Arith.add(zsh, Double.valueOf(sumList.get(j)[2].toString()));
+					}
+					jzl = Arith.sub(jzl, zsh);
 					// 保留两位小数
 					DecimalFormat df = new DecimalFormat("#.00");
 					Double zyl = 0.0;
@@ -417,17 +429,23 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 								// 进场等于出场的操作 既 最后进场存油量等于第一次的出场存油量
 								Double yl = t.getCzyl();
 								Double jcyl = t.getCzyl();
-								zyl = jcyl + jzl - yl;
+//								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;
-								t.setJzyl(Double.parseDouble(df.format(nextJzyl)));
+//								nextJzyl = t.getJzl() + t.getCzyl() - yh;
+								nextJzyl =Arith.sub( Arith.add(t.getJzl(), t.getCzyl()),yh);
+//								t.setJzyl(Double.parseDouble(df.format(nextJzyl)));
+								t.setJzyl(nextJzyl);
 							} else {
-								t.setCzyl(Double.parseDouble(df.format(nextJzyl)));
+//								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.setJzyl(Double.parseDouble(df.format(nextJzyl)));
+//								nextJzyl = t.getJzl() + nextJzyl - yh;
+								nextJzyl =Arith.sub( Arith.add(t.getJzl(),nextJzyl),yh);
+//								t.setJzyl(Double.parseDouble(df.format(nextJzyl)));
+								t.setJzyl(nextJzyl);
 							}
 							repository.save(t);
 						}
@@ -490,18 +508,27 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			// 得到一天总的加油和里程（根据车，时间）
 			List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,ylb.getXlbm());
 			// 保存总的加油量
-			Double jzl = Double.valueOf(sumList.get(0)[0].toString());
+			Double jzl = 0.0;
 			// 保存总的里程
-			Double zlc = Double.valueOf(sumList.get(0)[1].toString());
-			// 保存总的损耗
-			Double zsh = Double.valueOf(sumList.get(0)[2].toString());
+			Double zlc = 0.0;
+			//保存总的损耗
+			Double zsh = 0.0;
+			for (int j = 0; j < sumList.size(); j++) {
+				jzl = Arith.add(jzl, Double.valueOf(sumList.get(j)[0].toString()));
+				zlc = Arith.add(zlc, Double.valueOf(sumList.get(j)[1].toString()));
+				zsh = Arith.add(zsh, Double.valueOf(sumList.get(j)[2].toString()));
+			}
+			jzl = Arith.sub(jzl, zsh);
 			//新的 损耗不等于 旧的损耗 总损耗从新算
-			if(ylb.getSh() - sh >0.0000001 || ylb.getSh()-sh <0.00000001){
-				zsh =zsh-ylb.getSh()+sh;
-				jzl =jzl-zsh;
+			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=jzl-zsh;
+				jzl =Arith.sub(jzl, zsh);
 			}
 			map.put("nbbm_eq", nbbm_eq);
 			map.put("rq_eq", rq_eq);
@@ -523,25 +550,31 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						t.setShyy(shyy);
 					}
 					Double jcyl = t.getCzyl();
-					zyl = jcyl + jzl - yl;
+//					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();
-					t.setJzyl(Double.parseDouble(df.format(nextJzyl)));
+//					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);
 				} else {
 					if(t.getId()==id){
 						t.setSh(sh);
 						t.setShyy(shyy);
 					}
 					if (t.getZlc() != 0) {
-						t.setCzyl(Double.parseDouble(df.format(nextJzyl)));
+//						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();
-						t.setJzyl(Double.parseDouble(df.format(nextJzyl)));
+//						nextJzyl = t.getJzl() + nextJzyl - yh-t.getSh();
+						nextJzyl = Arith.sub(Arith.add(t.getJzl(), nextJzyl), Arith.add(yh, t.getSh()));
+//						t.setJzyl(Double.parseDouble(df.format(nextJzyl)));
+						t.setJzyl(nextJzyl);
 					}
 				}
@@ -642,7 +675,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					for(int z=0;z<cylList.size();z++){
 						cyl=cylList.get(z);
 						if(t.getNbbm().equals(cyl.getNbbm())){
-							cyl.setCyl(cyl.getCyl()+t.getJzl());
+//							cyl.setCyl(cyl.getCyl()+t.getJzl());
+							cyl.setCyl(Arith.add(cyl.getCyl(),t.getJzl()));
 							cyl.setUpdatetime(t.getRq());
 							status=true;
 							break;
@@ -734,7 +768,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 	@Override
-	public List<Object[]> sumYlb(Map<String, Object> map) {
+	public Map<String, Object> sumYlb(Map<String, Object> map) {
 		// TODO Auto-generated method stub
 		List<String> stringList=new ArrayList<String>();
 		String rq=map.get("rq").toString();
@@ -784,7 +818,17 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		}
+		Double jzl=0.0,yh=0.0,sh=0.0; 
+		for (int i = 0; i < sumYlbList.size(); i++) {
+			jzl = Arith.add(jzl, Double.valueOf(sumYlbList.get(i)[0].toString()));
+			yh = Arith.add(yh, Double.valueOf(sumYlbList.get(i)[1].toString()));
+			sh = Arith.add(sh, Double.valueOf(sumYlbList.get(i)[2].toString()));
+		}
+		Map<String, Object> sumMap=new HashMap<String,Object>();
+		sumMap.put("jzl", jzl);
+		sumMap.put("yh", yh);
+		sumMap.put("sh", sh);
 //		String sql="select sum(jzl),sum(yh),sum(sh) from bsth_c_ylb "
 //				+ " where to_days('"+map.get("rq").toString()+"')=to_days(rq)  "
 //				+ " and ssgsdm like '%"+map.get("ssgsdm_like").toString()+"%' "
@@ -794,7 +838,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 //		if(map.get("nbbm_in")!=null){
 ////			sql +=" and nbbm in ("
 //		}
-		return sumYlbList;
+		return sumMap;
 	}
@@ -1529,7 +1529,26 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             listSchedule.add(s);
             //计算营运里程，空驶里程
             if (!childTaskPlans.isEmpty()) {
-                String sqlPc = "select * from bsth_c_s_child_task where schedule=" + s.getId() + "  order by start_date ";
+            	 Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+            	 while (it.hasNext()) {
+            		 ScheduleRealInfo t = new ScheduleRealInfo();
+                     ChildTaskPlan childTaskPlan = it.next();
+                     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.setQdzName(childTaskPlan.getStartStationName());
+                     t.setZdzName(childTaskPlan.getEndStationName());
+                     t.setRemarks(childTaskPlan.getRemarks());
+                     t.setAdjustExps("子");
+                     listSchedule.add(t);
+            	 }
+            	 /* String sqlPc = "select * from bsth_c_s_child_task where schedule=" + s.getId() + "  order by start_date ";
                 List<ScheduleRealInfo> lists = jdbcTemplate.query(sqlPc,
                         new RowMapper<ScheduleRealInfo>() {
                             @Override
@@ -1554,7 +1573,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 for (int j = 0; j < lists.size(); j++) {
                     ScheduleRealInfo t = lists.get(j);
                     listSchedule.add(t);
-                }
+                }*/
             }
         }
@@ -2870,6 +2889,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     }
     public List<Map<String, Object>> yesterdayDataList(String line, String date,String gsbm,String fgsbm,String jGh,String nbbm) {
+//    	Arith arith=new Arith();
         //前一天日期
 //		String date = sdfMonth.format(org.apache.commons.lang.time.DateUtils.addDays(new Date(), -1));
 //		String date = "2016-09-20";
@@ -2884,7 +2904,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             String clZbh = yesterdayDataList.get(x).get("clZbh").toString();
             double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0, jcclc = 0;
-            float addMileage = 0l, remMileage = 0l;
+            double addMileage = 0, remMileage = 0;
             Map<String, Object> map = new HashMap<String, Object>();
             boolean fage = true;
             String company="";
@@ -2905,16 +2925,19 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	                    tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
 	                    if (scheduleRealInfo.isSflj()) {
 	                    	if(scheduleRealInfo.getStatus() == -1){
-	                    		addMileage += tempJhlc;
+//	                    		addMileage += tempJhlc;
+	                    		addMileage =Arith.add(addMileage, tempJhlc);
 	                    	}
 	                    } else {
 	                        if (!(scheduleRealInfo.getBcType().equals("in")
 	                                || scheduleRealInfo.getBcType().equals("out"))) {
-	                            jhlc += tempJhlc;
+//	                            jhlc += tempJhlc;
+	                            jhlc =Arith.add(jhlc,tempJhlc);
 	                        }
 	                        if (scheduleRealInfo.getStatus() == -1) {
-	                            remMileage += tempJhlc;
+//	                            remMileage += tempJhlc;
+	                            remMileage =Arith.add(remMileage,tempJhlc);
 	                        }
 	                    }
 	                    Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
@@ -2923,7 +2946,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	                        if (scheduleRealInfo.getBcType().equals("in") ||
 	                                scheduleRealInfo.getBcType().equals("out")) {
 	                        	if (scheduleRealInfo.getStatus() != -1) {
-	                        		jcclc += tempJhlc;
+//	                        		jcclc += tempJhlc;
+	                        		jcclc=Arith.add(jcclc,tempJhlc);
 	                        	}
 	                        }
 	                        //主任务 放空班次属于营运
@@ -2932,7 +2956,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	//						}
 	                        else {
 	                            if (scheduleRealInfo.getStatus() != -1) {
-	                                yygl += tempJhlc;
+//	                                yygl += tempJhlc;
+	                                yygl=Arith.add(yygl,tempJhlc);
 	                            }
 	                        }
 	                    } else {
@@ -2941,15 +2966,21 @@ 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 += 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 += 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 += 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 += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
+	                                    yygl=Arith.add(yygl,childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage());
+
 	                                }
 	                            }
 	                        }
@@ -2959,7 +2990,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             }
             yesterdayDataList.get(x).put("company", company);
             yesterdayDataList.get(x).put("bCompany", bCompany);
-            yesterdayDataList.get(x).put("totalKilometers", yygl + ksgl + jcclc);
+            Double zgl=Arith.add(yygl,ksgl);
+            yesterdayDataList.get(x).put("totalKilometers", Arith.add(zgl, jcclc));
         }
         System.out.println();
+package com.bsth.util;
+
+import java.math.BigDecimal;
+
+public class Arith {
+	 /**   
+	    * 由于Java的简单类型不能够精确的对浮点数进行运算，这个工具类提供精   
+	    * 确的浮点数运算，包括加减乘除和四舍五入。   
+	    */    
+	    //默认除法运算精度    
+	    private static final int DEF_DIV_SCALE = 10;    
+	           
+	    //这个类不能实例化    
+	    private Arith(){    
+	    }    
+	  
+	    /**   
+	     * 提供精确的加法运算。   
+	     * @param v1 被加数   
+	     * @param v2 加数   
+	     * @return 两个参数的和   
+	     */    
+	    public static double add(double v1,double v2){    
+	        BigDecimal b1 = new BigDecimal(Double.toString(v1));    
+	        BigDecimal b2 = new BigDecimal(Double.toString(v2));    
+	        return b1.add(b2).doubleValue();    
+	    }    
+	       
+	    /**   
+	     * 提供精确的减法运算。   
+	     * @param v1 被减数   
+	     * @param v2 减数   
+	     * @return 两个参数的差   
+	     */    
+	    public static double sub(double v1,double v2){    
+	        BigDecimal b1 = new BigDecimal(Double.toString(v1));    
+	        BigDecimal b2 = new BigDecimal(Double.toString(v2));    
+	        return b1.subtract(b2).doubleValue();    
+	    }    
+	       
+	    /**   
+	     * 提供精确的乘法运算。   
+	     * @param v1 被乘数   
+	     * @param v2 乘数   
+	     * @return 两个参数的积   
+	     */    
+	    public static double mul(double v1,double v2){    
+	        BigDecimal b1 = new BigDecimal(Double.toString(v1));    
+	        BigDecimal b2 = new BigDecimal(Double.toString(v2));    
+	        return b1.multiply(b2).doubleValue();    
+	    }    
+	  
+	    /**   
+	     * 提供（相对）精确的除法运算，当发生除不尽的情况时，精确到   
+	     * 小数点以后10位，以后的数字四舍五入。   
+	     * @param v1 被除数   
+	     * @param v2 除数   
+	     * @return 两个参数的商   
+	     */    
+	    public static double div(double v1,double v2){    
+	        return div(v1,v2,DEF_DIV_SCALE);    
+	    }    
+	  
+	    /**   
+	     * 提供（相对）精确的除法运算。当发生除不尽的情况时，由scale参数指   
+	     * 定精度，以后的数字四舍五入。   
+	     * @param v1 被除数   
+	     * @param v2 除数   
+	     * @param scale 表示表示需要精确到小数点以后几位。   
+	     * @return 两个参数的商   
+	     */    
+	    public static double div(double v1,double v2,int scale){    
+	        if(scale<0){    
+	            throw new IllegalArgumentException(    
+	                "The scale must be a positive integer or zero");    
+	        }    
+	        BigDecimal b1 = new BigDecimal(Double.toString(v1));    
+	        BigDecimal b2 = new BigDecimal(Double.toString(v2));    
+	        return b1.divide(b2,scale,BigDecimal.ROUND_HALF_UP).doubleValue();    
+	    }    
+	  
+	    /**   
+	     * 提供精确的小数位四舍五入处理。   
+	     * @param v 需要四舍五入的数字   
+	     * @param scale 小数点后保留几位   
+	     * @return 四舍五入后的结果   
+	     */    
+	    public static double round(double v,int scale){    
+	        if(scale<0){    
+	            throw new IllegalArgumentException(    
+	                "The scale must be a positive integer or zero");    
+	        }    
+	        BigDecimal b = new BigDecimal(Double.toString(v));    
+	        BigDecimal one = new BigDecimal("1");    
+	        return b.divide(one,scale,BigDecimal.ROUND_HALF_UP).doubleValue();    
+	    }    
+	       
+	   /**   
+	    * 提供精确的类型转换(Float)   
+	    * @param v 需要被转换的数字   
+	    * @return 返回转换结果   
+	    */    
+	    public static float convertsToFloat(double v){    
+	        BigDecimal b = new BigDecimal(v);    
+	        return b.floatValue();    
+	    }    
+	       
+	    /**   
+	    * 提供精确的类型转换(Int)不进行四舍五入   
+	    * @param v 需要被转换的数字   
+	    * @return 返回转换结果   
+	    */    
+	    public static int convertsToInt(double v){    
+	        BigDecimal b = new BigDecimal(v);    
+	        return b.intValue();    
+	    }    
+	  
+	    /**   
+	    * 提供精确的类型转换(Long)   
+	    * @param v 需要被转换的数字   
+	    * @return 返回转换结果   
+	    */    
+	    public static long convertsToLong(double v){    
+	        BigDecimal b = new BigDecimal(v);    
+	        return b.longValue();    
+	    }    
+	  
+	    /**   
+	    * 返回两个数中大的一个值   
+	    * @param v1 需要被对比的第一个数   
+	    * @param v2 需要被对比的第二个数   
+	    * @return 返回两个数中大的一个值   
+	    */    
+	    public static double returnMax(double v1,double v2){    
+	        BigDecimal b1 = new BigDecimal(v1);    
+	        BigDecimal b2 = new BigDecimal(v2);    
+	        return b1.max(b2).doubleValue();    
+	    }    
+	  
+	    /**   
+	    * 返回两个数中小的一个值   
+	    * @param v1 需要被对比的第一个数   
+	    * @param v2 需要被对比的第二个数   
+	    * @return 返回两个数中小的一个值   
+	    */    
+	    public static double returnMin(double v1,double v2){    
+	        BigDecimal b1 = new BigDecimal(v1);    
+	        BigDecimal b2 = new BigDecimal(v2);    
+	        return b1.min(b2).doubleValue();    
+	    }    
+	  
+	    /**   
+	    * 精确对比两个数字   
+	    * @param v1 需要被对比的第一个数   
+	    * @param v2 需要被对比的第二个数   
+	    * @return 如果两个数一样则返回0，如果第一个数比第二个数大则返回1，反之返回-1   
+	    */    
+	        public static int compareTo(double v1,double v2){    
+	        BigDecimal b1 = new BigDecimal(v1);    
+	        BigDecimal b2 = new BigDecimal(v2);    
+	        return b1.compareTo(b2);    
+	    }   
+}
@@ -20,7 +20,7 @@
 						class="caption-subject font-dark sbold uppercase">加油人员不符</span>
 				</div>
 				<div class="actions">
-					<a class="btn btn-circle blue" href="cylAdd.html" data-pjax><i class="fa fa-plus"></i> 添加</a>
+<!-- 					<a class="btn btn-circle blue" href="cylAdd.html" data-pjax><i class="fa fa-plus"></i> 添加</a> -->
 					<button type="button" class="btn btn-circle blue"  id="saveButton"><i class="fa fa-minus-square"></i> 保存</button>
 					<!-- <button type="button" class="btn btn-circle red" disabled="disabled" id="removeButton"><i class="fa fa-trash"></i> 删除用户</button> -->
 					<!-- <div class="btn-group">
@@ -21,7 +21,7 @@
                 </div>
                 <div class="actions">
                     <a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加</a>
-                    <!-- 					<button type="button" class="btn btn-circle blue"  id="removeButton"><i class="fa fa-trash-o"></i> 删除</button> -->
+                    <button type="button" class="btn btn-circle blue"  id="removeButton"><i class="fa fa-trash-o"></i> 删除</button>
                     <button type="button" class="btn btn-circle blue" id="sortButton"><i class="fa fa-minus-square"></i>
                         拆分/保存
                     </button>
@@ -293,7 +293,8 @@
             } else {
                 layer.msg('请选择日期.');
             }
-        })
+        });
+     
         //拆分
         $("#sortButton").on('click', function () {
             if ($("#rq").val() != "") {
@@ -489,10 +490,11 @@
                 }
                 layer.close(l);
             	$get('/ylb/sumYlb',params,function(returns){
-            		console.log(returns[0])
-            		$("#sumJzl").html(returns[0][0]);
-            		$("#sumYh").html(returns[0][1]);
-            		$("#sumSh").html(returns[0][2]);
+            		console.log(returns);
+            		console.log(returns.jzl);
+            		$("#sumJzl").html(returns.jzl);
+            		$("#sumYh").html(returns.yh);
+            		$("#sumSh").html(returns.sh);
         		});
                 startOptJzylLink($('#ll_oil_list .in_carpark_jzyl'));
                 startOptShylLink($('#ll_oil_list .in_carpark_shyl'));
@@ -582,13 +584,15 @@
         //删除
         $('#removeButton').on('click', function () {
-            if ($(this).attr('disabled'))
-                return;
-
-            var id = $('input.icheck:checked').data('id');
-            removeConfirm('确定要删除选中的数据？', '/resource/' + id, function () {
-                $('tr.filter .filter-submit').click();
-            });
+        	var id = $('input.icheck:checked').data('id');
+	       	 if (typeof(id) == 'undefined') {
+	       		 layer.msg("请选择要删除的数据");
+	       	 }else{
+	            removeConfirm('确定要删除选中的数据？', '/ylb/' + id, function () {
+	            	  var params=getParamsList();
+	            	  jsDoQuery(params, true);
+	            });
+	       	 }
         });
         //搜索线路