能耗表计算能耗时只保留两位小数；路单数据线路明细月报、年报表保留三位小数。

娄高锋
1 parent 47367ea6
Showing 4 changed files with 17 additions and 21 deletions
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
src/main/java/com/bsth/service/oil/impl/QlbServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
@@ -2395,7 +2395,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		}
 		int i=1;
-        DecimalFormat df = new DecimalFormat("0.00");//格式化小数
+        DecimalFormat df = new DecimalFormat("0.000");//格式化小数
 		double allNum = 0.0;
 		while (iter.hasNext()) {
 			Map.Entry entry = (Map.Entry) iter.next();
@@ -2433,7 +2433,6 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			listStr.add(c.getTs()+"");
 			// 把列合计的数添加到最后一个
 			cList.add(c);
-			// DecimalFormat df = new DecimalFormat("0.00");//格式化小数
             for (CalcWaybillDetail c1:cList) {
                 if(StringUtils.isEmpty(c1.getXl())) {
                     listStr.add("");
@@ -108,7 +108,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 			String rq=sdf.format(dBefore);
 //		 String rq="2017-11-02";
 		String line="";
-		//保留两位小数
+		//公里保留三位小数
 		DecimalFormat df = new DecimalFormat("#.000");
 		// TODO Auto-generated method stub
 		Map<String, Object> newMap=new HashMap<String,Object>();
@@ -264,8 +264,8 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 				nbbm=map2.get("nbbm_eq").toString();
 			}
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-			// 保留两位小数
-			DecimalFormat df = new DecimalFormat("#.000");
+			// 加注量与能耗保留两位小数
+			DecimalFormat df = new DecimalFormat("0.##");
 			// TODO Auto-generated method stub
 			// 当天DLB信息
 			List<Dlb> dlList = this.listOrderBy(rq,gsbm,fgsbm,"",nbbm,"nbbm");
@@ -1056,8 +1056,8 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 		// TODO Auto-generated method stub
 		Map<String, List<Dlb>> mapList=new HashMap<String,List<Dlb>>();
 		 SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
-		// 保留两位小数
-		DecimalFormat df = new DecimalFormat("#.000");
+		// 加注量与能耗保留两位小数
+		DecimalFormat df = new DecimalFormat("0.##");
 		List<Dlb> dlbList=this.listOrderBy(date,gsdm,fgsdm,"","","nbbm");
 		List<Dlb> dlbList_upd=new ArrayList<Dlb>(); 
 		List<Dlb> dlbList_del=new ArrayList<Dlb>(); 
@@ -90,7 +90,7 @@ public class QlbServiceImpl extends BaseServiceImpl&lt;Qlb,Integer&gt; implements QlbS
 			String rq=sdf.format(dBefore);
 //		 String rq="2017-11-02";
 		String line="";
-		//保留两位小数
+		//公里保留三位小数
 		DecimalFormat df = new DecimalFormat("#.000");
 		// TODO Auto-generated method stub
 		Map<String, Object> newMap=new HashMap<String,Object>();
@@ -228,8 +228,8 @@ public class QlbServiceImpl extends BaseServiceImpl&lt;Qlb,Integer&gt; implements QlbS
 				nbbm=map2.get("nbbm_eq").toString();
 			}
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-			// 保留两位小数
-			DecimalFormat df = new DecimalFormat("#.000");
+			// 加注量与能耗保留两位小数
+			DecimalFormat df = new DecimalFormat("0.##");
 			// TODO Auto-generated method stub
 			// 当天QLB信息
 			List<Qlb> qlList = this.listOrderBy(rq,gsbm,fgsbm,"",nbbm,"nbbm");
@@ -1019,8 +1019,8 @@ public class QlbServiceImpl extends BaseServiceImpl&lt;Qlb,Integer&gt; implements QlbS
 		// TODO Auto-generated method stub
 		Map<String, List<Qlb>> mapList=new HashMap<String,List<Qlb>>();
 		 SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
-		// 保留两位小数
-		DecimalFormat df = new DecimalFormat("#.000");
+		// 加注量与能耗保留两位小数
+		DecimalFormat df = new DecimalFormat("0.##");
 		List<Qlb> qlbList=this.listOrderBy(date,gsdm,fgsdm,"","","nbbm");
 		List<Qlb> qlbList_upd=new ArrayList<Qlb>(); 
 		List<Qlb> qlbList_del=new ArrayList<Qlb>(); 
@@ -119,8 +119,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			calendar.add(Calendar.DAY_OF_MONTH, -1);  //设置为前一天
 			dBefore = calendar.getTime();   //得到前一天的时间
 			String rq=sdf.format(dBefore);
-			//保留两位小数
-			DecimalFormat df = new DecimalFormat("#.000");
 			// TODO Auto-generated method stub
 			Map<String, Object> newMap=new HashMap<String,Object>();
 			//当天YLB信息
@@ -269,8 +267,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				nbbm=map2.get("nbbm_eq").toString();
 			}
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-			// 保留两位小数
-			DecimalFormat df = new DecimalFormat("#.000");
 			// TODO Auto-generated method stub
 			// 当天YLB信息
 			List<Ylb> ylList = this.listOrderBy(rq,gsbm,fgsbm,"",nbbm,"nbbm");
@@ -667,8 +663,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						zsh = Arith.add(zsh, Double.valueOf(sumList.get(j)[2].toString()));
 					}
 //					jzl = Arith.sub(jzl, zsh);
-					// 保留两位小数
-					DecimalFormat df = new DecimalFormat("#.000");
+					// 加注量与能耗保留两位小数
+					DecimalFormat df = new DecimalFormat("0.##");
 					Double zyl = 0.0;
 					Double nextJzyl = 0.0;
 					// 保存已经计算过的车辆，相同车辆编号的车不在计算
@@ -1481,7 +1477,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 //						repository.obtainYl(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),"",
 //						ylb.getNbbm(),"jcsx");
-				DecimalFormat df = new DecimalFormat("#.000");
+				// 加注量与能耗保留两位小数
+				DecimalFormat df = new DecimalFormat("0.##");
 				Double zyl = 0.0;
 				Double nextJzyl = 0.0;
 				// 车的，进，出油量及耗油
@@ -1983,8 +1980,8 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						jzl = Arith.add(jzl, Double.valueOf(sumList.get(j)[0].toString()));
 						zlc = Arith.add(zlc, Double.valueOf(sumList.get(j)[1].toString()));
 					}
-					// 保留两位小数
-					DecimalFormat df = new DecimalFormat("#.000");
+					// 加注量与能耗保留两位小数
+					DecimalFormat df = new DecimalFormat("0.##");
 					Double zyl = 0.0;
 					Double nextJzyl = 0.0;
 					for (int j = 0; j < iterator2.size(); j++) {