油量导入、百公里油耗日报两张报表添加合计栏。

娄高锋
1 parent 8cb334ec
Showing 2 changed files with 96 additions and 1 deletions
src/main/java/com/bsth/service/impl/RefuelServiceImpl.java
src/main/resources/static/pages/forms/statement/refuel_daily.html
@@ -60,6 +60,74 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 			driver = "%" + map.get("driver").toString() + "%";
 		}
 		List<Refuel> list = repository.findByDate(date, car, driver);
+		Refuel sum = new Refuel();
+		sum.setDateStr("合计");
+		sum.setLineName("");
+		sum.setCar("");
+		sum.setDriver("");
+		for(Refuel r : list){
+			if(r.getOutOil() != null && r.getOutOil().trim().length() > 0)
+				if(sum.getOutOil() != null && sum.getOutOil().trim().length() > 0){
+					sum.setOutOil(new BigDecimal(sum.getOutOil()).add(new BigDecimal(r.getOutOil())).toString());
+				} else {
+					sum.setOutOil(r.getOutOil());
+				}
+			if(r.getInOil() != null && r.getInOil().trim().length() > 0)
+				if(sum.getInOil() != null && sum.getInOil().trim().length() > 0){
+					sum.setInOil(new BigDecimal(sum.getInOil()).add(new BigDecimal(r.getInOil())).toString());
+				} else {
+					sum.setInOil(r.getInOil());
+				}
+			if(r.getInStation0() != null && r.getInStation0().trim().length() > 0)
+				if(sum.getInStation0() != null && sum.getInStation0().trim().length() > 0){
+					sum.setInStation0(new BigDecimal(sum.getInStation0()).add(new BigDecimal(r.getInStation0())).toString());
+				} else {
+					sum.setInStation0(r.getInStation0());
+				}
+			if(r.getInStation5() != null && r.getInStation5().trim().length() > 0)
+				if(sum.getInStation5() != null && sum.getInStation5().trim().length() > 0){
+					sum.setInStation5(new BigDecimal(sum.getInStation5()).add(new BigDecimal(r.getInStation5())).toString());
+				} else {
+					sum.setInStation5(r.getInStation5());
+				}
+			if(r.getOilCard0() != null && r.getOilCard0().trim().length() > 0)
+				if(sum.getOilCard0() != null && sum.getOilCard0().trim().length() > 0){
+					sum.setOilCard0(new BigDecimal(sum.getOilCard0()).add(new BigDecimal(r.getOilCard0())).toString());
+				} else {
+					sum.setOilCard0(r.getOilCard0());
+				}
+			if(r.getOilCard10() != null && r.getOilCard10().trim().length() > 0)
+				if(sum.getOilCard10() != null && sum.getOilCard10().trim().length() > 0){
+					sum.setOilCard10(new BigDecimal(sum.getOilCard10()).add(new BigDecimal(r.getOilCard10())).toString());
+				} else {
+					sum.setOilCard10(r.getOilCard10());
+				}
+			if(r.getEastStation0() != null && r.getEastStation0().trim().length() > 0)
+				if(sum.getEastStation0() != null && sum.getEastStation0().trim().length() > 0){
+					sum.setEastStation0(new BigDecimal(sum.getEastStation0()).add(new BigDecimal(r.getEastStation0())).toString());
+				} else {
+					sum.setEastStation0(r.getEastStation0());
+				}
+			if(r.getEastStation10() != null && r.getEastStation10().trim().length() > 0)
+				if(sum.getEastStation10() != null && sum.getEastStation10().trim().length() > 0){
+					sum.setEastStation10(new BigDecimal(sum.getEastStation10()).add(new BigDecimal(r.getEastStation10())).toString());
+				} else {
+					sum.setEastStation10(r.getEastStation10());
+				}
+			if(r.getOutStation0() != null && r.getOutStation0().trim().length() > 0)
+				if(sum.getOutStation0() != null && sum.getOutStation0().trim().length() > 0){
+					sum.setOutStation0(new BigDecimal(sum.getOutStation0()).add(new BigDecimal(r.getOutStation0())).toString());
+				} else {
+					sum.setOutStation0(r.getOutStation0());
+				}
+			if(r.getOutStation10() != null && r.getOutStation10().trim().length() > 0)
+				if(sum.getOutStation10() != null && sum.getOutStation10().trim().length() > 0){
+					sum.setOutStation10(new BigDecimal(sum.getOutStation10()).add(new BigDecimal(r.getOutStation10())).toString());
+				} else {
+					sum.setOutStation10(r.getOutStation10());
+				}
+		}
+		list.add(sum);
 		return list;
 	}
  
@@ -167,6 +235,13 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 		}
  
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		Map<String, Object> sum = new HashMap<String, Object>();
+		sum.put("date", "合计");
+		sum.put("line", "");
+		sum.put("car", "");
+		sum.put("driver", "");
+		String realMileageSum = "", oilSum = "";
+		
 		for(String key : keyList){
 			Refuel r = rMap.get(key);
 			Map<String, Object> m = new HashMap<String, Object>();
@@ -234,9 +309,29 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 			m.put("oil", oil);
 			m.put("consume", consume);
  
+			if(realMileage != null && realMileage.trim().length() > 0)
+				if(realMileageSum.length() > 0){
+					realMileageSum = new BigDecimal(realMileageSum).add(new BigDecimal(realMileage)).toString();
+				} else {
+					realMileageSum = realMileage + "";
+				}
+			if(oil != null && oil.trim().length() > 0)
+				if(oilSum.length() > 0){
+					oilSum = new BigDecimal(oilSum).add(new BigDecimal(oil)).toString();
+				} else {
+					oilSum = oil + "";
+				}
+			
 			resList.add(m);
 		}
  
+		sum.put("realMileage", realMileageSum);
+		sum.put("oil", oilSum);
+		if(realMileageSum.length() > 0 && oilSum.length() > 0 && !("0".equals(realMileageSum))){
+			sum.put("consume", df.format(new BigDecimal(oilSum).divide(new BigDecimal(realMileageSum), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100))));
+		}
+		resList.add(sum);
+		
 		return resList;
 	}
  
@@ -21,7 +21,7 @@
  
 <div class="page-head">
 	<div class="page-title">
-		<h1>油耗日报</h1>
+		<h1>百公里油耗日报</h1>
 	</div>
 </div>