到离站报表站点筛选项排序问题修复，根据时间查询线路历史站点；油量进出场获取之前的进场油量作为出场油量时进场存油为0的也获取；预算报表导入公里异常修复；预算报表统计结果异常修复。

娄高锋
1 parent 07c67de9
Showing 5 changed files with 174 additions and 165 deletions
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/repository/LsStationRouteRepository.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/repository/oil/YlbRepository.java
src/main/java/com/bsth/service/forms/impl/BudgetServiceImpl.java
@@ -218,8 +218,9 @@ public class ReportController {
 		return new ArrayList<Map<String, Object>>();
 	}
 	@RequestMapping(value = "/sreachZd", method = RequestMethod.GET)
-	public List<Map<String, String>> sreachPersonnel(@RequestParam String line,@RequestParam int zdlx) {
-		return service.sreachZd(line,zdlx);
+	public List<Map<String, String>> sreachPersonnel(@RequestParam String line,@RequestParam int zdlx,
+			@RequestParam String date1,@RequestParam String date2) {
+		return service.sreachZd(line,zdlx,date1,date2);
 	}
@@ -3,7 +3,6 @@ package com.bsth.repository;
 import java.util.List;
 import java.util.Map;
-import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
@@ -11,7 +10,6 @@ import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 import com.bsth.entity.LsStationRoute;
-import com.bsth.entity.StationRoute;
 /**
  * 
@@ -293,4 +291,14 @@ public interface LsStationRouteRepository extends BaseRepository&lt;LsStationRoute,
     @Query(value="select count(*) from  bsth_c_ls_stationroute where line_code = ?1 and directions = ?2 and destroy = 0 and versions = ?3 ", nativeQuery=true)
 	int count(int line, int dir, int version);
+	
+	@Query(value = " select r.station_code, r.station_name, r.versions " +
+					"from bsth_c_ls_stationroute r where r.line_code = ?1 " +
+					"and r.directions=?2 and r.destroy = 0 and r.versions in(" +
+					"select v.versions from bsth_c_line_versions v where v.line_code=?1 " +
+					"and ((date_format(v.start_date, '%Y-%m-%d') >= ?3 and date_format(v.start_date, '%Y-%m-%d') <= ?4) " +
+					" or  (date_format(v.start_date, '%Y-%m-%d') <= ?4 and date_format(v.end_date, '%Y-%m-%d') >= ?4) " +
+					" or  (date_format(v.start_date, '%Y-%m-%d') >= ?3 and date_format(v.end_date, '%Y-%m-%d') <= ?4))" +
+					") order by r.versions desc, r.station_route_code asc ", nativeQuery = true)
+    List<Object[]> findHistory(String lineCode, Integer updown, String date1, String date2);
 }
@@ -420,7 +420,7 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
 	@Query("select r from StationRoute r where r.line.id=?1 and r.directions=?2 and r.destroy=0 order by r.stationRouteCode")
 	List<StationRoute> findByLine(Integer lineId, Integer dir);
-	@Query("select r from StationRoute r where r.lineCode=?1 and r.directions=?2 and versions is not null order by r.destroy, r.stationRouteCode")
+	@Query("select r from StationRoute r where r.lineCode=?1 and r.directions=?2 and r.destroy=0 order by r.stationRouteCode")
 	List<StationRoute> findAllByLine(String lineCode, int updown);
 	@EntityGraph(value = "stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
@@ -47,7 +47,7 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	List<Ylb> listMaxRqJcsx(String rq,String gsbm,String fgsbm,String xlbm,String nbbm);
 	@Query(value="select * from bsth_c_ylb where "
-			+ " DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= rq "
+			+ " DATE_SUB(CURDATE(), INTERVAL 60 DAY) <= rq "
 			+ " and rq< ?1 and ssgsdm like %?2%"
 			+ " and fgsdm like %?3% and xlbm like %?4% and nbbm like %?5% "
 			+ " order by nbbm , rq desc,jcsx desc,lp desc",nativeQuery=true)
@@ -150,7 +150,6 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 			for(int i = 0; i < textList.size(); i++){
 				String text = textList.get(i);
-//				System.out.println(text);
 				String[] split = text.split(",");
 				int rowNo = Integer.valueOf(split[0].trim());
 				String year = split[1].trim();
@@ -229,11 +228,11 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 						Budget bud = budgets.get(0);
 						if(b.getFormalPerson() != null){
 							if(bud.getBudgetMileage() != null){
-								bud.setChangeMileage(b.getFormalPerson());
+								bud.setChangeMileage(b.getFormalMileage());
 							} else {
-								bud.setBudgetMileage(b.getFormalPerson());
+								bud.setBudgetMileage(b.getFormalMileage());
 							}
-							bud.setFormalMileage(b.getFormalPerson());
+							bud.setFormalMileage(b.getFormalMileage());
 						}
 						if(b.getFormalPerson() != null){
 							if(bud.getBudgetPerson() != null){
@@ -251,11 +250,11 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 							}
 							bud.setFormalAmounts(b.getFormalAmounts());
 						}
-						repository.update(bud.getBudgetMileage(), bud.getChangeMileage(), bud.getFormalPerson(), 
+						repository.update(bud.getBudgetMileage(), bud.getChangeMileage(), bud.getFormalMileage(), 
 								bud.getBudgetPerson(), bud.getChangePerson(), bud.getFormalPerson(), 
 								bud.getBudgetAmounts(), bud.getChangeAmounts(), bud.getFormalAmounts(), bud.getId());
 					} else {
-						b.setBudgetMileage(b.getFormalPerson());
+						b.setBudgetMileage(b.getFormalMileage());
 						b.setBudgetPerson(b.getFormalPerson());
 						b.setBudgetAmounts(b.getFormalAmounts());
 						insertList.add(b);
@@ -380,7 +379,6 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 								r.setXlName(lineAllMap.get(name).getName());
 							}
 						} else {
-							boolean flag = true;
 							for(String key : lineAllMap.keySet()){
 								Line l = lineAllMap.get(key);
 								String name = l.getName();
@@ -388,15 +386,11 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 									name = name.replaceAll("区间", "") + l.getStartStationName().substring(0, 1);
 								}
 								if(l.getName().equals(lineName) || name.equals(lineName)){
-									flag = false;
 									r.setXlBm(l.getLineCode());
 									r.setXlName(l.getName());
 									break;
 								}
 							}
-//							if(flag){
-//								System.out.println(m.get("lineName").toString() + " >> " + lineName);
-//							}
 						}
 						if(r.getXlBm() != null){
@@ -432,6 +426,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 		// TODO Auto-generated method stub
 		SimpleDateFormat sdfYY = new SimpleDateFormat("YYYY");
 		SimpleDateFormat sdfMM = new SimpleDateFormat("MM");
+		DecimalFormat df = new DecimalFormat("0.###");
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
 		Map<String, Boolean> lineNature = lineService.lineNature();
@@ -474,9 +469,9 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 				m.put("xlName", xlName);
 				m.put("sfyy", sfyy);
 				m.put("sfjc", sfjc);
-				m.put("budget", b.getBudgetMileage()!=null?b.getBudgetMileage():"");
-				m.put("change", b.getChangeMileage()!=null?b.getChangeMileage():"");
-				m.put("formal", b.getFormalMileage()!=null?b.getFormalMileage():"");
+				m.put("budget", b.getBudgetMileage()!=null?df.format(b.getBudgetMileage()):"");
+				m.put("change", b.getChangeMileage()!=null?df.format(b.getChangeMileage()):"");
+				m.put("formal", b.getFormalMileage()!=null?df.format(b.getFormalMileage()):"");
 				for(int i = 1; i <= 12; i++){
 					m.put("mon"+i, "");
 					m.put("bud"+i, "");
@@ -494,28 +489,28 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 				String bud = "bud" + Integer.valueOf(b.getYear().split("-")[1]);
 				if(b.getBudgetMileage()!=null){
 					if(m.get("budget").toString().length() > 0){
-						m.put("budget", new BigDecimal(m.get("budget").toString()).add(
-								new BigDecimal(b.getBudgetMileage())).doubleValue());
+						m.put("budget", df.format(new BigDecimal(m.get("budget").toString()).add(
+								new BigDecimal(b.getBudgetMileage())).doubleValue()));
 					} else {
-						m.put("budget", b.getBudgetMileage());
+						m.put("budget", df.format(b.getBudgetMileage()));
 					}
 				}
 				if(b.getChangeMileage()!=null){
 					if(m.get("change").toString().length() > 0){
-						m.put("change", new BigDecimal(m.get("change").toString()).add(
-								new BigDecimal(b.getChangeMileage())).doubleValue());
+						m.put("change", df.format(new BigDecimal(m.get("change").toString()).add(
+								new BigDecimal(b.getChangeMileage())).doubleValue()));
 					} else {
-						m.put("change", b.getChangeMileage());
+						m.put("change", df.format(b.getChangeMileage()));
 					}
 				}
 				if(b.getFormalMileage()!=null){
 					if(m.get("formal").toString().length() > 0){
-						m.put("formal", new BigDecimal(m.get("formal").toString()).add(
-								new BigDecimal(b.getFormalMileage())).doubleValue());
+						m.put("formal", df.format(new BigDecimal(m.get("formal").toString()).add(
+								new BigDecimal(b.getFormalMileage())).doubleValue()));
 					} else {
-						m.put("formal", b.getFormalMileage());
+						m.put("formal", df.format(b.getFormalMileage()));
 					}
-					m.put(bud, b.getFormalMileage());
+					m.put(bud, df.format(b.getFormalMileage()));
 				}
 			}
 		}
@@ -611,6 +606,50 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 			}
 			strList.add(gsBm + "_all");
+			BigDecimal monAll = new BigDecimal("0");
+			BigDecimal preAll = new BigDecimal("0");
+			for(int i = 1; i <= 12; i++){
+				if(m.get("mon"+i).toString().length() > 0){
+					BigDecimal val = new BigDecimal(m.get("mon"+i).toString());
+					monAll = monAll.add(val);
+					val = val.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
+					m.put("mon"+i, val.doubleValue());
+				}
+				if(m.get("pre"+i).toString().length() > 0){
+					BigDecimal val = new BigDecimal(m.get("pre"+i).toString());
+					preAll = preAll.add(val);
+					val = val.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
+					m.put("pre"+i, val.doubleValue());
+					if(m.get("mon"+i).toString().length() > 0){
+						BigDecimal monVal = new BigDecimal(m.get("mon"+i).toString());
+						BigDecimal sub = monVal.subtract(val);
+						m.put("sub"+i, sub.doubleValue() > 0 ? "+" + sub.doubleValue() : sub.doubleValue());
+					} else {
+						m.put("sub"+i, "-" + val.doubleValue());
+					}
+				}
+			}
+			monAll = monAll.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
+			preAll = preAll.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
+			Double subAll = monAll.subtract(preAll).doubleValue();
+			m.put("monAll", monAll.doubleValue());
+			m.put("preAll", preAll.doubleValue());
+			m.put("subAll", subAll > 0 ? "+" + subAll : subAll);
+			
+			if(m.get("formal").toString().length() > 0 && m.get("monAll").toString().length() > 0
+					&& new BigDecimal(m.get("formal").toString()).doubleValue() > 0d){
+				BigDecimal formal = new BigDecimal(m.get("formal").toString());
+				m.put("complete", monAll.divide(
+						formal, 4, BigDecimal.ROUND_HALF_UP).multiply(
+						new BigDecimal(100)).divide(
+						new BigDecimal(1), 2, BigDecimal.ROUND_HALF_UP)+ "%");
+				BigDecimal diff = monAll.subtract(formal);
+				m.put("diff", diff.doubleValue() > 0 ? "+" + diff.doubleValue() : diff.doubleValue());
+			} else {
+				m.put("complete", "");
+				m.put("diff", "");
+			}
+			
 			for(String str : strList){
 				if(!keyMap.containsKey(str)){
 					continue;
@@ -652,7 +691,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					}
 					if(m.get(bud).toString().length() > 0){
 						if(map.get(bud).toString().length() > 0){
-							map.put(mon, new BigDecimal(m.get(bud).toString()).add(
+							map.put(bud, new BigDecimal(m.get(bud).toString()).add(
 									new BigDecimal(map.get(bud).toString())).doubleValue());
 						} else {
 							map.put(bud, new BigDecimal(m.get(bud).toString()).doubleValue());
@@ -670,50 +709,6 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 				List<Map<String, Object>>dataList = (List<Map<String, Object>>)map.get("dataList");
 				dataList.add(m);
 			}
-			
-			BigDecimal monAll = new BigDecimal("0");
-			BigDecimal preAll = new BigDecimal("0");
-			for(int i = 1; i <= 12; i++){
-				if(m.get("mon"+i).toString().length() > 0){
-					BigDecimal val = new BigDecimal(m.get("mon"+i).toString());
-					monAll = monAll.add(val);
-					val = val.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
-					m.put("mon"+i, val.doubleValue());
-				}
-				if(m.get("pre"+i).toString().length() > 0){
-					BigDecimal val = new BigDecimal(m.get("pre"+i).toString());
-					preAll = preAll.add(val);
-					val = val.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
-					m.put("pre"+i, val.doubleValue());
-					if(m.get("mon"+i).toString().length() > 0){
-						BigDecimal monVal = new BigDecimal(m.get("mon"+i).toString());
-						BigDecimal sub = monVal.subtract(val);
-						m.put("sub"+i, sub.doubleValue() > 0 ? "+" + sub.doubleValue() : sub.doubleValue());
-					} else {
-						m.put("sub"+i, "-" + val.doubleValue());
-					}
-				}
-			}
-			monAll = monAll.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
-			preAll = preAll.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
-			Double subAll = monAll.subtract(preAll).doubleValue();
-			m.put("monAll", monAll.doubleValue());
-			m.put("preAll", preAll.doubleValue());
-			m.put("subAll", subAll > 0 ? "+" + subAll : subAll);
-			
-			if(m.get("formal").toString().length() > 0 && m.get("monAll").toString().length() > 0
-					&& new BigDecimal(m.get("formal").toString()).doubleValue() > 0d){
-				BigDecimal formal = new BigDecimal(m.get("formal").toString());
-				m.put("complete", monAll.divide(
-						formal, 4, BigDecimal.ROUND_HALF_UP).multiply(
-						new BigDecimal(100)).divide(
-						new BigDecimal(1), 2, BigDecimal.ROUND_HALF_UP)+ "%");
-				BigDecimal diff = monAll.subtract(formal);
-				m.put("diff", diff.doubleValue() > 0 ? "+" + diff.doubleValue() : diff.doubleValue());
-			} else {
-				m.put("complete", "");
-				m.put("diff", "");
-			}
 		}
 		for(String key : strs){
@@ -764,14 +759,10 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 				if(m.get("mon"+i).toString().length() > 0){
 					BigDecimal val = new BigDecimal(m.get("mon"+i).toString());
 					monAll = monAll.add(val);
-					val = val.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
-					m.put("mon"+i, val.doubleValue());
 				}
 				if(m.get("pre"+i).toString().length() > 0){
 					BigDecimal val = new BigDecimal(m.get("pre"+i).toString());
 					preAll = preAll.add(val);
-					val = val.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
-					m.put("pre"+i, val.doubleValue());
 					if(m.get("mon"+i).toString().length() > 0){
 						BigDecimal monVal = new BigDecimal(m.get("mon"+i).toString());
 						BigDecimal sub = monVal.subtract(val);
@@ -781,8 +772,6 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					}
 				}
 			}
-			monAll = monAll.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
-			preAll = preAll.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
 			Double subAll = monAll.subtract(preAll).doubleValue();
 			m.put("monAll", monAll.doubleValue());
 			m.put("preAll", preAll.doubleValue());
@@ -869,6 +858,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 		// TODO Auto-generated method stub
 		SimpleDateFormat sdfYY = new SimpleDateFormat("YYYY");
 		SimpleDateFormat sdfMM = new SimpleDateFormat("MM");
+		DecimalFormat df = new DecimalFormat("0.###");
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
 		Map<String, Boolean> lineNature = lineService.lineNature();
@@ -882,7 +872,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		List<Revenue> revenueList_1 = revenueRepository.findByDates(year_1+"-01-01", year_1+"-12-31");
+		List<Revenue> revenueList_1 = revenueRepository.findByDates(year_1+"-01-01", year_1+"-01-31");
 		Map<String, Map<String, Object>> xlMap = new HashMap<String, Map<String, Object>>();
 		List<Map<String, Object>> xlList = new ArrayList<Map<String, Object>>();
@@ -911,9 +901,9 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 				m.put("xlName", xlName);
 				m.put("sfyy", sfyy);
 				m.put("sfjc", sfjc);
-				m.put("budget", b.getBudgetPerson()!=null?b.getBudgetPerson():"");
-				m.put("change", b.getChangePerson()!=null?b.getChangePerson():"");
-				m.put("formal", b.getFormalPerson()!=null?b.getFormalPerson():"");
+				m.put("budget", b.getBudgetPerson()!=null?df.format(b.getBudgetPerson()):"");
+				m.put("change", b.getChangePerson()!=null?df.format(b.getChangePerson()):"");
+				m.put("formal", b.getFormalPerson()!=null?df.format(b.getFormalPerson()):"");
 				for(int i = 1; i <= 12; i++){
 					m.put("mon"+i, "");
 					m.put("bud"+i, "");
@@ -931,28 +921,28 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 				String bud = "bud" + Integer.valueOf(b.getYear().split("-")[1]);
 				if(b.getBudgetPerson()!=null){
 					if(m.get("budget").toString().length() > 0){
-						m.put("budget", new BigDecimal(m.get("budget").toString()).add(
-								new BigDecimal(b.getBudgetPerson())).doubleValue());
+						m.put("budget", df.format(new BigDecimal(m.get("budget").toString()).add(
+								new BigDecimal(b.getBudgetPerson())).doubleValue()));
 					} else {
-						m.put("budget", b.getBudgetPerson());
+						m.put("budget", df.format(b.getBudgetPerson()));
 					}
 				}
 				if(b.getChangePerson()!=null){
 					if(m.get("change").toString().length() > 0){
-						m.put("change", new BigDecimal(m.get("change").toString()).add(
-								new BigDecimal(b.getChangePerson())).doubleValue());
+						m.put("change", df.format(new BigDecimal(m.get("change").toString()).add(
+								new BigDecimal(b.getChangePerson())).doubleValue()));
 					} else {
-						m.put("change", b.getChangePerson());
+						m.put("change", df.format(b.getChangePerson()));
 					}
 				}
 				if(b.getFormalPerson()!=null){
 					if(m.get("formal").toString().length() > 0){
-						m.put("formal", new BigDecimal(m.get("formal").toString()).add(
-								new BigDecimal(b.getFormalPerson())).doubleValue());
+						m.put("formal", df.format(new BigDecimal(m.get("formal").toString()).add(
+								new BigDecimal(b.getFormalPerson())).doubleValue()));
 					} else {
-						m.put("formal", b.getFormalPerson());
+						m.put("formal", df.format(b.getFormalPerson()));
 					}
-					m.put(bud, b.getFormalPerson());
+					m.put(bud, df.format(b.getFormalPerson()));
 				}
 			}
 		}
@@ -1091,7 +1081,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					}
 					if(m.get(bud).toString().length() > 0){
 						if(map.get(bud).toString().length() > 0){
-							map.put(mon, new BigDecimal(m.get(bud).toString()).add(
+							map.put(bud, new BigDecimal(m.get(bud).toString()).add(
 									new BigDecimal(map.get(bud).toString())).doubleValue());
 						} else {
 							map.put(bud, new BigDecimal(m.get(bud).toString()).doubleValue());
@@ -1308,11 +1298,12 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 		// TODO Auto-generated method stub
 		SimpleDateFormat sdfYY = new SimpleDateFormat("YYYY");
 		SimpleDateFormat sdfMM = new SimpleDateFormat("MM");
+		DecimalFormat df = new DecimalFormat("0.###");
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
 		Map<String, Boolean> lineNature = lineService.lineNature();
 		List<Budget> findByYear = repository.findByYear(year);
-		List<Revenue> list = revenueRepository.findByDates(year+"-01-01", year+"-12-31");
+		List<Revenue> list = revenueRepository.findByDates(year+"-01-01", year+"-01-31");
 		String year_1 = "";
 		try {
@@ -1321,8 +1312,8 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		List<CalcStatistics> scheduleList_1 = calcStatisticsRepository.selectByDateAndLineTj3(year_1+"-01-01", year_1+"-12-31");
-		List<Revenue> revenueList_1 = revenueRepository.findByDates(year_1+"-01-01", year_1+"-12-31");
+		List<CalcStatistics> scheduleList_1 = calcStatisticsRepository.selectByDateAndLineTj3(year_1+"-01-01", year_1+"-01-31");
+		List<Revenue> revenueList_1 = revenueRepository.findByDates(year_1+"-01-01", year_1+"-01-31");
 		Map<String, Map<String, Object>> xlMap = new HashMap<String, Map<String, Object>>();
 		List<Map<String, Object>> xlList = new ArrayList<Map<String, Object>>();
@@ -1351,9 +1342,9 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 				m.put("xlName", xlName);
 				m.put("sfyy", sfyy);
 				m.put("sfjc", sfjc);
-				m.put("budget", b.getBudgetAmounts()!=null?b.getBudgetAmounts():"");
-				m.put("change", b.getChangeAmounts()!=null?b.getChangeAmounts():"");
-				m.put("formal", b.getFormalAmounts()!=null?b.getFormalAmounts():"");
+				m.put("budget", b.getBudgetAmounts()!=null?df.format(b.getBudgetAmounts()):"");
+				m.put("change", b.getChangeAmounts()!=null?df.format(b.getChangeAmounts()):"");
+				m.put("formal", b.getFormalAmounts()!=null?df.format(b.getFormalAmounts()):"");
 				for(int i = 1; i <= 12; i++){
 					m.put("mon"+i, "");
 					m.put("bud"+i, "");
@@ -1372,28 +1363,28 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 				String bud = "bud" + Integer.valueOf(b.getYear().split("-")[1]);
 				if(b.getBudgetAmounts()!=null){
 					if(m.get("budget").toString().length() > 0){
-						m.put("budget", new BigDecimal(m.get("budget").toString()).add(
-								new BigDecimal(b.getBudgetAmounts())).doubleValue());
+						m.put("budget", df.format(new BigDecimal(m.get("budget").toString()).add(
+								new BigDecimal(b.getBudgetAmounts())).doubleValue()));
 					} else {
-						m.put("budget", b.getBudgetAmounts());
+						m.put("budget", df.format(b.getBudgetAmounts()));
 					}
 				}
 				if(b.getChangeAmounts()!=null){
 					if(m.get("change").toString().length() > 0){
-						m.put("change", new BigDecimal(m.get("change").toString()).add(
-								new BigDecimal(b.getChangeAmounts())).doubleValue());
+						m.put("change", df.format(new BigDecimal(m.get("change").toString()).add(
+								new BigDecimal(b.getChangeAmounts())).doubleValue()));
 					} else {
-						m.put("change", b.getChangeAmounts());
+						m.put("change", df.format(b.getChangeAmounts()));
 					}
 				}
 				if(b.getFormalAmounts()!=null){
 					if(m.get("formal").toString().length() > 0){
-						m.put("formal", new BigDecimal(m.get("formal").toString()).add(
-								new BigDecimal(b.getFormalAmounts())).doubleValue());
+						m.put("formal", df.format(new BigDecimal(m.get("formal").toString()).add(
+								new BigDecimal(b.getFormalAmounts())).doubleValue()));
 					} else {
-						m.put("formal", b.getFormalAmounts());
+						m.put("formal", df.format(b.getFormalAmounts()));
 					}
-					m.put(bud, b.getFormalAmounts());
+					m.put(bud, df.format(b.getFormalAmounts()));
 				}
 			}
 		}
@@ -1529,7 +1520,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					}
 				}
 				for(int i = 1; i <= 12; i++){
-					String mon = "mon"+i, bud = "bud"+i;
+					String mon = "mon"+i, bud = "bud"+i, pre = "pre"+i;
 					if(m.get(mon).toString().length() > 0){
 						if(map.get(mon).toString().length() > 0){
 							map.put(mon, new BigDecimal(m.get(mon).toString()).add(
@@ -1540,12 +1531,20 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					}
 					if(m.get(bud).toString().length() > 0){
 						if(map.get(bud).toString().length() > 0){
-							map.put(mon, new BigDecimal(m.get(bud).toString()).add(
+							map.put(bud, new BigDecimal(m.get(bud).toString()).add(
 									new BigDecimal(map.get(bud).toString())).doubleValue());
 						} else {
 							map.put(bud, new BigDecimal(m.get(bud).toString()).doubleValue());
 						}
 					}
+					if(m.get(pre).toString().length() > 0){
+						if(map.get(pre).toString().length() > 0){
+							map.put(pre, new BigDecimal(m.get(pre).toString()).add(
+									new BigDecimal(map.get(pre).toString())).doubleValue());
+						} else {
+							map.put(pre, new BigDecimal(m.get(pre).toString()).doubleValue());
+						}
+					}
 				}
 				if(m.containsKey("num") && m.get("num").toString().length() > 0){
 					if(map.containsKey("num") && map.get("num").toString().length() > 0){
@@ -1582,10 +1581,10 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					}
 				}
 			}
-			BigDecimal monAll_ = monAll.divide(new BigDecimal("1000000"), 3, BigDecimal.ROUND_HALF_UP);
+			monAll = monAll.divide(new BigDecimal("1000000"), 3, BigDecimal.ROUND_HALF_UP);
 			preAll = preAll.divide(new BigDecimal("1000000"), 3, BigDecimal.ROUND_HALF_UP);
-			Double subAll = monAll_.subtract(preAll).doubleValue();
-			m.put("monAll", monAll_.doubleValue());
+			Double subAll = monAll.subtract(preAll).doubleValue();
+			m.put("monAll", monAll.doubleValue());
 			m.put("preAll", preAll.doubleValue());
 			m.put("subAll", subAll > 0 ? "+" + subAll : subAll);
@@ -1687,10 +1686,10 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					}
 				}
 			}
-			BigDecimal monAll_ = monAll.divide(new BigDecimal("1000000"), 3, BigDecimal.ROUND_HALF_UP);
+			monAll = monAll.divide(new BigDecimal("1000000"), 3, BigDecimal.ROUND_HALF_UP);
 			preAll = preAll.divide(new BigDecimal("1000000"), 3, BigDecimal.ROUND_HALF_UP);
-			Double subAll = monAll_.subtract(preAll).doubleValue();
-			m.put("monAll", monAll_.doubleValue());
+			Double subAll = monAll.subtract(preAll).doubleValue();
+			m.put("monAll", monAll.doubleValue());
 			m.put("preAll", preAll.doubleValue());
 			m.put("subAll", subAll > 0 ? "+" + subAll : subAll);
@@ -1784,6 +1783,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 		// TODO Auto-generated method stub
 		SimpleDateFormat sdfYY = new SimpleDateFormat("YYYY");
 		SimpleDateFormat sdfMM = new SimpleDateFormat("MM");
+		DecimalFormat df = new DecimalFormat("0.###");
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
 		List<Budget> findByYear = repository.findByYear(year);
@@ -1798,8 +1798,8 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		List<CalcStatistics> scheduleList_1 = calcStatisticsRepository.selectByDateAndLineTj3(year_1+"-01-01", year_1+"-12-31");
-		List<Revenue> revenueList_1 = revenueRepository.findByDates(year_1+"-01-01", year_1+"-12-31");
+		List<CalcStatistics> scheduleList_1 = calcStatisticsRepository.selectByDateAndLineTj3(year_1+"-01-01", year_1+"-01-31");
+		List<Revenue> revenueList_1 = revenueRepository.findByDates(year_1+"-01-01", year_1+"-01-31");
 		Map<String, Map<String, Object>> xlMap = new HashMap<String, Map<String, Object>>();
 		List<Map<String, Object>> xlList = new ArrayList<Map<String, Object>>();
@@ -1834,9 +1834,9 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					m.put("xlBm", xlBm);
 					m.put("xlName", xlName);
 					m.put("type", "公里");
-					m.put("budget", b.getBudgetMileage()!=null?b.getBudgetMileage():"");
-					m.put("change", b.getChangeMileage()!=null?b.getChangeMileage():"");
-					m.put("formal", b.getFormalMileage()!=null?b.getFormalMileage():"");
+					m.put("budget", b.getBudgetMileage()!=null?df.format(b.getBudgetMileage()):"");
+					m.put("change", b.getChangeMileage()!=null?df.format(b.getChangeMileage()):"");
+					m.put("formal", b.getFormalMileage()!=null?df.format(b.getFormalMileage()):"");
 					for(int i = 1; i <= 12; i++){
 						m.put("mon"+i, "");
 						m.put("bud"+i, "");
@@ -1844,7 +1844,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					}
 					String bud = "bud" + Integer.valueOf(b.getYear().split("-")[1]);
 					if(b.getFormalMileage()!=null){
-						m.put(bud, b.getFormalMileage());
+						m.put(bud, df.format(b.getFormalMileage()));
 					}
 					m.put("monAll", "0");
 					xlMap.put(key1, m);
@@ -1854,28 +1854,28 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					String bud = "bud" + Integer.valueOf(b.getYear().split("-")[1]);
 					if(b.getBudgetMileage()!=null){
 						if(m.get("budget").toString().length() > 0){
-							m.put("budget", new BigDecimal(m.get("budget").toString()).add(
-									new BigDecimal(b.getBudgetMileage())).doubleValue());
+							m.put("budget", df.format(new BigDecimal(m.get("budget").toString()).add(
+									new BigDecimal(b.getBudgetMileage())).doubleValue()));
 						} else {
-							m.put("budget", b.getBudgetMileage());
+							m.put("budget", df.format(b.getBudgetMileage()));
 						}
 					}
 					if(b.getChangeMileage()!=null){
 						if(m.get("change").toString().length() > 0){
-							m.put("change", new BigDecimal(m.get("change").toString()).add(
-									new BigDecimal(b.getChangeMileage())).doubleValue());
+							m.put("change", df.format(new BigDecimal(m.get("change").toString()).add(
+									new BigDecimal(b.getChangeMileage())).doubleValue()));
 						} else {
-							m.put("change", b.getChangeMileage());
+							m.put("change", df.format(b.getChangeMileage()));
 						}
 					}
 					if(b.getFormalMileage()!=null){
 						if(m.get("formal").toString().length() > 0){
-							m.put("formal", new BigDecimal(m.get("formal").toString()).add(
-									new BigDecimal(b.getFormalMileage())).doubleValue());
+							m.put("formal", df.format(new BigDecimal(m.get("formal").toString()).add(
+									new BigDecimal(b.getFormalMileage())).doubleValue()));
 						} else {
-							m.put("formal", b.getFormalMileage());
+							m.put("formal", df.format(b.getFormalMileage()));
 						}
-						m.put(bud, b.getFormalMileage());
+						m.put(bud, df.format(b.getFormalMileage()));
 					}
 				}
 			}
@@ -1888,9 +1888,9 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					m.put("xlBm", xlBm);
 					m.put("xlName", xlName);
 					m.put("type", "人次");
-					m.put("budget", b.getBudgetPerson()!=null?b.getBudgetPerson():"");
-					m.put("change", b.getChangePerson()!=null?b.getChangePerson():"");
-					m.put("formal", b.getFormalPerson()!=null?b.getFormalPerson():"");
+					m.put("budget", b.getBudgetPerson()!=null?df.format(b.getBudgetPerson()):"");
+					m.put("change", b.getChangePerson()!=null?df.format(b.getChangePerson()):"");
+					m.put("formal", b.getFormalPerson()!=null?df.format(b.getFormalPerson()):"");
 					for(int i = 1; i <= 12; i++){
 						m.put("mon"+i, "");
 						m.put("bud"+i, "");
@@ -1898,7 +1898,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					}
 					String bud = "bud" + Integer.valueOf(b.getYear().split("-")[1]);
 					if(b.getFormalPerson()!=null){
-						m.put(bud, b.getFormalPerson());
+						m.put(bud, df.format(b.getFormalPerson()));
 					}
 					m.put("monAll", "0");
 					xlMap.put(key2, m);
@@ -1908,28 +1908,28 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					String bud = "bud" + Integer.valueOf(b.getYear().split("-")[1]);
 					if(b.getBudgetPerson()!=null){
 						if(m.get("budget").toString().length() > 0){
-							m.put("budget", new BigDecimal(m.get("budget").toString()).add(
-									new BigDecimal(b.getBudgetPerson())).doubleValue());
+							m.put("budget", df.format(new BigDecimal(m.get("budget").toString()).add(
+									new BigDecimal(b.getBudgetPerson())).doubleValue()));
 						} else {
-							m.put("budget", b.getBudgetPerson());
+							m.put("budget", df.format(b.getBudgetPerson()));
 						}
 					}
 					if(b.getChangePerson()!=null){
 						if(m.get("change").toString().length() > 0){
-							m.put("change", new BigDecimal(m.get("change").toString()).add(
-									new BigDecimal(b.getChangePerson())).doubleValue());
+							m.put("change", df.format(new BigDecimal(m.get("change").toString()).add(
+									new BigDecimal(b.getChangePerson())).doubleValue()));
 						} else {
-							m.put("change", b.getChangePerson());
+							m.put("change", df.format(b.getChangePerson()));
 						}
 					}
 					if(b.getFormalPerson()!=null){
 						if(m.get("formal").toString().length() > 0){
-							m.put("formal", new BigDecimal(m.get("formal").toString()).add(
-									new BigDecimal(b.getFormalPerson())).doubleValue());
+							m.put("formal", df.format(new BigDecimal(m.get("formal").toString()).add(
+									new BigDecimal(b.getFormalPerson())).doubleValue()));
 						} else {
-							m.put("formal", b.getFormalPerson());
+							m.put("formal", df.format(b.getFormalPerson()));
 						}
-						m.put(bud, b.getFormalPerson());
+						m.put(bud, df.format(b.getFormalPerson()));
 					}
 				}
 			}
@@ -1942,9 +1942,9 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					m.put("xlBm", xlBm);
 					m.put("xlName", xlName);
 					m.put("type", "营收");
-					m.put("budget", b.getBudgetAmounts()!=null?b.getBudgetAmounts():"");
-					m.put("change", b.getChangeAmounts()!=null?b.getChangeAmounts():"");
-					m.put("formal", b.getFormalAmounts()!=null?b.getFormalAmounts():"");
+					m.put("budget", b.getBudgetAmounts()!=null?df.format(b.getBudgetAmounts()):"");
+					m.put("change", b.getChangeAmounts()!=null?df.format(b.getChangeAmounts()):"");
+					m.put("formal", b.getFormalAmounts()!=null?df.format(b.getFormalAmounts()):"");
 					for(int i = 1; i <= 12; i++){
 						m.put("mon"+i, "");
 						m.put("bud"+i, "");
@@ -1952,7 +1952,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					}
 					String bud = "bud" + Integer.valueOf(b.getYear().split("-")[1]);
 					if(b.getFormalAmounts()!=null){
-						m.put(bud, b.getFormalAmounts());
+						m.put(bud, df.format(b.getFormalAmounts()));
 					}
 					m.put("monAll", "0");
 					xlMap.put(key3, m);
@@ -1962,28 +1962,28 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					String bud = "bud" + Integer.valueOf(b.getYear().split("-")[1]);
 					if(b.getBudgetAmounts()!=null){
 						if(m.get("budget").toString().length() > 0){
-							m.put("budget", new BigDecimal(m.get("budget").toString()).add(
-									new BigDecimal(b.getBudgetAmounts())).doubleValue());
+							m.put("budget", df.format(new BigDecimal(m.get("budget").toString()).add(
+									new BigDecimal(b.getBudgetAmounts())).doubleValue()));
 						} else {
-							m.put("budget", b.getBudgetAmounts());
+							m.put("budget", df.format(b.getBudgetAmounts()));
 						}
 					}
 					if(b.getChangeAmounts()!=null){
 						if(m.get("change").toString().length() > 0){
-							m.put("change", new BigDecimal(m.get("change").toString()).add(
-									new BigDecimal(b.getChangeAmounts())).doubleValue());
+							m.put("change", df.format(new BigDecimal(m.get("change").toString()).add(
+									new BigDecimal(b.getChangeAmounts())).doubleValue()));
 						} else {
-							m.put("change", b.getChangeAmounts());
+							m.put("change", df.format(b.getChangeAmounts()));
 						}
 					}
 					if(b.getFormalAmounts()!=null){
 						if(m.get("formal").toString().length() > 0){
-							m.put("formal", new BigDecimal(m.get("formal").toString()).add(
-									new BigDecimal(b.getFormalAmounts())).doubleValue());
+							m.put("formal", df.format(new BigDecimal(m.get("formal").toString()).add(
+									new BigDecimal(b.getFormalAmounts())).doubleValue()));
 						} else {
-							m.put("formal", b.getFormalAmounts());
+							m.put("formal", df.format(b.getFormalAmounts()));
 						}
-						m.put(bud, b.getFormalAmounts());
+						m.put(bud, df.format(b.getFormalAmounts()));
 					}
 				}
 			}
@@ -2298,7 +2298,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 					}
 					if(m.get(bud).toString().length() > 0){
 						if(map.get(bud).toString().length() > 0){
-							map.put(mon, new BigDecimal(m.get(bud).toString()).add(
+							map.put(bud, new BigDecimal(m.get(bud).toString()).add(
 									new BigDecimal(map.get(bud).toString())).doubleValue());
 						} else {
 							map.put(bud, new BigDecimal(m.get(bud).toString()).doubleValue());