路单月报年保中电耗量统计值大于实际值的问题

娄高锋
1 parent 02d235f0
Showing 2 changed files with 2476 additions and 2481 deletions
src/main/java/com/bsth/repository/calc/CalcWaybillRepository.java
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
@@ -75,19 +75,19 @@ public interface CalcWaybillRepository extends BaseRepository&lt;CalcWaybill, Integ
  
 	//按照时间段统计，公司下线路 (驾驶员)
 	@Query(value="select DISTINCT c from CalcWaybill c where c.xl in(?1) and c.rqStr between ?2 and ?3 and c.gsdm in(?4) and c.fgsdm in(?5) " +
-            "and c.xl in (select l.lineCode from Line l where l.destroy in (?6)) order by c.jGh,c.fgsdm,c.xl,c.rq")
+            "and c.xl in (select l.lineCode from Line l where l.destroy in (?6)) order by c.jGh,c.fgsdm,c.xl,c.rqStr")
 	List<CalcWaybill> scheduleByJsy2(List<String> line,String date,String date2,List<String> gsdm,List<String> fgsdm, List<Integer> destroy);
 	//按照时间段统计，公司下线路 (售票员) coalesce(c.sGh,'')
 	@Query(value="select DISTINCT c from CalcWaybill c where c.xl in(?1) and c.rqStr between ?2 and ?3 and c.gsdm in(?4) and c.fgsdm in(?5) and c.sGh <> null  and c.sGh <> '' " +
-            "and c.xl in (select l.lineCode from Line l where l.destroy in (?6))  order by c.sGh,c.fgsdm,c.xl,c.rq")
+            "and c.xl in (select l.lineCode from Line l where l.destroy in (?6))  order by c.sGh,c.fgsdm,c.xl,c.rqStr")
 	List<CalcWaybill> scheduleBySpy2(List<String> line,String date,String date2,List<String> gsdm,List<String> fgsdm, List<Integer> destroy);
 	//按照时间段统计，公司下线路 (车辆自编号)
 	@Query(value="select DISTINCT c from CalcWaybill c where c.xl in(?1) and c.rqStr between ?2 and ?3 and c.gsdm in(?4) and c.fgsdm in(?5) " +
-            "and c.xl in (select l.lineCode from Line l where l.destroy in (?6)) order by c.cl,c.fgsdm,c.xl,c.rq")
+            "and c.xl in (select l.lineCode from Line l where l.destroy in (?6)) order by c.cl,c.fgsdm,c.xl,c.rqStr")
 	List<CalcWaybill> scheduleByZbh2(List<String> line,String date,String date2,List<String> gsdm,List<String> fgsdm, List<Integer> destroy);
 	//按照时间段统计，公司下线路 排序不同
 	@Query(value="select DISTINCT c from CalcWaybill c where c.xl in(?1) and c.rqStr between ?2 and ?3 and c.gsdm in(?4) and c.fgsdm in(?5) " +
-            "and c.xl in (select l.lineCode from Line l where l.destroy in (?6)) order by c.fgsdm,c.xl,c.rq")
+            "and c.xl in (select l.lineCode from Line l where l.destroy in (?6)) order by c.fgsdm,c.xl,c.rqStr")
 	List<CalcWaybill> scheduleByDateAndLineTjPx(List<String> line,String date,String date2,List<String> gsdm,List<String> fgsdm, List<Integer> destroy);
  
 }
-package com.bsth.service.calc.impl;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.bsth.common.ResponseCode;
-import com.bsth.data.BasicData;
-import com.bsth.entity.Cars;
-import com.bsth.entity.Line;
-import com.bsth.entity.calc.CalcBusMileage;
-import com.bsth.entity.calc.CalcInterval;
-import com.bsth.entity.calc.CalcLineMileage;
-import com.bsth.entity.calc.CalcStatistics;
-import com.bsth.entity.calc.CalcWaybill;
-import com.bsth.entity.calc.CalcWaybillDetail;
-import com.bsth.entity.oil.Dlb;
-import com.bsth.entity.oil.Ylb;
-import com.bsth.entity.realcontrol.ChildTaskPlan;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.entity.sys.Interval;
-import com.bsth.repository.CarsRepository;
-import com.bsth.repository.LineRepository;
-import com.bsth.repository.calc.CalcBusMileageRepository;
-import com.bsth.repository.calc.CalcIntervalRepository;
-import com.bsth.repository.calc.CalcLineMileageRepository;
-import com.bsth.repository.calc.CalcStatisticsRepository;
-import com.bsth.repository.calc.CalcWaybillRepository;
-import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
-import com.bsth.service.LineService;
-import com.bsth.service.calc.CalcToolService;
-import com.bsth.service.calc.CalcWaybillService;
-import com.bsth.service.impl.BaseServiceImpl;
-import com.bsth.service.realcontrol.ScheduleRealInfoService;
-import com.bsth.service.report.CulateMileageService;
-import com.bsth.service.report.ReportService;
-import com.bsth.util.Arith;
-import com.bsth.util.ReportUtils;
-import com.github.stuxuhai.jpinyin.PinyinException;
-import com.github.stuxuhai.jpinyin.PinyinFormat;
-import com.github.stuxuhai.jpinyin.PinyinHelper;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Service;
-
-import javax.transaction.Transactional;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.DecimalFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-/**
- * Created by 17/11/16.
- */
-@Service
-public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer> implements CalcWaybillService {
-	
-	@Autowired
-	private CalcWaybillRepository calcRepository;
-
-	@Autowired
-	private CalcStatisticsRepository calcStatisticsRepository;
-
-	@Autowired
-	private CalcLineMileageRepository calcLineMileageRepository;
-
-	@Autowired
-	private CalcBusMileageRepository calcBusMileageRepository;
-
-	@Autowired
-	private CalcToolService calcToolService;
-
-    @Autowired
-    private CulateMileageService culateService;
-    
-    @Autowired
-    private ScheduleRealInfoService scheduleRealInfoService;
-    
-    @Autowired
-    private ScheduleRealInfoRepository scheduleRealInfoRepository;
-    
-    @Autowired
-    private CalcIntervalRepository calcIntervalRepository;
-    
-    @Autowired
-    private LineRepository lineRepository;
-    @Autowired
-    private LineService lineService;
-    @Autowired
-    private ReportService reportService;
-    @Autowired
-	CarsRepository carsRepository;
-    
-	@Autowired
-	JdbcTemplate jdbcTemplate;
-
-
-	Logger logger = LoggerFactory.getLogger(this.getClass());
-    
-	
-	public Map<String, Object> autoGenerate(String date, String line) throws Exception {
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-		List<String> dateList = new ArrayList<String>();
-		if(date == null || date.trim().length() == 0){
-			Date d = new Date();
-			d.setTime(d.getTime() - (4l * 1000 * 60 * 60 * 24));
-			dateList.add(sdf.format(d));
-			d.setTime(d.getTime() - (1l * 1000 * 60 * 60 * 24));
-			dateList.add(sdf.format(d));
-		} else {
-			date = date.trim();
-			dateList.add(date);
-		}
-		if(line == null || line.trim().length() == 0){
-			line = "";
-		} else {
-			line = line.trim();
-		}
-		
-		Map<String, Object> m = new HashMap<String, Object>();
-		for(String d : dateList){
-			try {
-				Map<String, Object> generateNew = generateNew(d, line);
-				m.put("generateNew", generateNew);
-			} catch (Exception e) {
-				// TODO: handle exception
-				logger.info("date="+d+";line="+line+";重新统计保存失败！");
-			}
-			try {
-				Map<String, Object> calcLineMileage = calcLineMileage(d, line);
-				m.put("lineMileage", calcLineMileage);
-			} catch (Exception e) {
-				// TODO: handle exception
-				logger.info("date="+d+";line="+line+";线路公里审计保存失败！");
-			}
-			try {
-				Map<String, Object> calcBusMileage = calcBusMileage(d, line);
-				m.put("busMileage", calcBusMileage);
-			} catch (Exception e) {
-				// TODO: handle exception
-				logger.info("date="+d+";line="+line+";路单数据审计保存失败！");
-			}
-		}
-		
-		return m;
-	}
-	
-	@Transactional
-	@Override
-	public Map<String, Object> generateNew(String date, String line) throws Exception {
-		Map<String, Object> newMap = new HashMap<String, Object>();
-		try {
-			if(date == null){
-				date = "";
-			} else {
-				date = date.trim();
-			}
-			if(line == null){
-				line = "";
-			} else {
-				line = line.trim();
-			}
-			if(date.length() != 0 && line.length() != 0){
-				calcRepository.deleteByDateAndLine(date, line);
-			} else if(date.length() != 0){
-				calcRepository.deleteByDate(date);
-			} else {
-				newMap.put("status", ResponseCode.ERROR);
-				logger.error("save erro.", "日期不能为空");
-				return newMap;
-			}
-			
-			if(date.trim().length() == 0){
-				newMap.put("status", ResponseCode.ERROR);
-				logger.error("save erro.", "日期不能为空");
-				return newMap;
-			}
-			
-//			String sql = "select c.id,c.out_config,c.start_opt,t.line_code from bsth_c_line_config c LEFT JOIN bsth_c_line t on c.line=t.id";
-			String sql="select xl_bm as line_code from bsth_c_s_sp_info_real where schedule_date_str = '"+date+"'";
-	        if(line.trim().length() > 0){
-	        	sql += " and xl_bm = '"+line+"'";
-//				sql += " where t.line_code = " + line;
-	        }
-	        sql += " group by xl_bm";
-			List<Map<String, Object>> listLineConfig = jdbcTemplate.query(sql,
-						new RowMapper<Map<String, Object>>(){
-					@Override
-					public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
-						Map<String, Object> m = new HashMap<String, Object>();
-//						m.put("id", rs.getLong("id"));
-//						m.put("out_config", rs.getString("out_config"));
-//						m.put("start_opt", rs.getString("start_opt"));
-						m.put("line_code", rs.getString("line_code"));
-						return m;
-			}});
-			
-			String xlSql="select line_code,spac_grade from bsth_c_line";
-			if(line.length() != 0){
-				xlSql += " where line_code ='"+line+"'";
-			}
-			List<Map<String, Object>> xlList=jdbcTemplate.query(xlSql, new RowMapper<Map<String, Object>>() {
-				@Override
-				public Map<String, Object> mapRow(ResultSet arg0, int arg1) throws SQLException {
-					Map<String, Object> map=new HashMap<String,Object>();
-					map.put("line",arg0.getString("line_code"));
-					map.put("grade", arg0.getString("spac_grade"));
-					return map;
-			}});
-			Map<String, List<Map<String, Object>>> xlMap = new HashMap<String, List<Map<String, Object>>>();
-			for(Map<String, Object> m : xlList){
-				if(m.containsKey("line") && m.get("line").toString().trim().length() > 0){
-					String key = m.get("line").toString().trim();
-					if(!xlMap.containsKey(key))
-						xlMap.put(key, new ArrayList<Map<String, Object>>());
-					xlMap.get(key).add(m);
-				}
-			}
-			//查询大间隔时间
-			String djgSql="select * from bsth_c_interval";
-			List<Interval> djgList=jdbcTemplate.query(djgSql, new RowMapper<Interval>() {
-				@Override
-				public Interval mapRow(ResultSet arg0, int arg1) throws SQLException {
-					Interval m=new Interval();
-					m.setLevel(arg0.getString("level"));
-					m.setPeak(arg0.getInt("peak"));
-					m.setTrough(arg0.getInt("trough"));
-					return m;
-			}});
-			
-			Map<String, List<ScheduleRealInfo>> scheMap = new HashMap<String, List<ScheduleRealInfo>>();
-			List<ScheduleRealInfo> list = calcRepository.findAllScheduleByDate(date);
-			for(ScheduleRealInfo s : list){
-				String xlBm = s.getXlBm();
-				if(!scheMap.containsKey(xlBm)){
-					scheMap.put(xlBm, new ArrayList<ScheduleRealInfo>());
-				}
-				scheMap.get(xlBm).add(s);
-			}
-			
-			Set<String> lineSet = new HashSet<String>();
-			List<CalcWaybill> all = new ArrayList<CalcWaybill>();
-			for (int i = 0; i < listLineConfig.size(); i++) {
-				Map<String, Object> m =listLineConfig.get(i);
-				String lineCode=m.get("line_code").toString().trim();
-//				String startOpt=m.get("start_opt").toString().trim();
-				if(!lineSet.add(lineCode))
-					continue;
-				
-				List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
-				if(xlMap.containsKey(lineCode) && xlMap.get(lineCode) != null){
-					tempList = xlMap.get(lineCode);
-				}
-				
-				if(!scheMap.containsKey(lineCode))
-					continue;
-				List<CalcWaybill> findAll = calcToolService.findAll(date, lineCode, scheMap.get(lineCode), tempList, djgList);
-				all.addAll(findAll);
-				
-			}
-//			new BatchSaveUtils<CalcWaybill>().saveList2(all, CalcWaybill.class);
-			calcRepository.saveAll(all);
-			
-			newMap.put("status", ResponseCode.SUCCESS);
-		} catch (Exception e) {
-			// TODO: handle exception
-			newMap.put("status", ResponseCode.ERROR);
-			logger.error("save erro.", e);
-			throw e;
-		}
-		
-		return newMap;
-	}
-	
-	@Override
-	public List<Map<String, Object>> statisticsDailyTj(String gsdm,
-			String fgsdm, String line, String date, String date2,
-			String xlName, String type) {
-
-		List<String> keyList = new ArrayList<String>();
-		List<CalcWaybill> list = new ArrayList<CalcWaybill>();
-		List<CalcWaybill> lists = new ArrayList<CalcWaybill>();
-		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
-		Map<String, List<CalcWaybill>> keyMap = new HashMap<String, List<CalcWaybill>>();
-		
-		if(line.equals("")){
-            //查询所有线路
-            list = calcRepository.scheduleByDateAndLineTj(line,date,date2,gsdm,fgsdm);
-        }else{
-            //查询单条线路
-            list = calcRepository.scheduleByDateAndLineTj2(line,date,date2);
-        }
-		
-		for(CalcWaybill c : list){
-			String key = c.getXlName();
-			if(!keyMap.containsKey(key)){
-				keyMap.put(key, new ArrayList<CalcWaybill>());
-				keyList.add(key);
-			}
-			keyMap.get(key).add(c);
-		}
-		Collections.sort(keyList, new AccountXlbmStr());
-		for(String key : keyList){
-			CalcWaybill calc = keyMap.get(key).get(0);
-			for(int i = 1; i < keyMap.get(key).size(); i++){
-				CalcWaybill c= keyMap.get(key).get(i);
-				calc.setJhyylc(Arith.add(calc.getJhyylc(), c.getJhyylc()));
-				calc.setJhfyylc(Arith.add(calc.getJhfyylc(), c.getJhfyylc()));
-				calc.setSjyylc(Arith.add(calc.getSjyylc(), c.getSjyylc()));
-				calc.setSjfyylc(Arith.add(calc.getSjfyylc(), c.getSjfyylc()));
-				calc.setLblc(Arith.add(calc.getLblc(), c.getLblc()));
-				calc.setLbbc(calc.getLbbc() + c.getLbbc());
-				calc.setLblcLz(Arith.add(calc.getLblcLz(), c.getLblcLz()));
-				calc.setLblcDm(Arith.add(calc.getLblcDm(), c.getLblcDm()));
-				calc.setLblcGz(Arith.add(calc.getLblcGz(), c.getLblcGz()));
-				calc.setLblcJf(Arith.add(calc.getLblcJf(), c.getLblcJf()));
-				calc.setLblcZs(Arith.add(calc.getLblcZs(), c.getLblcZs()));
-				calc.setLblcQr(Arith.add(calc.getLblcQr(), c.getLblcQr()));
-				calc.setLblcQc(Arith.add(calc.getLblcQc(), c.getLblcQc()));
-				calc.setLblcKx(Arith.add(calc.getLblcKx(), c.getLblcKx()));
-				calc.setLblcQh(Arith.add(calc.getLblcQh(), c.getLblcQh()));
-				calc.setLblcYw(Arith.add(calc.getLblcYw(), c.getLblcYw()));
-				calc.setLblcQt(Arith.add(calc.getLblcQt(), c.getLblcQt()));
-				calc.setLjyylc(Arith.add(calc.getLjyylc(), c.getLjyylc()));
-				calc.setLjfyylc(Arith.add(calc.getLjfyylc(), c.getLjfyylc()));
-				calc.setJhyybc(calc.getJhyybc() + c.getJhyybc());
-				calc.setJhyybczgf(calc.getJhyybczgf() + c.getJhyybczgf());
-				calc.setJhyybcwgf(calc.getJhyybcwgf() + c.getJhyybcwgf());
-				calc.setSjyybc(calc.getSjyybc() + c.getSjyybc());
-				calc.setSjyybczgf(calc.getSjyybczgf() + c.getSjyybczgf());
-				calc.setSjyybcwgf(calc.getSjyybcwgf() + c.getSjyybcwgf());
-				calc.setLjbc(calc.getLjbc() + c.getLjbc());
-				calc.setLjbczgf(calc.getLjbczgf() + c.getLjbczgf());
-				calc.setLjbcwgf(calc.getLjbcwgf() + c.getLjbcwgf());
-				calc.setFzbc(calc.getFzbc() + c.getFzbc());
-				calc.setFzbczgf(calc.getFzbczgf() + c.getFzbczgf());
-				calc.setFzbcwgf(calc.getFzbcwgf() + c.getFzbcwgf());
-				calc.setDtbc(calc.getDtbc() + c.getDtbc());
-				calc.setDtbczgf(calc.getDtbczgf() + c.getDtbczgf());
-				calc.setDtbcwgf(calc.getDtbcwgf() + c.getDtbcwgf());
-			}
-			calc.setSjyylc(Arith.add(calc.getSjyylc(), calc.getLjyylc()));
-			calc.setSjfyylc(Arith.add(calc.getSjfyylc(), calc.getLjfyylc()));
-			lists.add(calc);
-		}
-		CalcWaybill sum = new CalcWaybill();
-		sum.setXlName("合计");
-		for(CalcWaybill c : lists){
-			sum.setJhyylc(Arith.add(sum.getJhyylc()!=null?sum.getJhyylc():0, c.getJhyylc()));
-			sum.setJhfyylc(Arith.add(sum.getJhfyylc()!=null?sum.getJhfyylc():0, c.getJhfyylc()));
-			sum.setSjyylc(Arith.add(sum.getSjyylc()!=null?sum.getSjyylc():0, c.getSjyylc()));
-			sum.setLjyylc(Arith.add(sum.getLjyylc()!=null?sum.getLjyylc():0, c.getLjyylc()));
-			sum.setSjfyylc(Arith.add(sum.getSjfyylc()!=null?sum.getSjfyylc():0, c.getSjfyylc()));
-			sum.setLjfyylc(Arith.add(sum.getLjfyylc()!=null?sum.getLjfyylc():0, c.getLjfyylc()));
-			sum.setLblc(Arith.add(sum.getLblc()!=null?sum.getLblc():0, c.getLblc()));
-			sum.setLbbc(sum.getLbbc() + c.getLbbc());
-			sum.setLblcLz(Arith.add(sum.getLblcLz()!=null?sum.getLblcLz():0, c.getLblcLz()));
-			sum.setLblcDm(Arith.add(sum.getLblcDm()!=null?sum.getLblcDm():0, c.getLblcDm()));
-			sum.setLblcGz(Arith.add(sum.getLblcGz()!=null?sum.getLblcGz():0, c.getLblcGz()));
-			sum.setLblcJf(Arith.add(sum.getLblcJf()!=null?sum.getLblcJf():0, c.getLblcJf()));
-			sum.setLblcZs(Arith.add(sum.getLblcZs()!=null?sum.getLblcZs():0, c.getLblcZs()));
-			sum.setLblcQr(Arith.add(sum.getLblcQr()!=null?sum.getLblcQr():0, c.getLblcQr()));
-			sum.setLblcQc(Arith.add(sum.getLblcQc()!=null?sum.getLblcQc():0, c.getLblcQc()));
-			sum.setLblcKx(Arith.add(sum.getLblcKx()!=null?sum.getLblcKx():0, c.getLblcKx()));
-			sum.setLblcQh(Arith.add(sum.getLblcQh()!=null?sum.getLblcQh():0, c.getLblcQh()));
-			sum.setLblcYw(Arith.add(sum.getLblcYw()!=null?sum.getLblcYw():0, c.getLblcYw()));
-			sum.setLblcQt(Arith.add(sum.getLblcQt()!=null?sum.getLblcQt():0, c.getLblcQt()));
-			sum.setJhyybc(sum.getJhyybc() + c.getJhyybc());
-			sum.setJhyybczgf(sum.getJhyybczgf() + c.getJhyybczgf());
-			sum.setJhyybcwgf(sum.getJhyybcwgf() + c.getJhyybcwgf());
-			sum.setSjyybc(sum.getSjyybc() + c.getSjyybc());
-			sum.setSjyybczgf(sum.getSjyybczgf() + c.getSjyybczgf());
-			sum.setSjyybcwgf(sum.getSjyybcwgf() + c.getSjyybcwgf());
-			sum.setLjbc(sum.getLjbc() + c.getLjbc());
-			sum.setLjbczgf(sum.getLjbczgf() + c.getLjbczgf());
-			sum.setLjbcwgf(sum.getLjbcwgf() + c.getLjbcwgf());
-			sum.setFzbc(sum.getFzbc() + c.getFzbc());
-			sum.setFzbczgf(sum.getFzbczgf() + c.getFzbczgf());
-			sum.setFzbcwgf(sum.getFzbcwgf() + c.getFzbcwgf());
-			sum.setDtbc(sum.getDtbc() + c.getDtbc());
-			sum.setDtbczgf(sum.getDtbczgf() + c.getDtbczgf());
-			sum.setDtbcwgf(sum.getDtbcwgf() + c.getDtbcwgf());
-		}
-		if(lists.size() > 0){
-			lists.add(sum);
-		}
-		
-		for(CalcWaybill c : lists){
-			Map<String, Object> m = new HashMap<String, Object>();
-			m.put("xlName", c.getXlName());
-			m.put("jhzlc", Arith.add(c.getJhyylc(), c.getJhfyylc()));
-			m.put("jhlc", c.getJhyylc());
-			m.put("jcclc", c.getJhfyylc());
-//			m.put("sjzgl", Arith.add(Arith.add(c.getSjyylc(), c.getLjyylc()), Arith.add(c.getSjfyylc(), c.getLjfyylc())));
-//			m.put("sjgl", Arith.add(c.getSjyylc(), c.getLjyylc()));
-//			m.put("sjksgl", Arith.add(c.getSjfyylc(), c.getLjfyylc()));
-			m.put("sjzgl", Arith.add(c.getSjyylc(), c.getSjfyylc()));
-			m.put("sjgl", c.getSjyylc());
-			m.put("sjksgl", c.getSjfyylc());
-			m.put("ssgl", c.getLblc());
-			m.put("ssbc", c.getLbbc());
-			m.put("ssgl_lz", c.getLblcLz());
-			m.put("ssgl_dm", c.getLblcDm());
-			m.put("ssgl_gz", c.getLblcGz());
-			m.put("ssgl_jf", c.getLblcJf());
-			m.put("ssgl_zs", c.getLblcZs());
-			m.put("ssgl_qr", c.getLblcQr());
-			m.put("ssgl_qc", c.getLblcQc());
-			m.put("ssgl_kx", c.getLblcKx());
-			m.put("ssgl_qh", c.getLblcQh());
-			m.put("ssgl_yw", c.getLblcYw());
-			m.put("ssgl_other", c.getLblcQt());
-			m.put("ljgl", c.getLjyylc());
-			m.put("jhbc", c.getJhyybc());
-			m.put("jhbc_m", c.getJhyybczgf());
-			m.put("jhbc_a", c.getJhyybcwgf());
-			m.put("sjbc", c.getSjyybc());
-			m.put("sjbc_m", c.getSjyybczgf());
-			m.put("sjbc_a", c.getSjyybcwgf());
-			m.put("ljbc", c.getLjbc());
-			m.put("ljbc_m", c.getLjbczgf());
-			m.put("ljbc_a", c.getLjbcwgf());
-			m.put("fzbc", c.getFzbc());
-			m.put("fzbc_m", c.getFzbczgf());
-			m.put("fzbc_a", c.getFzbcwgf());
-			m.put("dtbc", c.getDtbc());
-			m.put("dtbc_m", c.getDtbczgf());
-			m.put("dtbc_a", c.getDtbcwgf());
-			resList.add(m);
-		}
-		
-		if (type != null && type.length() != 0 && type.equals("export")) {
-            SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
-                    sdfSimple = new SimpleDateFormat("yyyyMMdd");
-            List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
-            Map<String, Object> m = new HashMap<String, Object>();
-            m.put("date", date+"至"+date2);
-            ReportUtils ee = new ReportUtils();
-            try {
-            	String dateTime = "";
-            	if(date.equals(date2)){
-            		dateTime = sdfSimple.format(sdfMonth.parse(date));
-            	} else {
-            		dateTime = sdfSimple.format(sdfMonth.parse(date))
-            				+"-"+sdfSimple.format(sdfMonth.parse(date2));
-            	}
-                listI.add(resList.iterator());
-                String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
-                ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_.xls",
-                        path + "export/" + dateTime + "-" + xlName + "-统计日报.xls");
-            } catch (Exception e) {
-                // TODO: handle exception
-                //e.printStackTrace();
-            	logger.info("" , e);
-            }
-        }
-		
-		return resList;
-	}
-
-	/**
-	 * @param rq 格式如：2018-03-22（留空""默认当前日期前四天）
-	 * @param line （留空""默认全部线路）
-	 */
-	@Transactional
-	@Override
-	public String calcDaily(String rq, String line) throws Exception{
-		String result = "";
-		try {
-			List<String> dateList = new ArrayList<String>();
-			if(rq == null || rq.trim().length() == 0){
-				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
-				Date dNow = new Date();   //当前时间
-				Date dBefore = new Date();
-				Calendar calendar = Calendar.getInstance(); //得到日历
-				calendar.setTime(dNow);//把当前时间赋给日历
-				calendar.add(Calendar.DAY_OF_MONTH, -4);  //设置为前一天
-				dBefore = calendar.getTime();   //得到前一天的时间
-//				rq = sdf.format(dBefore);
-				dateList.add(sdf.format(dBefore));
-				Date date = new Date();
-				date.setTime(dBefore.getTime() - 1l*1000*60*60*24);
-				dateList.add(sdf.format(date));
-			} else {
-//				rq = rq.trim();
-				dateList.add(rq.trim());
-			}
-			if(line == null || line.trim().length() == 0){
-				line = "";
-			} else {
-				line = line.trim();
-			}
-			
-			for(int j = 0; j < dateList.size(); j++){
-				rq = dateList.get(j);
-			
-		        List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
-		        List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>();
-		        List<ScheduleRealInfo> lists = new ArrayList<ScheduleRealInfo>();
-		        
-		        String gsSql="select gs_bm, fgs_bm from bsth_c_s_sp_info_real where schedule_date_str = '"+rq+"'";
-		        if(line.trim().length() > 0)
-		        	gsSql += " and xl_bm = '"+line+"'";
-				gsSql += " group by gs_bm, fgs_bm";
-				List<Map<String, String>> gsList=jdbcTemplate.query(gsSql, new RowMapper<Map<String, String>>() {
-					@Override
-					public Map<String, String> mapRow(ResultSet arg0, int arg1) throws SQLException {
-						Map<String, String> m = new HashMap<String, String>();
-						m.put("gsdm", arg0.getString("gs_bm"));
-						m.put("fgsdm", arg0.getString("fgs_bm"));
-						return m;
-				}});
-	
-		        //查询所有线路
-				for(Map<String, String> m : gsList){
-					list.addAll(calcStatisticsRepository.scheduleByDateAndLine(line, rq, rq, m.get("gsdm"), m.get("fgsdm")));
-				}
-				
-				List<CalcInterval> listInterval=calcIntervalRepository.selectByDateAndCompany(rq, "", "","");
-				Map<String,CalcInterval> mapInterval=new HashMap<String,CalcInterval>();
-				for (int i = 0; i < listInterval.size(); i++) {
-					CalcInterval c=listInterval.get(i);
-					mapInterval.put(c.getXlBm(), c);
-				}
-	
-		        
-		        for (int i = 0; i < list.size(); i++) {
-		            ScheduleRealInfo s=list.get(i);
-		            Set<ChildTaskPlan> cts = s.getcTasks();
-		            if(cts != null && cts.size() > 0){
-		            	 list_s.add(s);
-		            }else{
-			            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
-			                list_s.add(s);
-			            }
-		            }
-		        }
-		        List<CalcStatistics> lMap = new ArrayList<CalcStatistics>();
-		        for (int i = 0; i < list.size(); i++) {
-		            if(i<list.size()-1){
-		                if(list.get(i+1).getXlBm().equals(list.get(i).getXlBm())){
-		                    lists.add(list.get(i));
-		                }else{
-		                    lists.add(list.get(i));
-		                    CalcInterval t=null;
-		                    if(mapInterval.get(lists.get(0).getXlBm())!=null){
-		                    	t=mapInterval.get(lists.get(0).getXlBm());
-		                    }
-		                   
-		                    CalcStatistics s=staticTj(lists,t);
-		                    lMap.add(s);
-		                    lists=new ArrayList<ScheduleRealInfo>();
-		                }
-		            }else{
-		                if(list.get(i).getXlBm().equals(list.get(i-1).getXlBm())){
-		                    lists.add(list.get(i));
-		                    CalcInterval t=null;
-		                    if(mapInterval.get(lists.get(0).getXlBm())!=null){
-		                    	t=mapInterval.get(lists.get(0).getXlBm());
-		                    }
-		                    CalcStatistics s=staticTj(lists,t);
-		                    lMap.add(s);
-		                }else{
-		                    lists=new  ArrayList<ScheduleRealInfo>();
-		                    lists.add(list.get(i));
-		                    CalcInterval t=null;
-		                    if(mapInterval.get(lists.get(0).getXlBm())!=null){
-		                    	t=mapInterval.get(lists.get(0).getXlBm());
-		                    }
-		                    CalcStatistics s=staticTj(lists,t);
-		                    lMap.add(s);
-		                }
-		            }
-		        }
-	//	        Collections.sort(lMap,new AccountXlbm());
-		        
-		        if(line.trim().length() > 0){
-		        	calcStatisticsRepository.deleteByDateAndLine(rq, line);
-		        } else {
-		        	calcStatisticsRepository.deleteByDate(rq);
-		        }
-		        calcStatisticsRepository.saveAll(lMap);
-
-				System.out.println(rq);
-				System.out.println(dateList.size());
-			}
-			
-	        result = "success";
-		} catch (Exception e) {
-			// TODO: handle exception
-			throw e;
-		}finally{
-			logger.info("result:"+result);
-		}
-		return result;
-	}
-	
-    public final CalcStatistics staticTj(List<ScheduleRealInfo> list,CalcInterval t){
-        
-        List<ScheduleRealInfo>  lists=new ArrayList<ScheduleRealInfo>();
-        for(int i=0;i<list.size();i++){
-            ScheduleRealInfo s=list.get(i);
-            Set<ChildTaskPlan> cts = s.getcTasks();
-            if(cts != null && cts.size() > 0){
-            	lists.add(s);
-            }else{
-	            if(s.getZdsjActual()!=null&& s.getFcsjActual()!=null){
-	            	lists.add(s);
-	            }
-            }
-        }
-//		Map<String, Object> map = new HashMap<String, Object>();
-        CalcStatistics s = new CalcStatistics();
-    	if(list.size() > 0){
-    		ScheduleRealInfo sche = list.get(0);
-    		s.setXl(sche.getXlBm());
-    		s.setXlName(sche.getXlName());
-    		s.setDate(sche.getScheduleDate());
-    		s.setDateStr(sche.getScheduleDateStr());
-    		s.setGsdm(sche.getGsBm());
-    		s.setFgsdm(sche.getFgsBm());
-    		
-	        double jhyygl=culateService.culateJhgl(list);//计划营运公里
-	        double jhjcclc= culateService.culateJhJccgl(list);//计划进出场公里(计划空驶公里)
-	        s.setJhyylc(jhyygl);
-	        s.setJhkslc(jhjcclc);
-	        s.setJhzlc(Arith.add(jhyygl, jhjcclc));
-	
-	        double ljgl= culateService.culateLjgl(lists);
-	        double sjyygl= culateService.culateSjgl(lists);
-	        double zyygl= Arith.add(sjyygl,ljgl);
-	
-	        double ljksgl= culateService.culateLjksgl(lists);
-	        double sjjccgl=culateService.culateJccgl(lists);
-	        double sjksgl=culateService.culateKsgl(lists);
-	        double zksgl=Arith.add(sjjccgl, sjksgl);
-	        s.setSjyylc(zyygl);
-	        s.setSjkslc(zksgl);
-	        s.setSjzlc(Arith.add(zyygl, zksgl));
-	        
-	        s.setLjkslc(ljksgl);
-	        
-	        s.setSslc(culateService.culateLbgl(list));
-	        s.setSsbc(culateService.culateLbbc(list));
-	        
-	        //计划+临加-少驶=实驶
-//	        double jl=Arith.sub(Arith.add(jhyygl, ljgl),ssgl);
-//	        if(jl==zyygl){
-//	        	map.put("zt", 0);
-//	        }else{
-//	        	map.put("zt", 1);
-//	        }
-	        
-	        s.setLzlc(culateService.culateCJLC(list, "路阻"));
-	        s.setDmlc(culateService.culateCJLC(list, "吊慢"));
-	        s.setGzlc(culateService.culateCJLC(list, "故障"));
-	        s.setJflc(culateService.culateCJLC(list, "纠纷"));
-	        s.setZslc(culateService.culateCJLC(list, "肇事"));
-	        s.setQrlc(culateService.culateCJLC(list, "缺人"));
-	        s.setQclc(culateService.culateCJLC(list, "缺车"));
-	        s.setKxlc(culateService.culateCJLC(list, "客稀"));
-	        s.setQhlc(culateService.culateCJLC(list, "气候"));
-	        s.setYwlc(culateService.culateCJLC(list, "援外"));
-	        double ssgl_pc=culateService.culateCJLC(list, "配车");
-	        double ssgl_by=culateService.culateCJLC(list, "保养");
-	        double ssgl_cj=culateService.culateCJLC(list, "抽减");
-	        double ssgl_qt=culateService.culateCJLC(list, "其他");
-	        s.setQtlc(Arith.add(Arith.add(ssgl_pc, ssgl_by),Arith.add(ssgl_cj, ssgl_qt)));
-	        s.setLjlc(ljgl);
-	        
-	        s.setJhbcq(culateService.culateJhbc(list,""));
-	        s.setJhbcz(culateService.culateJhbc(list, "zgf"));
-	        s.setJhbcw(culateService.culateJhbc(list, "wgf"));
-	        s.setSjbcq(culateService.culateSjbc(lists,""));
-	        s.setSjbcz(culateService.culateSjbc(lists,"zgf"));
-	        s.setSjbcw(culateService.culateSjbc(lists,"wgf"));
-	        s.setLjbcq(culateService.culateLjbc(lists,""));
-	        s.setLjbcz(culateService.culateLjbc(lists,"zgf"));
-	        s.setLjbcw(culateService.culateLjbc(lists,"wgf"));
-	        s.setFzbcq(culateService.culateFzbc(lists, ""));
-	        s.setFzbcz(culateService.culateFzbc(lists, "zgf"));
-	        s.setFzbcw(culateService.culateFzbc(lists, "wgf"));
-	        s.setDtbcq(0);
-	        s.setDtbcz(0);
-	        s.setDtbcw(0);
-	        if(t==null){
-		        Map<String, Object> m_=culateService.culateDjg(lists, list.get(0).getXlBm());
-		        if(m_.containsKey("djgcsq") && m_.get("djgcsq")!=null)
-		        	s.setDjgq(Integer.valueOf(m_.get("djgcsq").toString()));
-		        else
-		        	s.setDjgq(0);
-		        if(m_.containsKey("djgcsz") && m_.get("djgcsz")!=null)
-		        	s.setDjgz(Integer.valueOf(m_.get("djgcsz").toString()));
-		        else
-		        	s.setDjgz(0);
-		        if(m_.containsKey("djgcsw") && m_.get("djgcsw")!=null)
-		        	s.setDjgw(Integer.valueOf(m_.get("djgcsw").toString()));
-		        else
-		        	s.setDjgw(0);
-		        if(m_.containsKey("djgsj") && m_.get("djgsj")!=null)
-		        	s.setDjgsj(Integer.valueOf(m_.get("djgsj").toString()));
-		        else
-		        	s.setDjgsj(0);
-	        }else{
-	        	s.setDjgq(t.getDjgAll());
-	        	s.setDjgz(t.getDjgZgf());
-	        	s.setDjgw(t.getDjgWgf());
-	        	s.setDjgsj(t.getDjgTime());
-	        }
-    	}
-        return s;
-    }
-    
-    class AccountXlbm implements Comparator<Map<String, Object>>{
-   	 @Override
-   		public int compare(Map<String, Object> o1, Map<String, Object> o2) {
-   			// TODO Auto-generated method stub
-//   		 PinyinHelper.convertToPinyinString(ppy.getName(),
-//   		 "" , PinyinFormat.WITHOUT_TONE)
-   			return  o1.get("xlNamePy").toString().compareTo(
-   					o2.get("xlNamePy").toString());
-   		}
-	}
-
-    class AccountXlbmStr implements Comparator<String>{
-   	 @Override
-   		public int compare(String o1, String o2) {
-   			// TODO Auto-generated method stub
-   			return  o1.compareTo(o2);
-   		}
-	}
-
-	@Override
-	public List<CalcStatistics> calcStatisticsDaily(String gsdm, String fgsdm,
-			String line, String date, String date2, String xlName, String type,String nature) {
-		// TODO Auto-generated method stub
-		List<CalcStatistics> listAll = new ArrayList<CalcStatistics>();
-		if(line.length() > 0){
-			listAll = calcStatisticsRepository.selectByDateAndLineTj2(line, date, date2);
-		} else {
-			listAll = calcStatisticsRepository.selectByDateAndLineTj(line, date, date2, gsdm, fgsdm);
-		}
-		Map<String, Boolean> lineMap=lineService.lineNature();
-		List<CalcStatistics> list = new ArrayList<CalcStatistics>();
-		if(nature.equals("0")){
-			list=listAll;
-		}else{
-			for (int i = 0; i < listAll.size(); i++) {
-				CalcStatistics c=listAll.get(i);
-				if(nature.equals("1")){
-					if(lineMap.get(c.getXl())){
-						list.add(c);
-					}
-				}else{
-					if(!lineMap.get(c.getXl())){
-						list.add(c);
-					}
-				}
-			}
-		}
-		List<CalcStatistics> resList = new ArrayList<CalcStatistics>();
-		Map<String, List<CalcStatistics>> keyMap = new HashMap<String, List<CalcStatistics>>();
-		List<String> keyList = new ArrayList<String>();
-		
-		for(CalcStatistics s : list){
-    		try {
-//				String key = PinyinHelper.convertToPinyinString(s.getXl(), "" , PinyinFormat.WITHOUT_TONE);
-				String key =s.getFgsdm()+s.getXl();
-//				if(line.equals("")){
-//					key =s.getFgsdm()+s.getXl();
-//				}else{
-//					key =s.getXl();
-//				}
-    			if(!keyMap.containsKey(key)){
-					keyMap.put(key, new ArrayList<CalcStatistics>());
-					keyList.add(key);
-				}
-				keyMap.get(key).add(s);
-			} catch (Exception e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		Collections.sort(keyList, new AccountXlbmStr());
-		
-		for(String key : keyList){
-			if(keyMap.get(key).size() > 0){
-				CalcStatistics s = keyMap.get(key).get(0);
-				if(keyMap.get(key).size() > 1)
-					for(int i = 1; i < keyMap.get(key).size(); i++){
-						CalcStatistics s_ = keyMap.get(key).get(i);
-						s = addStatistics(s, s_);
-					}
-//				if(line.equals("")){
-					s.setFgsName(BasicData.businessFgsCodeNameMap.get(s.getFgsdm()+"_"+s.getGsdm()));
-				/*}else{
-					List<Line> l=lineRepository.findLineByCode(line);
-		        	if(l.size()>0)
-		        		s.setFgsName(BasicData.businessFgsCodeNameMap.get(l.get(0).getBrancheCompany()+"_"+l.get(0).getCompany()));
-				}*/
-				resList.add(s);
-			}
-		}
-		
-		if(resList.size() > 0){
-			CalcStatistics temp = new CalcStatistics();
-			temp.setXlName("合计");
-			temp.setFgsName("");
-			for(CalcStatistics s : resList){
-				temp = addStatistics(temp, s);
-			}
-			resList.add(temp);
-		}
-		
-		List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
-		for(CalcStatistics c : resList){
-			Map<String, Object> m = new HashMap<String, Object>();
-			m.put("fgsName", c.getFgsName());
-			m.put("xlName", c.getXlName());
-			m.put("jhzlc", c.getJhzlc());
-			m.put("jhlc", c.getJhyylc());
-			m.put("jcclc", c.getJhkslc());
-			m.put("sjzgl", c.getSjzlc());
-			m.put("sjgl", c.getSjyylc());
-			m.put("sjksgl", c.getSjkslc());
-			m.put("ssgl", c.getSslc());
-			m.put("ssbc", c.getSsbc());
-			m.put("ssgl_lz", c.getLzlc());
-			m.put("ssgl_dm", c.getDmlc());
-			m.put("ssgl_gz", c.getGzlc());
-			m.put("ssgl_jf", c.getJflc());
-			m.put("ssgl_zs", c.getZslc());
-			m.put("ssgl_qr", c.getQrlc());
-			m.put("ssgl_qc", c.getQclc());
-			m.put("ssgl_kx", c.getKxlc());
-			m.put("ssgl_qh", c.getQhlc());
-			m.put("ssgl_yw", c.getYwlc());
-			m.put("ssgl_other", c.getQtlc());
-			m.put("ljgl", c.getLjlc());
-			m.put("ljks", c.getLjkslc());
-			m.put("jhbc", c.getJhbcq());
-			m.put("jhbc_m", c.getJhbcz());
-			m.put("jhbc_a", c.getJhbcw());
-			m.put("sjbc", c.getSjbcq());
-			m.put("sjbc_m", c.getSjbcz());
-			m.put("sjbc_a", c.getSjbcw());
-			m.put("ljbc", c.getLjbcq());
-			m.put("ljbc_m", c.getLjbcz());
-			m.put("ljbc_a", c.getLjbcw());
-			m.put("fzbc", c.getFzbcq());
-			m.put("fzbc_m", c.getFzbcz());
-			m.put("fzbc_a", c.getFzbcw());
-			m.put("dtbc", c.getDtbcq());
-			m.put("dtbc_m", c.getDtbcz());
-			m.put("dtbc_a", c.getDtbcw());
-			m.put("djg", c.getDjgq());
-			m.put("djg_m", c.getDjgz());
-			m.put("djg_a", c.getDjgw());
-			m.put("djg_time", c.getDjgsj());
-			mapList.add(m);
-		}
-		
-		if (type != null && type.length() != 0 && type.equals("export")) {
-            SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
-                    sdfSimple = new SimpleDateFormat("yyyyMMdd");
-            List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
-            Map<String, Object> m = new HashMap<String, Object>();
-            m.put("date", date+"至"+date2);
-            ReportUtils ee = new ReportUtils();
-            try {
-            	String dateTime = "";
-            	if(date.equals(date2)){
-            		dateTime = sdfSimple.format(sdfMonth.parse(date));
-            	} else {
-            		dateTime = sdfSimple.format(sdfMonth.parse(date))
-            				+"-"+sdfSimple.format(sdfMonth.parse(date2));
-            	}
-                listI.add(mapList.iterator());
-                String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
-                ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_.xls",
-                        path + "export/" + dateTime + "-" + xlName + "-统计日报.xls");
-            } catch (Exception e) {
-                // TODO: handle exception
-                //e.printStackTrace();
-            	logger.info("" , e);
-            }
-        }
-		
-		return resList;
-	}
-	
-	@Override
-	public List<Map<String, Object>> calcStatisticsDaily2(String gsdm, String fgsdm,
-			String line, String date, String date2, String xlName, String type,String nature) {
-		// TODO Auto-generated method stub
-		SimpleDateFormat dft = new SimpleDateFormat("yyyy-MM-dd");
-		Date beginDate = new Date();
-		Calendar calendar = Calendar.getInstance();
-		calendar.setTime(beginDate);
-		calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 4);
-		String d2 = dft.format(calendar.getTime());  //当前日期前4天
-		calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) +1);
-		String d3= dft.format(calendar.getTime()); //当前日期前3天
-		
-		String d1="";
-		String d4="";
-		try {
-			long t3 = dft.parse(d2).getTime();  
-			long t1=dft.parse(date).getTime();
-			long t2=dft.parse(date2).getTime();
-			
-			if(t1<=t3 && t2>t3){
-				//所选日期区间区间既有实时数据也有历史数据
-				d1=date;
-				d4=date2;
-			} else if (t1>t3&&t2>t3){
-				d1=date;
-				d2=date2;
-				d3=date;
-				d4=date2;
-			}else{
-				d1=date;
-				d2=date2;
-				//实时数据无需
-				d3="";
-				d4="";
-			}
-		} catch (ParseException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
-
-		
-		List<CalcStatistics> listAll = new ArrayList<CalcStatistics>();
-		if(line.length() > 0){
-			listAll = calcStatisticsRepository.selectByDateAndLineTj2(line, d1, d2);
-		} else {
-			listAll = calcStatisticsRepository.selectByDateAndLineTj(line, d1, d2, gsdm, fgsdm);
-		}
-		Map<String, Boolean> lineMap=lineService.lineNature();
-		List<CalcStatistics> list=new ArrayList<CalcStatistics>();
-
-		for (int i = 0; i < listAll.size(); i++) {
-			CalcStatistics s=listAll.get(i);
-			if(nature.equals("0")){
-				list.add(s);
-			}else if(nature.equals("1")){
-				if(lineMap.containsKey(s.getXl()) && lineMap.get(s.getXl())){
-					list.add(s);
-				}
-			}else{
-				if(lineMap.containsKey(s.getXl()) && !lineMap.get(s.getXl())){
-					list.add(s);
-				}
-			}
-		}
-		List<CalcStatistics> resList = new ArrayList<CalcStatistics>();
-		Map<String, List<CalcStatistics>> keyMap = new HashMap<String, List<CalcStatistics>>();
-		List<String> keyList = new ArrayList<String>();
-		
-		for(CalcStatistics s : list){
-    		try {
-//				String key = PinyinHelper.convertToPinyinString(s.getXlName(), "" , PinyinFormat.WITHOUT_TONE);
-    			String key =s.getFgsdm()+s.getXl();
-//    			if(line.equals("")){
-//    				key =s.getFgsdm()+s.getXl();
-//				}else{
-//					 key =s.getXl();
-//				}
-    			if(!keyMap.containsKey(key)){
-					keyMap.put(key, new ArrayList<CalcStatistics>());
-					keyList.add(key);
-				}
-				keyMap.get(key).add(s);
-			} catch (Exception e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		Collections.sort(keyList, new AccountXlbmStr());
-		
-		for(String key : keyList){
-			if(keyMap.get(key).size() > 0){
-				CalcStatistics s = keyMap.get(key).get(0);
-				if(keyMap.get(key).size() > 1)
-					for(int i = 1; i < keyMap.get(key).size(); i++){
-						CalcStatistics s_ = keyMap.get(key).get(i);
-						s = addStatistics(s, s_);
-					}
-				resList.add(s);
-			}
-		}
-		
-		if(resList.size() > 0){
-			CalcStatistics temp = new CalcStatistics();
-			temp.setXlName("合计");
-			temp.setXl("hj");
-			for(CalcStatistics s : resList){
-				temp = addStatistics(temp, s);
-			}
-			resList.add(temp);
-		}
-		//统计数据
-		List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
-		for(CalcStatistics c : resList){
-			Map<String, Object> m = new HashMap<String, Object>();
-			if(c.getXl().equals("hj")){
-				m.put("fgsName", "");
-				m.put("fgsBm", "");
-			}else{
-				m.put("fgsName", BasicData.businessFgsCodeNameMap.get(c.getFgsdm()+"_"+c.getGsdm()));
-				m.put("fgsBm", c.getFgsdm());
-			}
-			m.put("xlBm", c.getXl());
-			m.put("xlName", c.getXlName());
-			m.put("jhzlc", c.getJhzlc());
-			m.put("jhlc", c.getJhyylc());
-			m.put("jcclc", c.getJhkslc());
-			m.put("sjzgl", c.getSjzlc());
-			m.put("sjgl", c.getSjyylc());
-			m.put("sjksgl", c.getSjkslc());
-			m.put("ssgl", c.getSslc());
-			m.put("ssbc", c.getSsbc());
-			m.put("ssgl_lz", c.getLzlc());
-			m.put("ssgl_dm", c.getDmlc());
-			m.put("ssgl_gz", c.getGzlc());
-			m.put("ssgl_jf", c.getJflc());
-			m.put("ssgl_zs", c.getZslc());
-			m.put("ssgl_qr", c.getQrlc());
-			m.put("ssgl_qc", c.getQclc());
-			m.put("ssgl_kx", c.getKxlc());
-			m.put("ssgl_qh", c.getQhlc());
-			m.put("ssgl_yw", c.getYwlc());
-			m.put("ssgl_other", c.getQtlc());
-			m.put("ljgl", c.getLjlc());
-			m.put("ljks", c.getLjkslc());
-			m.put("jhbc", c.getJhbcq());
-			m.put("jhbc_m", c.getJhbcz());
-			m.put("jhbc_a", c.getJhbcw());
-			m.put("sjbc", c.getSjbcq());
-			m.put("sjbc_m", c.getSjbcz());
-			m.put("sjbc_a", c.getSjbcw());
-			m.put("ljbc", c.getLjbcq());
-			m.put("ljbc_m", c.getLjbcz());
-			m.put("ljbc_a", c.getLjbcw());
-			m.put("fzbc", c.getFzbcq());
-			m.put("fzbc_m", c.getFzbcz());
-			m.put("fzbc_a", c.getFzbcw());
-			m.put("dtbc", c.getDtbcq());
-			m.put("dtbc_m", c.getDtbcz());
-			m.put("dtbc_a", c.getDtbcw());
-			m.put("djg", c.getDjgq());
-			m.put("djg_m", c.getDjgz());
-			m.put("djg_a", c.getDjgw());
-			m.put("djg_time", c.getDjgsj());
-			double jl = Arith.sub(Arith.add(m.get("jhlc"), m.get("ljgl")), m.get("ssgl"));
-            if (jl == Double.parseDouble(m.get("sjgl").toString())) {
-            	m.put("zt", 0);
-            } else {
-            	m.put("zt", 1);
-            }
-			mapList.add(m);
-		}
-
-		//实时数据
-		List<Map<String, Object>>  tjlist=new ArrayList<Map<String, Object>>();
-		if(!d4.equals("")){
-			 tjlist= scheduleRealInfoService.statisticsDailyTjHb(gsdm, fgsdm, line, d3, d4, xlName, type,nature);
-		}
-		List<Map<String, Object>> mapListHj = new ArrayList<Map<String, Object>>();
-//		List<String> lineList=new ArrayList<String>();
-		Map<String, Object> kMap=new HashMap<String,Object>();
-		mapList.addAll(tjlist);
-		for (int i = 0; i < mapList.size(); i++) {
-			Map<String, Object> m =mapList.get(i);
-//			if(line.equals("")){
-				if(kMap.get(m.get("fgsBm")+"_"+m.get("xlBm").toString())==null){
-					kMap.put(m.get("fgsBm")+"_"+m.get("xlBm").toString(), m.get("fgsBm")+"_"+m.get("xlBm").toString());
-				}
-//			}else{
-//				if(kMap.get(m.get("xlBm").toString())==null){
-//					kMap.put(m.get("xlBm").toString(), m.get("xlBm").toString());
-//				}
-//			}
-			
-		}
-		 for (Object xlbm : kMap.keySet()) {  
-				Map<String, Object> hjMap = new HashMap<String, Object>();
-				for (int i = 0; i < mapList.size(); i++) {
-					Map<String, Object> lsMap=mapList.get(i);
-					String xlbm_="";
-//					if(line.equals("")){
-						xlbm_=lsMap.get("fgsBm").toString()+"_"+lsMap.get("xlBm").toString();
-//					}else{
-//						xlbm_=lsMap.get("xlBm").toString();
-//					}
-					if (xlbm_.equals(xlbm)) {
-						if(hjMap.get("xlBm")==null){
-							hjMap.put("xlBm", lsMap.get("xlBm"));
-							hjMap.put("xlName", lsMap.get("xlName"));
-							hjMap.put("fgsName", lsMap.get("fgsName"));
-							 try {
-								 if(lsMap.get("xlBm").toString().equals("hj")){
-									 hjMap.put("xlNamePy", "zzzzz");
-								 }else{
-									 hjMap.put("xlNamePy", PinyinHelper.convertToPinyinString(lsMap.get("fgsBm").toString()+lsMap.get("xlName").toString(), "", PinyinFormat.WITHOUT_TONE));
-								 }
-					         } catch (PinyinException e) {
-					                // TODO Auto-generated catch block
-					                e.printStackTrace();
-					         }
-						}
-						hjMap.put("jhzlc", Arith.add(lsMap.get("jhzlc"), hjMap.get("jhzlc")==null?"0":hjMap.get("jhzlc")));
-						hjMap.put("jhlc", Arith.add(lsMap.get("jhlc"), hjMap.get("jhlc")==null?"0":hjMap.get("jhlc")));
-						hjMap.put("jcclc",Arith.add(lsMap.get("jcclc"), hjMap.get("jcclc")==null?"0":hjMap.get("jcclc")));
-						hjMap.put("sjzgl",Arith.add(lsMap.get("sjzgl"), hjMap.get("sjzgl")==null?"0": hjMap.get("sjzgl")));
-						hjMap.put("sjgl", Arith.add(lsMap.get("sjgl"), hjMap.get("sjgl")==null?"0":hjMap.get("sjgl")));
-						hjMap.put("sjksgl", Arith.add(lsMap.get("sjksgl"), hjMap.get("sjksgl")==null?"0":hjMap.get("sjksgl")));
-						hjMap.put("ssgl", Arith.add(lsMap.get("ssgl"), hjMap.get("ssgl")==null?"0":hjMap.get("ssgl")));
-						hjMap.put("ssbc", Integer.parseInt(lsMap.get("ssbc").toString())+Integer.parseInt(hjMap.get("ssbc")==null?"0":hjMap.get("ssbc").toString()));
-						hjMap.put("ssgl_lz", Arith.add(lsMap.get("ssgl_lz"), hjMap.get("ssgl_lz")==null?"0":hjMap.get("ssgl_lz")));
-						hjMap.put("ssgl_dm", Arith.add(lsMap.get("ssgl_dm"), hjMap.get("ssgl_dm")==null?"0":hjMap.get("ssgl_dm")));
-						hjMap.put("ssgl_gz", Arith.add(lsMap.get("ssgl_gz"), hjMap.get("ssgl_gz")==null?"0":hjMap.get("ssgl_gz")));
-						hjMap.put("ssgl_jf", Arith.add(lsMap.get("ssgl_jf"), hjMap.get("ssgl_jf")==null?"0":hjMap.get("ssgl_jf")));
-						hjMap.put("ssgl_zs", Arith.add(lsMap.get("ssgl_zs"), hjMap.get("ssgl_zs")==null?"0":hjMap.get("ssgl_zs")));
-						hjMap.put("ssgl_qr", Arith.add(lsMap.get("ssgl_qr"), hjMap.get("ssgl_qr")==null?"0":hjMap.get("ssgl_qr")));
-						hjMap.put("ssgl_qc", Arith.add(lsMap.get("ssgl_qc"), hjMap.get("ssgl_qc")==null?"0":hjMap.get("ssgl_qc")));
-						hjMap.put("ssgl_kx", Arith.add(lsMap.get("ssgl_kx"), hjMap.get("ssgl_kx")==null?"0":hjMap.get("ssgl_kx")));
-						hjMap.put("ssgl_qh", Arith.add(lsMap.get("ssgl_qh"), hjMap.get("ssgl_qh")==null?"0":hjMap.get("ssgl_qh")));
-						hjMap.put("ssgl_yw", Arith.add(lsMap.get("ssgl_yw"), hjMap.get("ssgl_yw")==null?"0":hjMap.get("ssgl_yw")));
-						hjMap.put("ssgl_other", Arith.add(lsMap.get("ssgl_other"), hjMap.get("ssgl_other")==null?"0":hjMap.get("ssgl_other")));
-						hjMap.put("ljgl", Arith.add(lsMap.get("ljgl"), hjMap.get("ljgl")==null?"0":hjMap.get("ljgl")));
-						hjMap.put("ljks", Arith.add(lsMap.get("ljks"), hjMap.get("ljks")==null?"0":hjMap.get("ljks")));
-						hjMap.put("jhbc", Integer.parseInt(lsMap.get("jhbc").toString())+ Integer.parseInt(hjMap.get("jhbc")==null?"0":hjMap.get("jhbc").toString()));
-						hjMap.put("jhbc_m", Integer.parseInt(lsMap.get("jhbc_m").toString())+Integer.parseInt(hjMap.get("jhbc_m")==null?"0":hjMap.get("jhbc_m").toString()));
-						hjMap.put("jhbc_a", Integer.parseInt(lsMap.get("jhbc_a").toString())+ Integer.parseInt(hjMap.get("jhbc_a")==null?"0":hjMap.get("jhbc_a").toString()));
-						hjMap.put("sjbc", Integer.parseInt(lsMap.get("sjbc").toString())+ Integer.parseInt(hjMap.get("sjbc")==null?"0":hjMap.get("sjbc").toString()));
-						hjMap.put("sjbc_m",Integer.parseInt(lsMap.get("sjbc_m").toString())+ Integer.parseInt(hjMap.get("sjbc_m")==null?"0":hjMap.get("sjbc_m").toString()));
-						hjMap.put("sjbc_a", Integer.parseInt(lsMap.get("sjbc_a").toString())+ Integer.parseInt(hjMap.get("sjbc_a")==null?"0":hjMap.get("sjbc_a").toString()));
-						hjMap.put("ljbc", Integer.parseInt(lsMap.get("ljbc").toString())+ Integer.parseInt(hjMap.get("ljbc")==null?"0":hjMap.get("ljbc").toString()));
-						hjMap.put("ljbc_m", Integer.parseInt(lsMap.get("ljbc_m").toString())+ Integer.parseInt(hjMap.get("ljbc_m")==null?"0":hjMap.get("ljbc_m").toString()));
-						hjMap.put("ljbc_a", Integer.parseInt(lsMap.get("ljbc_a").toString())+Integer.parseInt(hjMap.get("ljbc_a")==null?"0":hjMap.get("ljbc_a").toString()));
-						hjMap.put("fzbc", Integer.parseInt(lsMap.get("fzbc").toString())+ Integer.parseInt(hjMap.get("fzbc")==null?"0":hjMap.get("fzbc").toString()));
-						hjMap.put("fzbc_m",Integer.parseInt(lsMap.get("fzbc_m").toString())+ Integer.parseInt(hjMap.get("fzbc_m")==null?"0":hjMap.get("fzbc_m").toString()));
-						hjMap.put("fzbc_a",Integer.parseInt(lsMap.get("fzbc_a").toString())+ Integer.parseInt(hjMap.get("fzbc_a")==null?"0":hjMap.get("fzbc_a").toString()));
-						hjMap.put("dtbc", Integer.parseInt(lsMap.get("dtbc").toString())+ Integer.parseInt(hjMap.get("dtbc")==null?"0":hjMap.get("dtbc").toString()));
-						hjMap.put("dtbc_m", Integer.parseInt(lsMap.get("dtbc_m").toString())+ Integer.parseInt(hjMap.get("dtbc_m")==null?"0":hjMap.get("dtbc_m").toString()));
-						hjMap.put("dtbc_a", Integer.parseInt(lsMap.get("dtbc_a").toString())+ Integer.parseInt(hjMap.get("dtbc_a")==null?"0":hjMap.get("dtbc_a").toString()));
-						hjMap.put("djg", Integer.parseInt(lsMap.get("djg").toString())+ Integer.parseInt(hjMap.get("djg")==null?"0":hjMap.get("djg").toString()));
-						hjMap.put("djg_m", Integer.parseInt(lsMap.get("djg_m").toString())+ Integer.parseInt(hjMap.get("djg_m")==null?"0":hjMap.get("djg_m").toString()));
-						hjMap.put("djg_a", Integer.parseInt(lsMap.get("djg_a").toString())+ Integer.parseInt(hjMap.get("djg_a")==null?"0":hjMap.get("djg_a").toString()));
-						if(hjMap.get("djg_time")==null){
-							hjMap.put("djg_time", lsMap.get("djg_time"));
-						}else{
-							if(Arith.add(lsMap.get("djg_time"),0)>Arith.add(hjMap.get("djg_time"), 0)){
-								hjMap.put("djg_time", lsMap.get("djg_time"));
-							}else{
-								hjMap.put("djg_time",hjMap.get("djg_time"));
-							}
-						}
-						double jl = Arith.sub(Arith.add(hjMap.get("jhlc"), hjMap.get("ljgl")), hjMap.get("ssgl"));
-			            if (jl == Double.parseDouble(hjMap.get("sjgl").toString())) {
-			            	hjMap.put("zt", 0);
-			            } else {
-			            	hjMap.put("zt", 1);
-			            }
-					}
-				}
-				mapListHj.add(hjMap);
-		}  
-		
-	        Collections.sort(mapListHj, new AccountXlbmByping());
-
-		/*if(!line.equals("")){
-			for (int i = 0; i < mapListHj.size(); i++) {
-				if(mapListHj.get(i).get("xlBm").equals(line)){
-		        	List<Line> l=lineRepository.findLineByCode(line);
-		        	if(l.size()>0)
-		        		mapListHj.get(i).put("fgsName", BasicData.businessFgsCodeNameMap.get(l.get(0).getBrancheCompany()+"_"+l.get(0).getCompany()));
-				}
-			}
-		}*/
-		if (type != null && type.length() != 0 && type.equals("export")) {
-            SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
-                    sdfSimple = new SimpleDateFormat("yyyyMMdd");
-            List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
-            Map<String, Object> m = new HashMap<String, Object>();
-            m.put("date", date+"至"+date2);
-            ReportUtils ee = new ReportUtils();
-            try {
-            	String dateTime = "";
-            	if(date.equals(date2)){
-            		dateTime = sdfSimple.format(sdfMonth.parse(date));
-            	} else {
-            		dateTime = sdfSimple.format(sdfMonth.parse(date))
-            				+"-"+sdfSimple.format(sdfMonth.parse(date2));
-            	}
-                listI.add(mapListHj.iterator());
-                String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
-                ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_2.xls",
-                        path + "export/" + dateTime + "-" + xlName + "-统计日报.xls");
-            } catch (Exception e) {
-                // TODO: handle exception
-                //e.printStackTrace();
-            	logger.info("" , e);
-            }
-        }
-		
-		return mapListHj;
-	}
-    
-	public CalcStatistics addStatistics(CalcStatistics s, CalcStatistics s_){
-		s.setJhzlc(Arith.add(s.getJhzlc()!=null?s.getJhzlc():0, s_.getJhzlc()));
-		s.setJhyylc(Arith.add(s.getJhyylc()!=null?s.getJhyylc():0, s_.getJhyylc()));
-		s.setJhkslc(Arith.add(s.getJhkslc()!=null?s.getJhkslc():0, s_.getJhkslc()));
-		s.setSjzlc(Arith.add(s.getSjzlc()!=null?s.getSjzlc():0, s_.getSjzlc()));
-		s.setSjyylc(Arith.add(s.getSjyylc()!=null?s.getSjyylc():0, s_.getSjyylc()));
-		s.setSjkslc(Arith.add(s.getSjkslc()!=null?s.getSjkslc():0, s_.getSjkslc()));
-		s.setSslc(Arith.add(s.getSslc()!=null?s.getSslc():0, s_.getSslc()));
-		s.setSsbc(s.getSsbc() + s_.getSsbc());
-		s.setLzlc(Arith.add(s.getLzlc()!=null?s.getLzlc():0, s_.getLzlc()));
-		s.setDmlc(Arith.add(s.getDmlc()!=null?s.getDmlc():0, s_.getDmlc()));
-		s.setGzlc(Arith.add(s.getGzlc()!=null?s.getGzlc():0, s_.getGzlc()));
-		s.setJflc(Arith.add(s.getJflc()!=null?s.getJflc():0, s_.getJflc()));
-		s.setZslc(Arith.add(s.getZslc()!=null?s.getZslc():0, s_.getZslc()));
-		s.setQrlc(Arith.add(s.getQrlc()!=null?s.getQrlc():0, s_.getQrlc()));
-		s.setQclc(Arith.add(s.getQclc()!=null?s.getQclc():0, s_.getQclc()));
-		s.setKxlc(Arith.add(s.getKxlc()!=null?s.getKxlc():0, s_.getKxlc()));
-		s.setQhlc(Arith.add(s.getQhlc()!=null?s.getQhlc():0, s_.getQhlc()));
-		s.setYwlc(Arith.add(s.getYwlc()!=null?s.getYwlc():0, s_.getYwlc()));
-		s.setQtlc(Arith.add(s.getQtlc()!=null?s.getQtlc():0, s_.getQtlc()));
-		s.setLjlc(Arith.add(s.getLjlc()!=null?s.getLjlc():0, s_.getLjlc()));
-		if(s_.getLjkslc() == null){
-			s_.setLjkslc(0d);
-		}
-		s.setLjkslc(Arith.add(s.getLjkslc()!=null?s.getLjkslc():0, s_.getLjkslc()));
-		s.setJhbcq(s.getJhbcq() + s_.getJhbcq());
-		s.setJhbcz(s.getJhbcz() + s_.getJhbcz());
-		s.setJhbcw(s.getJhbcw() + s_.getJhbcw());
-		s.setSjbcq(s.getSjbcq() + s_.getSjbcq());
-		s.setSjbcz(s.getSjbcz() + s_.getSjbcz());
-		s.setSjbcw(s.getSjbcw() + s_.getSjbcw());
-		s.setLjbcq(s.getLjbcq() + s_.getLjbcq());
-		s.setLjbcz(s.getLjbcz() + s_.getLjbcz());
-		s.setLjbcw(s.getLjbcw() + s_.getLjbcw());
-		s.setFzbcq(s.getFzbcq() + s_.getFzbcq());
-		s.setFzbcz(s.getFzbcz() + s_.getFzbcz());
-		s.setFzbcw(s.getFzbcw() + s_.getFzbcw());
-		s.setDtbcq(s.getDtbcq() + s_.getDtbcq());
-		s.setDtbcz(s.getDtbcz() + s_.getDtbcz());
-		s.setDtbcw(s.getDtbcw() + s_.getDtbcw());
-		s.setDjgq(s.getDjgq() + s_.getDjgq());
-		s.setDjgz(s.getDjgz() + s_.getDjgz());
-		s.setDjgw(s.getDjgw() + s_.getDjgw());
-		s.setDjgsj(s.getDjgsj()>s_.getDjgsj()?s.getDjgsj():s_.getDjgsj());
-		return s;
-	}
-
-	@Transactional
-	@Override
-	public Map<String, Object> calcLineMileage(String date, String line) {
-		Map<String, Object> resMap = new HashMap<String, Object>();
-		
-		if(date.length() == 0){
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-			Date d = new Date();
-			d.setTime(d.getTime() - 4 * 1000 * 60 * 60 * 24);
-			date = sdf.format(d);
-		}
-		
-		resMap.put("date", date);
-		resMap.put("line", line);
-		if(date == null || date.trim().length() == 0){
-			resMap.put("status", ResponseCode.ERROR);
-			resMap.put("remark", "日期不正确或为空");
-			return resMap;
-		} else {
-			date = date.trim();
-		}
-		if(line == null){
-			line = "";
-		} else {
-			line = line.trim();
-		}
-		
-		Map<String, Object> map = new HashMap<String, Object>();
-		List<CalcLineMileage> list = new ArrayList<CalcLineMileage>();
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-		Date dateTime = new Date();
-		
-		try {
-			
-			String gsSql="select gs_bm, fgs_bm from bsth_c_s_sp_info_real where schedule_date_str = '"+date+"'";
-	        if(line.trim().length() > 0)
-	        	gsSql += " and xl_bm = '"+line+"'";
-			gsSql += " group by gs_bm, fgs_bm";
-			List<Map<String, String>> gsList=jdbcTemplate.query(gsSql, new RowMapper<Map<String, String>>() {
-				@Override
-				public Map<String, String> mapRow(ResultSet arg0, int arg1) throws SQLException {
-					Map<String, String> m = new HashMap<String, String>();
-					m.put("gsdm", arg0.getString("gs_bm"));
-					m.put("fgsdm", arg0.getString("fgs_bm"));
-					return m;
-			}});
-			
-			map.put("date", date);
-			map.put("date2", date);
-			for(Map<String, String> tempMap : gsList){
-				map.put("gsdm", tempMap.get("gsdm").toString());
-				map.put("fgsdm", tempMap.get("fgsdm").toString());
-				List<Map<String, Object>> countByList = reportService.countByList(map);
-				for(Map<String, Object> m : countByList){
-					if(!m.containsKey("xlName") || m.get("xlName")==null
-							|| m.get("xlName").toString().equals("合计"))
-						continue;
-					CalcLineMileage c = new CalcLineMileage();
-					c.setDate(sdf.parse(date));
-					c.setDateStr(date);
-					c.setGsdm(map.get("gsdm").toString());
-					c.setGsName(m.get("gs").toString());
-					c.setFgsdm(map.get("fgsdm").toString());
-					c.setFgsName(m.get("fgs").toString());
-					c.setXl(m.get("line").toString());
-					c.setXlName(m.get("xlName").toString());
-					c.setJhzlc(Double.valueOf(m.get("jhzlc").toString()));
-					c.setJhlc(Double.valueOf(m.get("jhlc").toString()));
-					c.setJcclc(Double.valueOf(m.get("jcclc").toString()));
-					c.setSjzgl(Double.valueOf(m.get("sjzgl").toString()));
-					c.setJhnlc(Double.valueOf(m.get("jhnlc").toString()));
-					c.setJhwlc(Double.valueOf(m.get("jhwlc").toString()));
-					c.setJhnjcclc(Double.valueOf(m.get("jhnjcclc").toString()));
-					c.setJhwjcclc(Double.valueOf(m.get("jhwjcclc").toString()));
-					c.setJhwjcclcz(Double.valueOf(m.get("jhwjcclc_z").toString()));
-					c.setZrwjcclc(Double.valueOf(m.get("zrwjcclc").toString()));
-					c.setZrwjcclc1(Double.valueOf(m.get("zrwjcclc1").toString()));
-					c.setZrwjcclc2(Double.valueOf(m.get("zrwjcclc2").toString()));
-					c.setZrwjcclcqt(Double.valueOf(m.get("zrwjcclcqt").toString()));
-					c.setKfks(Double.valueOf(m.get("kfks").toString()));
-					c.setLbss(Double.valueOf(m.get("lbss").toString()));
-					c.setSsglLz(Double.valueOf(m.get("ssgl_lz").toString()));
-					c.setSsglDm(Double.valueOf(m.get("ssgl_dm").toString()));
-					c.setSsglGz(Double.valueOf(m.get("ssgl_gz").toString()));
-					c.setSsglJf(Double.valueOf(m.get("ssgl_jf").toString()));
-					c.setSsglZs(Double.valueOf(m.get("ssgl_zs").toString()));
-					c.setSsglQr(Double.valueOf(m.get("ssgl_qr").toString()));
-					c.setSsglQc(Double.valueOf(m.get("ssgl_qc").toString()));
-					c.setSsglKx(Double.valueOf(m.get("ssgl_kx").toString()));
-					c.setSsglQh(Double.valueOf(m.get("ssgl_qh").toString()));
-					c.setSsglYw(Double.valueOf(m.get("ssgl_yw").toString()));
-					c.setSsglOther(Double.valueOf(m.get("ssgl_other").toString()));
-					c.setLjyy(Double.valueOf(m.get("ljyy").toString()));
-					c.setLjjcc(Double.valueOf(m.get("ljjcc").toString()));
-					c.setLjkfks(Double.valueOf(m.get("ljkfks").toString()));
-					c.setCreateDate(dateTime);
-					list.add(c);
-				}
-			}
-			
-			if(line.length() > 0){
-				calcLineMileageRepository.deleteByDateAndLine(date, line);
-			} else {
-				calcLineMileageRepository.deleteByDate(date);
-			}
-			calcLineMileageRepository.saveAll(list);
-
-			resMap.put("status", ResponseCode.SUCCESS);
-		} catch (Exception e) {
-			// TODO: handle exception
-			resMap.put("status", ResponseCode.ERROR);
-			logger.error("save erro.", e);
-			e.printStackTrace();
-		}
-		return resMap;
-	}
-
-	@Transactional
-	@Override
-	public Map<String, Object> calcBusMileage(String date, String line) {
-		Map<String, Object> resMap = new HashMap<String, Object>();
-
-		if(date.length() == 0){
-			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-			Date d = new Date();
-			d.setTime(d.getTime() - 4 * 1000 * 60 * 60 * 24);
-			date = sdf.format(d);
-		}
-		
-		resMap.put("date", date);
-		resMap.put("line", line);
-		if(date == null || date.trim().length() == 0){
-			resMap.put("status", ResponseCode.ERROR);
-			resMap.put("remark", "日期不正确或为空");
-			return resMap;
-		} else {
-			date = date.trim();
-		}
-		if(line == null){
-			line = "";
-		} else {
-			line = line.trim();
-		}
-		
-		Map<String, Object> map = new HashMap<String, Object>();
-		Map<String, Object> xlmap = new HashMap<String, Object>();
-		List<CalcBusMileage> list = new ArrayList<CalcBusMileage>();
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-		Date dateTime = new Date();
-		
-		try {
-			
-			String gsSql="select gs_bm, max(gs_name) gs_name, fgs_bm from bsth_c_s_sp_info_real"
-					+ " where schedule_date_str = '"+date+"'";
-	        if(line.trim().length() > 0)
-	        	gsSql += " and xl_bm = '"+line+"'";
-			gsSql += " group by gs_bm, fgs_bm";
-			List<Map<String, String>> gsList=jdbcTemplate.query(gsSql, new RowMapper<Map<String, String>>() {
-				@Override
-				public Map<String, String> mapRow(ResultSet arg0, int arg1) throws SQLException {
-					Map<String, String> m = new HashMap<String, String>();
-					m.put("gsdm", arg0.getString("gs_bm"));
-					m.put("gsName", arg0.getString("gs_name"));
-					m.put("fgsdm", arg0.getString("fgs_bm"));
-					return m;
-			}});
-
-			List<Line> xlList = lineRepository.findAllService();
-			for(Line l : xlList){
-				xlmap.put(l.getName(), l.getLineCode());
-			}
-			
-			map.put("date", date);
-			map.put("date2", date);
-			map.put("zs", "js");
-			for(Map<String, String> tempMap : gsList){
-				map.put("gsdm", tempMap.get("gsdm").toString());
-				map.put("fgsdm", tempMap.get("fgsdm").toString());
-				List<Map<String, Object>> countByList = reportService.countByBusList(map);
-				for(Map<String, Object> m : countByList){
-					if(!m.containsKey("xlName") || m.get("xlName")==null
-							|| m.get("xlName").toString().equals("合计"))
-						continue;
-					CalcBusMileage c = new CalcBusMileage();
-					c.setDate(sdf.parse(date));
-					c.setDateStr(date);
-					c.setGsdm(map.get("gsdm").toString());
-					c.setGsName(tempMap.get("gsName").toString());
-					c.setFgsdm(map.get("fgsdm").toString());
-					c.setFgsName(m.get("fgs").toString());
-					c.setXl(xlmap.get(m.get("xlName").toString()).toString());
-					c.setXlName(m.get("xlName").toString());
-					c.setNbbm(m.get("nbbm").toString());
-					c.setjGh(m.get("jGh").toString());
-					c.setjName(m.get("jName").toString());
-					c.setsGh(m.get("sGh").toString());
-					c.setsName(m.get("sName").toString());
-					c.setZlc(Double.valueOf(m.get("zlc").toString()));
-					c.setJhnlc(Double.valueOf(m.get("jhnlc").toString()));
-					c.setJhwlc(Double.valueOf(m.get("jhwlc").toString()));
-					c.setJhnjcclc(Double.valueOf(m.get("jhnjcclc").toString()));
-					c.setJhwjcclc(Double.valueOf(m.get("jhwjcclc").toString()));
-					c.setJhwjcclcz(Double.valueOf(m.get("jhwjcclc_z").toString()));
-					c.setKfks(Double.valueOf(m.get("kfks").toString()));
-					c.setZrwjcclc(Double.valueOf(m.get("zrwjcclc").toString()));
-					c.setZrwjcclc1(Double.valueOf(m.get("zrwjcclc1").toString()));
-					c.setZrwjcclc2(Double.valueOf(m.get("zrwjcclc2").toString()));
-					c.setZrwjcclcqt(Double.valueOf(m.get("zrwjcclcqt").toString()));
-					c.setLjyy(Double.valueOf(m.get("ljyy").toString()));
-					c.setLjjcc(Double.valueOf(m.get("ljjcc").toString()));
-					if(m.containsKey("ljkfks") && m.get("ljkfks") != null){
-						c.setLjkfks(Double.valueOf(m.get("ljkfks").toString()));
-					} else {
-						c.setLjkfks(0d);
-					}
-					c.setDhl(Double.valueOf(m.get("dhl").toString()));
-					c.setCdl(Double.valueOf(m.get("cdl").toString()));
-					c.setYhl(Double.valueOf(m.get("yhl").toString()));
-					c.setJzl(Double.valueOf(m.get("jzl").toString()));
-					c.setHyl(Double.valueOf(m.get("hyl").toString()));
-					c.setJhzlc(Double.valueOf(m.get("jhzlc").toString()));
-					c.setCreateDate(dateTime);
-					list.add(c);
-				}
-			}
-			
-			if(line.length() > 0){
-				calcBusMileageRepository.deleteByDateAndLine(date, line);
-			} else {
-				calcBusMileageRepository.deleteByDate(date);
-			}
-			calcBusMileageRepository.saveAll(list);
-
-			resMap.put("status", ResponseCode.SUCCESS);
-		} catch (Exception e) {
-			// TODO: handle exception
-			resMap.put("status", ResponseCode.ERROR);
-			logger.error("save erro.", e);
-			e.printStackTrace();
-		}
-		return resMap;
-	}
-
-	@Override
-	public List<Map<String, Object>> getLineMileage(String gsdm, String fgsdm, String line,
-			String date, String date2, String xlName, String zt, String by, String type) {
-		List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
-		List<CalcLineMileage> resList = new ArrayList<CalcLineMileage>();
-		List<CalcLineMileage> list = new ArrayList<CalcLineMileage>();
-		List<CalcLineMileage> calcs = new ArrayList<CalcLineMileage>();
-		List<String> keyList = new ArrayList<String>();
-		Map<String, List<CalcLineMileage>> keyMap = new HashMap<String, List<CalcLineMileage>>();
-		
-		if(line == null || line.trim().length() == 0){
-			list = calcLineMileageRepository.selectByDateAndLineTj(line, date, date2, gsdm, fgsdm);
-		} else {
-			list = calcLineMileageRepository.selectByDateAndLineTj2(line, date, date2);
-		}
-		
-		for(CalcLineMileage c : list){
-			String key = c.getXlName();
-			if(!keyMap.containsKey(key)){
-				keyMap.put(key, new ArrayList<CalcLineMileage>());
-				keyList.add(key);
-			}
-			keyMap.get(key).add(c);
-		}
-		
-		for(String key : keyList){
-			CalcLineMileage c1 = keyMap.get(key).get(0);
-			for(int i = 1; i < keyMap.get(key).size(); i++){
-				CalcLineMileage c2 = keyMap.get(key).get(i);
-				c1 = addLineMileage(c1, c2);
-			}
-			calcs.add(c1);
-		}
-		
-		CalcLineMileage temp = new CalcLineMileage();
-		temp.setXlName("合计");
-		for(CalcLineMileage c : calcs){
-			temp = addLineMileage(temp, c);
-			resList.add(c);
-		}
-		if(resList.size() > 0)
-			resList.add(temp);
-		
-		for(CalcLineMileage c : resList){
-			Map<String, Object> m = new HashMap<String, Object>();
-			if(c.getXlName().equals("合计")){
-				m.put("gsdm", "");
-				m.put("gs", "");
-				m.put("fgsdm", "");
-				m.put("fgs", "");
-			} else {
-				m.put("gsdm", c.getGsdm());
-				m.put("gs", c.getGsName());
-				m.put("fgsdm", c.getFgsdm());
-				m.put("fgs", c.getFgsName());
-			}
-			m.put("xlName", c.getXlName());
-			m.put("jhzlc", c.getJhzlc());
-			m.put("jhlc", c.getJhlc());
-			m.put("jcclc", c.getJcclc());
-			m.put("sjzgl", c.getSjzgl());
-			m.put("jhnlc", c.getJhnlc());
-			m.put("jhwlc", c.getJhwlc());
-			m.put("jhnjcclc", c.getJhnjcclc());
-			m.put("jhwjcclc", c.getJhwjcclc());
-			m.put("jhwjcclc_z", c.getJhwjcclcz());
-			m.put("zrwjcclc", c.getZrwjcclc());
-			m.put("zrwjcclc1", c.getZrwjcclc1());
-			m.put("zrwjcclc2", c.getZrwjcclc2());
-			m.put("zrwjcclcqt", c.getZrwjcclcqt());
-			m.put("kfks", c.getKfks());
-			m.put("lbss", c.getLbss());
-			m.put("ssgl_lz", c.getSsglLz());
-			m.put("ssgl_dm", c.getSsglDm());
-			m.put("ssgl_gz", c.getSsglGz());
-			m.put("ssgl_jf", c.getSsglJf());
-			m.put("ssgl_zs", c.getSsglZs());
-			m.put("ssgl_qr", c.getSsglQr());
-			m.put("ssgl_qc", c.getSsglQc());
-			m.put("ssgl_kx", c.getSsglKx());
-			m.put("ssgl_qh", c.getSsglQh());
-			m.put("ssgl_yw", c.getSsglYw());
-			m.put("ssgl_other", c.getSsglOther());
-			m.put("ljyy", c.getLjyy());
-			m.put("ljjcc", c.getLjjcc());
-			m.put("ljkfks", c.getLjkfks());
-			lMap.add(m);
-		}
-		
-		if(type.equals("export")){
-			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
-                    sdfSimple = new SimpleDateFormat("yyyyMMdd");
-			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
-			Map<String, Object> m = new HashMap<String, Object>();
-			m.put("date", date);
-			m.put("date1", date2);
-//			String by=map.get("by").toString();
-			String xls="";
-			if(by.equals("sj")){
-				xls="countByLine.xls";
-			}else{
-				xls="countByLines.xls";
-			}
-			ReportUtils ee = new ReportUtils();
-			try {
-				String dateTime = "";
-				if(date.equals(date2)){
-					dateTime = sdfSimple.format(sdfMonth.parse(date));
-				} else {
-					dateTime = sdfSimple.format(sdfMonth.parse(date))
-							+"-"+sdfSimple.format(sdfMonth.parse(date2));
-				}
-				listI.add(lMap.iterator());
-				String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
-				ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls,
-						path + "export/"+dateTime+"-"+xlName+"-线路公里统计表.xls");
-			} catch (Exception e) {
-				// TODO: handle exception
-				e.printStackTrace();
-			}
-		}
-		
-		return lMap;
-	}
-
-	@Override
-	public List<Map<String, Object>> getBusMileage(String line, String date,
-			String date2, String xlName, String zt, String by, String type) {
-		List<CalcBusMileage> resList = new ArrayList<CalcBusMileage>();
-		List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
-		List<CalcBusMileage> list = calcBusMileageRepository.selectByDateAndLineTj2(line, date, date2);
-		
-		if(zt.equals("zbh")){
-			List<String> keyList = new ArrayList<String>();
-			Map<String, List<CalcBusMileage>> keyMap = new HashMap<>();
-			for(CalcBusMileage c : list){
-				String nbbm = c.getNbbm();
-				if(!keyMap.containsKey(nbbm)){
-					keyMap.put(nbbm, new ArrayList<CalcBusMileage>());
-					keyList.add(nbbm);
-				}
-				keyMap.get(nbbm).add(c);
-			}
-			for(String key : keyList){
-				CalcBusMileage c1 = keyMap.get(key).get(0);
-				for(int i = 1; i < keyMap.get(key).size(); i++){
-					CalcBusMileage c2 = keyMap.get(key).get(i);
-					c1.setZlc(Arith.add(c1.getZlc(), c2.getZlc()));
-					c1.setJhnlc(Arith.add(c1.getJhnlc(), c2.getJhnlc()));
-					c1.setJhwlc(Arith.add(c1.getJhwlc(), c2.getJhwlc()));
-					c1.setJhnjcclc(Arith.add(c1.getJhnjcclc(), c2.getJhnjcclc()));
-					c1.setJhwjcclc(Arith.add(c1.getJhwjcclc(), c2.getJhwjcclc()));
-					c1.setKfks(Arith.add(c1.getKfks(), c2.getKfks()));
-					c1.setZrwjcclc(Arith.add(c1.getZrwjcclc(), c2.getZrwjcclc()));
-					c1.setZrwjcclc1(Arith.add(c1.getZrwjcclc1(), c2.getZrwjcclc1()));
-					c1.setZrwjcclc2(Arith.add(c1.getZrwjcclc2(), c2.getZrwjcclc2()));
-					c1.setZrwjcclcqt(Arith.add(c1.getZrwjcclcqt(), c2.getZrwjcclcqt()));
-					c1.setLjyy(Arith.add(c1.getLjyy(), c2.getLjyy()));
-					c1.setLjjcc(Arith.add(c1.getLjjcc(), c2.getLjjcc()));
-					c1.setLjkfks(Arith.add(c1.getLjkfks(), c2.getLjkfks()));
-					c1.setDhl(Arith.add(c1.getDhl(), c2.getDhl()));
-					c1.setCdl(Arith.add(c1.getCdl(), c2.getCdl()));
-					c1.setYhl(Arith.add(c1.getYhl(), c2.getYhl()));
-					c1.setJzl(Arith.add(c1.getJzl(), c2.getJzl()));
-					c1.setHyl(Arith.add(c1.getHyl(), c2.getHyl()));
-					c1.setJhzlc(Arith.add(c1.getJhzlc(), c2.getJhzlc()));
-				}
-				resList.add(c1);
-			}
-		} else {
-			List<String> keyList = new ArrayList<String>();
-			Map<String, List<CalcBusMileage>> keyMap = new HashMap<>();
-			for(CalcBusMileage c : list){
-				String key = c.getNbbm() + c.getjGh() + c.getjName() + c.getsGh() + c.getsName();
-				if(!keyMap.containsKey(key)){
-					keyMap.put(key, new ArrayList<CalcBusMileage>());
-					keyList.add(key);
-				}
-				keyMap.get(key).add(c);
-			}
-			for(String key : keyList){
-				CalcBusMileage c1 = keyMap.get(key).get(0);
-				for(int i = 1; i < keyMap.get(key).size(); i++){
-					CalcBusMileage c2 = keyMap.get(key).get(i);
-					c1.setZlc(Arith.add(c1.getZlc(), c2.getZlc()));
-					c1.setJhnlc(Arith.add(c1.getJhnlc(), c2.getJhnlc()));
-					c1.setJhwlc(Arith.add(c1.getJhwlc(), c2.getJhwlc()));
-					c1.setJhnjcclc(Arith.add(c1.getJhnjcclc(), c2.getJhnjcclc()));
-					c1.setJhwjcclc(Arith.add(c1.getJhwjcclc(), c2.getJhwjcclc()));
-					c1.setKfks(Arith.add(c1.getKfks(), c2.getKfks()));
-					c1.setZrwjcclc(Arith.add(c1.getZrwjcclc(), c2.getZrwjcclc()));
-					c1.setZrwjcclc1(Arith.add(c1.getZrwjcclc1(), c2.getZrwjcclc1()));
-					c1.setZrwjcclc2(Arith.add(c1.getZrwjcclc2(), c2.getZrwjcclc2()));
-					c1.setZrwjcclcqt(Arith.add(c1.getZrwjcclcqt(), c2.getZrwjcclcqt()));
-					c1.setLjyy(Arith.add(c1.getLjyy(), c2.getLjyy()));
-					c1.setLjjcc(Arith.add(c1.getLjjcc(), c2.getLjjcc()));
-					c1.setLjkfks(Arith.add(c1.getLjkfks(), c2.getLjkfks()));
-					c1.setDhl(Arith.add(c1.getDhl(), c2.getDhl()));
-					c1.setCdl(Arith.add(c1.getCdl(), c2.getCdl()));
-					c1.setYhl(Arith.add(c1.getYhl(), c2.getYhl()));
-					c1.setJzl(Arith.add(c1.getJzl(), c2.getJzl()));
-					c1.setHyl(Arith.add(c1.getHyl(), c2.getHyl()));
-					c1.setJhzlc(Arith.add(c1.getJhzlc(), c2.getJhzlc()));
-				}
-				resList.add(c1);
-			}
-		}
-		
-		for(CalcBusMileage c : resList){
-			Map<String, Object> m = new HashMap<String, Object>();
-			if(date.equals(date2)){
-				m.put("rq", date);
-			} else {
-				m.put("rq", date + "至" + date2);
-			}
-			m.put("fgs", c.getFgsName());
-			m.put("xlName", c.getXlName());
-			m.put("nbbm", c.getNbbm());
-			m.put("jGh", c.getjGh());
-			m.put("jName", c.getjName());
-			m.put("sGh", c.getsGh());
-			m.put("sName", c.getsName());
-			m.put("zlc", c.getZlc());
-			m.put("jhnlc", c.getJhnlc());
-			m.put("jhwlc", c.getJhwlc());
-			m.put("jhnjcclc", c.getJhnjcclc());
-			m.put("jhwjcclc", c.getJhwjcclc());
-			m.put("jhwjcclc_z", c.getJhwjcclcz());
-			m.put("kfks", c.getKfks());
-			m.put("zrwjcclc", c.getZrwjcclc());
-			m.put("zrwjcclc1", c.getZrwjcclc1());
-			m.put("zrwjcclc2", c.getZrwjcclc2());
-			m.put("zrwjcclcqt", c.getZrwjcclcqt());
-			m.put("ljyy", c.getLjyy());
-			m.put("ljjcc", c.getLjjcc());
-			m.put("ljkfks", c.getLjkfks());
-			m.put("dhl", c.getDhl());
-			m.put("cdl", c.getCdl());
-			m.put("yhl", c.getYhl());
-			m.put("jzl", c.getJzl());
-			m.put("hyl", c.getYhl());
-			m.put("jhzlc", c.getJhzlc());
-			lMap.add(m);
-		}
-		
-		if(type.equals("export")){
-			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
-                    sdfSimple = new SimpleDateFormat("yyyyMMdd");
-			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
-			Map<String, Object> m = new HashMap<String, Object>();
-			m.put("date", date);
-			m.put("date1", date2);
-			String xls="";
-//			String by=map.get("by").toString();
-
-			if(zt.equals("zbh")){
-				if(by.equals("sj")){
-					xls="countByBus1.xls";
-				}else{
-					xls="countByBus1s.xls";
-				}
-			}else{
-
-				if(by.equals("sj")){
-					xls="countByBus2.xls";
-				}else{
-					xls="countByBus2s.xls";
-				}
-			}
-			ReportUtils ee = new ReportUtils();
-			try {
-				String dateTime = "";
-				if(date.equals(date2)){
-					dateTime = sdfSimple.format(sdfMonth.parse(date));
-				} else {
-					dateTime = sdfSimple.format(sdfMonth.parse(date))
-							+"-"+sdfSimple.format(sdfMonth.parse(date2));
-				}
-				listI.add(lMap.iterator());
-				String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
-				ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls,
-						path + "export/"+dateTime+"-"+xlName+"-路单数据统计表.xls");
-			} catch (Exception e) {
-				// TODO: handle exception
-				e.printStackTrace();
-			}
-		}
-		
-		return lMap;
-	}
-	
-	public CalcLineMileage addLineMileage(CalcLineMileage temp, CalcLineMileage c){
-		temp.setJhzlc(Arith.add(temp.getJhzlc()!=null?temp.getJhzlc():0, c.getJhzlc()));
-		temp.setJhlc(Arith.add(temp.getJhlc()!=null?temp.getJhlc():0, c.getJhlc()));
-		temp.setJcclc(Arith.add(temp.getJcclc()!=null?temp.getJcclc():0, c.getJcclc()));
-		temp.setSjzgl(Arith.add(temp.getSjzgl()!=null?temp.getSjzgl():0, c.getSjzgl()));
-		temp.setJhnlc(Arith.add(temp.getJhnlc()!=null?temp.getJhnlc():0, c.getJhnlc()));
-		temp.setJhwlc(Arith.add(temp.getJhwlc()!=null?temp.getJhwlc():0, c.getJhwlc()));
-		temp.setJhnjcclc(Arith.add(temp.getJhnjcclc()!=null?temp.getJhnjcclc():0, c.getJhnjcclc()));
-		temp.setJhwjcclc(Arith.add(temp.getJhwjcclc()!=null?temp.getJhwjcclc():0, c.getJhwjcclc()));
-		temp.setJhwjcclcz(Arith.add(temp.getJhwjcclcz()!=null?temp.getJhwjcclcz():0, c.getJhwjcclcz()));
-		temp.setZrwjcclc(Arith.add(temp.getZrwjcclc()!=null?temp.getZrwjcclc():0, c.getZrwjcclc()));
-		temp.setZrwjcclc1(Arith.add(temp.getZrwjcclc1()!=null?temp.getZrwjcclc1():0, c.getZrwjcclc1()));
-		temp.setZrwjcclc2(Arith.add(temp.getZrwjcclc2()!=null?temp.getZrwjcclc2():0, c.getZrwjcclc2()));
-		temp.setZrwjcclcqt(Arith.add(temp.getZrwjcclcqt()!=null?temp.getZrwjcclcqt():0, c.getZrwjcclcqt()));
-		temp.setKfks(Arith.add(temp.getKfks()!=null?temp.getKfks():0, c.getKfks()));
-		temp.setLbss(Arith.add(temp.getLbss()!=null?temp.getLbss():0, c.getLbss()));
-		temp.setSsglLz(Arith.add(temp.getSsglLz()!=null?temp.getSsglLz():0, c.getSsglLz()));
-		temp.setSsglDm(Arith.add(temp.getSsglDm()!=null?temp.getSsglDm():0, c.getSsglDm()));
-		temp.setSsglGz(Arith.add(temp.getSsglGz()!=null?temp.getSsglGz():0, c.getSsglGz()));
-		temp.setSsglJf(Arith.add(temp.getSsglJf()!=null?temp.getSsglJf():0, c.getSsglJf()));
-		temp.setSsglZs(Arith.add(temp.getSsglZs()!=null?temp.getSsglZs():0, c.getSsglZs()));
-		temp.setSsglQr(Arith.add(temp.getSsglQr()!=null?temp.getSsglQr():0, c.getSsglQr()));
-		temp.setSsglQc(Arith.add(temp.getSsglQc()!=null?temp.getSsglQc():0, c.getSsglQc()));
-		temp.setSsglKx(Arith.add(temp.getSsglKx()!=null?temp.getSsglKx():0, c.getSsglKx()));
-		temp.setSsglQh(Arith.add(temp.getSsglQh()!=null?temp.getSsglQh():0, c.getSsglQh()));
-		temp.setSsglYw(Arith.add(temp.getSsglYw()!=null?temp.getSsglYw():0, c.getSsglYw()));
-		temp.setSsglOther(Arith.add(temp.getSsglOther()!=null?temp.getSsglOther():0, c.getSsglOther()));
-		temp.setLjyy(Arith.add(temp.getLjyy()!=null?temp.getLjyy():0, c.getLjyy()));
-		temp.setLjjcc(Arith.add(temp.getLjjcc()!=null?temp.getLjjcc():0, c.getLjjcc()));
-		temp.setLjkfks(Arith.add(temp.getLjkfks()!=null?temp.getLjkfks():0, c.getLjkfks()));
-		return temp;
-	}
-
-	@Override
-	public List<List<String>> calcDetailMonthly(Map<String, Object> map) {
-		List<Integer> destroy= new ArrayList<>();
-		String destroyStr = "";
-		if(map.get("destroy")!=null){
-			destroyStr = map.get("destroy").toString().trim();
-			String[] destroys = destroyStr.split(",");
-			for (int i = 0; i < destroys.length; i++){
-				destroy.add(Integer.parseInt(destroys[i]));
-			}
-		}
-		List<String> gsdm= new ArrayList<>();
-		String gsdmStr = "";
-		if(map.get("gsdm")!=null){
-			gsdmStr = map.get("gsdm").toString().trim();
-			String[] gsdms = gsdmStr.split(",");
-			for (int i = 0; i < gsdms.length; i++){
-				gsdm.add(gsdms[i]);
-			}
-		}
-		List<String> fgsdm= new ArrayList<>();
-		String fgsdmStr = "";
-		if(map.get("fgsdm")!=null){
-			fgsdmStr = map.get("fgsdm").toString().trim();
-			String[] fgsdms = fgsdmStr.split(",");
-			for (int i = 0; i < fgsdms.length; i++){
-				fgsdm.add(fgsdms[i]);
-			}
-		}
-//		String line= null;
-		List<String> line= new ArrayList<>();
-		String lineStr = "";
-		if(map.get("lineCode")!=null){
-			lineStr = map.get("lineCode").toString().trim();
-			String[] lines = lineStr.split(",");
-			for (int i = 0; i < lines.length; i++){
-				line.add(lines[i]);
-			}
-		}
-		String startDate="";
-		if(map.get("startDate")!=null){
-			startDate=map.get("startDate").toString().trim();
-		}
-		String endDate="";
-		if(map.get("endDate")!=null){
-			endDate=map.get("endDate").toString().trim();
-		}
-		String type="";
-		if(map.get("type")!=null){
-			type=map.get("type").toString().trim();
-		}
-		String statisticalObj="";
-		if(map.get("statisticalObj")!=null){
-			statisticalObj=map.get("statisticalObj").toString().trim();
-		}
-		String itemDetails="";
-		if(map.get("itemDetails")!=null){
-			itemDetails=map.get("itemDetails").toString().trim();
-		}
-//		Boolean item=false;
-		/*String item="";
-		if(map.get("item")!=null){
-			if("dh".equals(map.get("item").toString().trim()))
-				item=" where c.sfdc = 1";
-//				item=false;
-			else if ("dh".equals(map.get("item").toString().trim()))
-				item=" where c.sfdc = 0";
-//				item=true;
-			else
-				item="";
-		}*/
-		String timeType=map.get("timeType").toString().trim();
-
-		List<List<String>> resList = new ArrayList<>();
-		List<CalcWaybill> list = new ArrayList<CalcWaybill>();
-//		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
-		// 右边可变天数
-		TreeMap<String, List<CalcWaybillDetail>> keyMapList = new TreeMap<String, List<CalcWaybillDetail>>();
-		// 左边固定列
-		TreeMap<String, CalcWaybillDetail> keyMap = new TreeMap<String, CalcWaybillDetail>();
-
-		List<Map<String, CalcWaybillDetail>> dayList = new ArrayList<>();
-		int day = 0, day2 = 0;
-		if("m".equals(timeType)){
-			day = Integer.parseInt(startDate.substring(8,10));
-			day2 = Integer.parseInt(endDate.substring(8,10));
-			for(int i=day; i<=day2; i++){
-				Map<String, CalcWaybillDetail> daym = new HashMap<>();
-				daym.put(startDate.substring(0,7)+"-"+(i<10?"0"+i:i),this.initCalcWaybillDetail());
-				dayList.add(daym);
-			}
-		} else if("y".equals(timeType)){
-			day = Integer.parseInt(startDate.substring(5,7));
-			day2 = Integer.parseInt(endDate.substring(5,7));
-			for(int i=day; i<=day2; i++){
-				Map<String, CalcWaybillDetail> daym = new HashMap<>();
-				daym.put(startDate.substring(0,5)+(i<10?"0"+i:i),this.initCalcWaybillDetail());
-				dayList.add(daym);
-			}
-			startDate += "-01";
-			endDate += "-31";
-		}
-
-		int flag = 0;
-		if("jsy".equals(statisticalObj)){
-			flag = 1;
-			list = calcRepository.scheduleByJsy2(line, startDate, endDate, gsdm, fgsdm, destroy);
-		} else if("cwy".equals(statisticalObj)){
-			flag = 2;
-			list = calcRepository.scheduleBySpy2(line, startDate, endDate, gsdm, fgsdm, destroy);
-		} else if("cl".equals(statisticalObj)){
-			flag = 3;
-			list = calcRepository.scheduleByZbh2(line, startDate, endDate, gsdm, fgsdm, destroy);
-		} else if("xl".equals(statisticalObj)){
-			flag = 4;
-			list = calcRepository.scheduleByDateAndLineTjPx(line,startDate,endDate,gsdm,fgsdm, destroy);
-			/*if(line.equals("")){
-				//查询所有线路
-			}else{
-				//查询单条线路
-				list = calcRepository.scheduleByDateAndLineTjPx2(line,startDate,endDate);
-			}*/
-		}
-
-
-		// List类转换
-		final List<CalcWaybillDetail> listNew = JSONArray.parseArray(JSON.toJSONString(list), CalcWaybillDetail.class);
-
-		if(listNew.size() <= 0){
-			return resList;
-		}
-		Map<String,Ylb> ylbMap = new HashMap<>();
-		Map<String,Ylb> ylbCLMap = new HashMap<>();
-		Map<String,Dlb> dlbMap = new HashMap<>();
-		Map<String,Dlb> dlbCLMap = new HashMap<>();
-
-        final SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd");
-
-		// 只有在选择 车辆，驾驶员查询时才有
-		// 把油量和电量数据查出来，封装成Map，计算时直接取
-		if(flag != 2 ){
-			String linesql="";
-			if(!lineStr.equals("")){
-				linesql +=" and xlbm in("+lineStr+") ";
-			}
-			if(!gsdmStr.equals("")){
-				linesql +=" and ssgsdm in("+gsdmStr+") ";
-			}
-			if(!fgsdmStr.equals("")){
-				linesql +=" and fgsdm in("+fgsdmStr+") ";
-			}
-			String ylsql="SELECT * FROM bsth_c_ylb"
-//			String ylsql="SELECT id,xlbm,nbbm,jsy,jzl,czyl,jzyl,yh,sh,fgsdm FROM bsth_c_ylb"
-					+ " WHERE rq >= '"+startDate+"' and rq <= '"+endDate+"' "
-					+ linesql;
-			String dlSal=  " SELECT * FROM bsth_c_dlb"
-//			String dlSal=  " SELECT id,xlbm,nbbm,jsy,cdl,czcd,jzcd,hd,sh,fgsdm FROM bsth_c_dlb"
-					+ " WHERE rq >= '"+startDate+"' and rq <= '"+endDate+"' "
-					+ linesql;
-			List<Ylb> ylbList = jdbcTemplate.query(ylsql, new RowMapper<Ylb>() {
-				@Override
-				public Ylb mapRow(ResultSet arg0, int arg1) throws SQLException{
-					Ylb ylb = new Ylb();
-                    Date rq = null;
-					try{
-                        rq = ft.parse(arg0.getString("rq"));
-                    } catch (ParseException e){
-					    logger.error(e.toString(),e);
-                    }
-//					Date rq = ft.parse(arg0.getString("rq"));
-					ylb.setXlbm(arg0.getString("xlbm"));
-					ylb.setJsy(arg0.getString("jsy"));
-					ylb.setJname(arg0.getString("jname"));
-					ylb.setNbbm(arg0.getString("nbbm"));
-					ylb.setZlc(Double.parseDouble(arg0.getString("zlc")));
-					ylb.setJzl(Double.parseDouble(arg0.getString("jzl")));
-					ylb.setJzyl(Double.parseDouble(arg0.getString("jzyl")));
-					ylb.setCzyl(Double.parseDouble(arg0.getString("czyl")));
-					ylb.setYh(Double.parseDouble(arg0.getString("yh")));
-					ylb.setSh(Double.parseDouble(arg0.getString("sh")));
-					ylb.setRylx(arg0.getString("rylx"));
-					ylb.setFgsdm(arg0.getString("fgsdm"));
-					ylb.setRq(rq);
-					return ylb;
-				}
-			});
-			List<Dlb> dlbList = jdbcTemplate.query(dlSal, new RowMapper<Dlb>() {
-				@Override
-				public Dlb mapRow(ResultSet arg0, int arg1) throws SQLException {
-					Dlb dlb = new Dlb();Date rq = null;
-                    try{
-                        rq = ft.parse(arg0.getString("rq"));
-                    } catch (ParseException e){
-                        logger.error(e.toString(),e);
-                    }
-					dlb.setXlbm(arg0.getString("xlbm"));
-					dlb.setJsy(arg0.getString("jsy"));
-					dlb.setJname(arg0.getString("jname"));
-					dlb.setNbbm(arg0.getString("nbbm"));
-					dlb.setZlc(Double.parseDouble(arg0.getString("zlc")));
-					dlb.setCdl(Double.parseDouble(arg0.getString("cdl")));
-					dlb.setJzcd(Double.parseDouble(arg0.getString("jzcd")));
-					dlb.setCzcd(Double.parseDouble(arg0.getString("czcd")));
-					dlb.setHd(Double.parseDouble(arg0.getString("hd")));
-					dlb.setSh(Double.parseDouble(arg0.getString("sh")));
-					dlb.setFgsdm(arg0.getString("fgsdm"));
-					dlb.setRq(rq);
-					return dlb;
-				}
-			});
-
-			for (Ylb y:ylbList) {
-			    if(ylbMap.containsKey(y.getRq().getTime()+"_"+y.getXlbm()+"_"+y.getJsy()+"_"+y.getNbbm())){
-                    Ylb yo = ylbMap.get(y.getRq().getTime()+"_"+y.getXlbm()+"_"+y.getJsy()+"_"+y.getNbbm());
-                    yo.setZlc(Arith.add(yo.getZlc(),y.getZlc()));
-                    yo.setCzyl(Arith.add(yo.getCzyl(),y.getCzyl()));
-                    yo.setJzyl(Arith.add(yo.getJzyl(),y.getJzyl()));
-                    yo.setJzl(Arith.add(yo.getJzl(),y.getJzl()));
-                    yo.setYh(Arith.add(yo.getYh(),y.getYh()));
-                } else
-				    ylbMap.put(y.getRq().getTime()+"_"+y.getXlbm()+"_"+y.getJsy()+"_"+y.getNbbm(),y);
-
-//				ylbMap.put(y.getRq().getTime()+"_"+y.getXlbm()+"_"+y.getJsy()+"_"+y.getJname()+"_"+y.getNbbm(),y);
-//				ylbCLMap.put(y.getRq().getTime()+"_"+y.getXlbm()+"_"+y.getNbbm(),y);
-			}
-			for (Dlb d:dlbList) {
-			    if(dlbMap.containsKey(d.getRq().getTime()+"_"+d.getXlbm()+"_"+d.getJsy()+"_"+d.getNbbm())){
-                    Dlb dold = dlbMap.get(d.getRq().getTime()+"_"+d.getXlbm()+"_"+d.getJsy()+"_"+d.getNbbm());
-                    dold.setZlc(Arith.add(dold.getZlc(),d.getZlc()));
-                    dold.setHd(Arith.add(dold.getHd(),d.getHd()));
-                    dold.setCzcd(Arith.add(dold.getCzcd(),d.getCzcd()));
-                    dold.setJzcd(Arith.add(dold.getJzcd(),d.getJzcd()));
-                    dold.setCdl(Arith.add(dold.getCdl(),d.getCdl()));
-                    dold.setHd(Arith.add(dold.getHd(),d.getHd()));
-                } else
-				    dlbMap.put(d.getRq().getTime()+"_"+d.getXlbm()+"_"+d.getJsy()+"_"+d.getNbbm(),d);
-//				dlbMap.put(d.getRq().getTime()+"_"+d.getXlbm()+"_"+d.getJsy()+"_"+d.getJname()+"_"+d.getNbbm(),d);
-//				dlbCLMap.put(d.getRq().getTime()+"_"+d.getXlbm()+"_"+d.getNbbm(),d);
-			}
-		}
-
-		CalcWaybillDetail zjCalc = this.initCalcWaybillDetail();
-		zjCalc.setjName("合计");
-		// 横向数据的第几天下标
-		int dayIndex = 0;
-		int dayIndexPrev = -1;
-		// 报表纵向列数据生成
-		for (int i = 0; listNew.size() > i; i++) {
-			CalcWaybillDetail cw = listNew.get(i);
-
-			CalcWaybillDetail cwNext = new CalcWaybillDetail();
-			if(i<listNew.size()-1){
-				cwNext = listNew.get(i+1);
-			}
-			String xl = cw.getXl();
-			String jsy = cw.getjGh();
-			String cwy = cw.getsGh();
-			String cl = cw.getCl();
-
-			Ylb y = new Ylb();
-			Dlb d = new Dlb();
-			// 统计类型不同统计的左边列不同
-			// 赋值油、电量
-			if(flag != 2){
-				// 取了之后删除，防止重复取，应为添加的时候已经合并了
-				y = ylbMap.get(cw.getRq().getTime()+"_"+cw.getXl()+"_"+cw.getjGh()+"_"+cw.getCl());
-				ylbMap.remove(cw.getRq().getTime()+"_"+cw.getXl()+"_"+cw.getjGh()+"_"+cw.getCl());
-				d = dlbMap.get(cw.getRq().getTime()+"_"+cw.getXl()+"_"+cw.getjGh()+"_"+cw.getCl());
-				dlbMap.remove(cw.getRq().getTime()+"_"+cw.getXl()+"_"+cw.getjGh()+"_"+cw.getCl());
-				if(y != null){
-					cw.setZlc(y.getZlc());
-					cw.setYh(y.getYh());
-					cw.setJzl(y.getJzl());
-					if("0".equals(y.getRylx())){
-						cw.setJzl0(y.getJzl());
-					}else if("1".equals(y.getRylx())){
-						cw.setJzl10(y.getJzl());
-					}
-					cw.setJzyl(y.getJzyl());
-					cw.setCzyl(y.getCzyl());
-					cw.setRylx(y.getRylx());
-					cw.setBglyh((y.getZlc()==0? 0:100*y.getYh()/y.getZlc()));
-				}
-				if(d != null) {
-					cw.setZlc(d.getZlc());
-					cw.setHd(d.getHd());
-					cw.setJzcd(d.getJzcd());
-					cw.setCzcd(d.getCzcd());
-					cw.setCdl(d.getCdl());
-					cw.setBglyh((d.getZlc()==0? 0:100*d.getHd()/d.getZlc()));
-				}
-			}
-
-			String key = "",keyNext = "";
-			if(flag == 1){
-				if(cw.getjGh() != null && cw.getjName() != null)
-					key += cw.getjGh() + "/" + cw.getjName();
-				if(cwNext.getjGh() != null && cwNext.getjName() != null)
-					keyNext += cwNext.getjGh() + "/" + cwNext.getjName();
-			} else if(flag == 2){
-				if(cw.getsGh() != null && cw.getsName() != null)
-					key += cw.getsGh() + "/" + cw.getsName();
-				if(cwNext.getsGh() != null && cwNext.getsName() != null)
-					keyNext += cwNext.getsGh() + "/" + cwNext.getsName();
-			} else if(flag == 3){
-				if(cw.getCl() != null)
-					key += cw.getCl();
-				if(cwNext.getCl() != null)
-					keyNext += cwNext.getCl();
-			}
-			key = cw.getFgsdm()+"/"+cw.getXl() + "/" + key;
-			keyNext = cw.getFgsdm()+"/"+cwNext.getXl() + "/" + keyNext;
-			CalcWaybillDetail calc = new CalcWaybillDetail();
-			List<CalcWaybillDetail> calcList = new ArrayList<>();
-			// 是否一行数据的第一个、生成key，calc为刚添加，不去和cw相加
-			boolean ifFirst = false;
-			if(keyMapList.containsKey(key)){
-				calc = keyMap.get(key);
-				calcList = keyMapList.get(key);
-			} else {
-				// 深度拷贝对象
-				BeanUtils.copyProperties(cw,calc);
-				keyMap.put(key, calc);
-				dayIndex = 0;
-                ifFirst = true;
-			}
-
-			CalcWaybillDetail dayc = null;
-			if("m".equals(timeType)){
-				while (!dayList.get(dayIndex).containsKey(cw.getRqStr())){
-					calcList.add(new CalcWaybillDetail());
-					dayIndex++;
-				}
-				dayc = dayList.get(dayIndex).get(cw.getRqStr());
-			} else if("y".equals(timeType)){
-				while (!dayList.get(dayIndex).containsKey(cw.getRqStr().substring(0,7))){
-					calcList.add(new CalcWaybillDetail());
-					dayIndex++;
-				}
-				dayc = dayList.get(dayIndex).get(cw.getRqStr().substring(0,7));
-			}
-
-
-			// 天数相加
-			this.summation(dayc, cw);
-			// 左边固定列数据相加
-			if(!ifFirst)
-				this.summation(calc, cw);
-			// 左边合计相加
-			this.summation(zjCalc, cw);
-
-
-            if(dayIndexPrev == dayIndex){
-				CalcWaybillDetail cwPrev = calcList.get(dayIndex);
-				this.summation(cwPrev, cw);
-			} else {
-				CalcWaybillDetail cwd = new CalcWaybillDetail();
-				// 深度拷贝对象
-				BeanUtils.copyProperties(cw,cwd);
-				calcList.add(cwd);
-				calc.setTs(calc.getTs()+1);
-				zjCalc.setTs(zjCalc.getTs()+1);
-			}
-
-			// 把下标
-			dayIndexPrev = dayIndex;
-            // timeType 为m 月报表时，日期不一样就换列，为y 年报表是，月份不一样换列
-			if("m".equals(timeType) && cwNext != null && key.equals(keyNext) && !cw.getRqStr().equals(cwNext.getRqStr())){
-				dayIndex++;
-			} else if("y".equals(timeType) && cwNext != null && key.equals(keyNext) && !cw.getRqStr().substring(0,7).equals(cwNext.getRqStr().substring(0,7))){
-				dayIndex++;
-			} else if(!key.equals(keyNext)){
-				// 满数据的不用补空格
-                while (dayList.size() > dayIndex+1){
-                    calcList.add(new CalcWaybillDetail());
-                    dayIndex++;
-                }
-                // 换列了从头开始，上一个下标赋值为初始
-				dayIndexPrev = -1;
-			}
-			// 右边可变列添加数据
-			keyMapList.put(key,calcList);
-		}
-
-		// 表头和数据
-		Iterator iter = keyMap.entrySet().iterator();
-
-		List<String> list1 = new ArrayList<>();
-		list1.add("序号");
-		list1.add("所属公司");
-		list1.add("线路");
-		if(flag==1 ||flag==2 ){
-			list1.add("工号");
-			list1.add("姓名");
-		} else if(flag==3){
-			list1.add("自编号");
-			list1.add("车牌号");
-			list1.add("燃油类型");
-		}
-		list1.add("计划公里");
-		list1.add("总公里");
-		list1.add("空驶公里");
-		list1.add("临加公里");
-		list1.add("烂班公里");
-		list1.add("m".equals(timeType)?"天数":"月数");
-		for(int i=day; i<=day2; i++){
-			list1.add((i<10?"0"+i:i)+("m".equals(timeType)?"日":"月"));
-		}
-		if("bgldh".equals(itemDetails) || "bglyh".equals(itemDetails)){
-			list1.add("平均");
-		} else
-			list1.add("合计");
-		resList.add(list1);
-
-		Map<String, String> carsMap = new HashMap<>();
-		List<Cars> carsList = carsRepository.findCars();
-		for (Cars c:carsList) {
-			String sfdc = c.getSfdc()+"";
-			carsMap.put(c.getInsideCode(), sfdc.equals("true")?"纯电动":"柴油");
-		}
-
-		int i=1;
-        DecimalFormat df = new DecimalFormat("0.00");//格式化小数
-		double allNum = 0.0;
-		while (iter.hasNext()) {
-			Map.Entry entry = (Map.Entry) iter.next();
-			// 获取key
-			String key = (String) entry.getKey();
-			// 获取value
-			CalcWaybillDetail c = (CalcWaybillDetail) entry.getValue();
-
-			List<CalcWaybillDetail> cList = keyMapList.get(key);
-
-			List<String> listStr = new ArrayList<>();
-			listStr.add(i+"");
-			i++;
-			listStr.add(c.getFgsname());
-			listStr.add(c.getXlName());
-			if("jsy".equals(statisticalObj)){
-				listStr.add(c.getjGh());
-				listStr.add(c.getjName());
-			} else if("cwy".equals(statisticalObj)){
-				listStr.add(c.getsGh());
-				listStr.add(c.getsName());
-			} else if("cl".equals(statisticalObj)){
-				listStr.add(c.getCl());
-				listStr.add(BasicData.nbbmCompanyPlateMap.get(c.getCl())+"");
-				listStr.add(carsMap.get(c.getCl()));
-			} else if("xl".equals(statisticalObj)){
-
-			}
-			listStr.add(df.format(c.getJhyylc()+c.getJhfyylc()));
-			listStr.add(df.format(c.getSjyylc()+c.getSjfyylc()+c.getLjyylc()+c.getLjfyylc()));
-//			listStr.add(df.format(c.getSjyylc()+c.getLjyylc()));
-			listStr.add(df.format(c.getSjfyylc()+c.getLjfyylc()));
-			listStr.add(df.format(c.getLjyylc()+c.getLjfyylc()));
-			listStr.add(df.format(c.getLblc()));
-			listStr.add(c.getTs()+"");
-			c.setBglhd(c.getBglhd()/c.getTs());
-			c.setBglyh(c.getBglyh()/c.getTs());
-			// 把列合计的数添加到最后一个
-			cList.add(c);
-			// DecimalFormat df = new DecimalFormat("0.00");//格式化小数
-            for (CalcWaybillDetail c1:cList) {
-                if(StringUtils.isEmpty(c1.getXl())) {
-                    listStr.add("");
-                } else{
-                    if("jzlAll".equals(itemDetails)){
-                        listStr.add(df.format(c1.getJzl()));
-                    }else if("jzl0".equals(itemDetails)){
-                        listStr.add(df.format(c1.getJzl0()));
-                    } else if("jzl-10".equals(itemDetails)){
-                        listStr.add(df.format(c1.getJzl10()));
-                    } else if("yhl".equals(itemDetails)){
-                        listStr.add(df.format(c1.getYh()));
-                    } else if("jccy".equals(itemDetails)){
-                        listStr.add(df.format(c1.getJzyl()));
-                    } else if("cccy".equals(itemDetails)){
-                        listStr.add(df.format(c1.getCzyl()));
-                    } else if("bglyh".equals(itemDetails)){
-//                        listStr.add(df.format(c1.getBglyh()));
-                        listStr.add(df.format(c1.getZlc()==0? 0:100*c1.getYh()/c1.getZlc()));
-                    } else if("dh".equals(itemDetails)){
-                        listStr.add(df.format(c1.getHd()));
-                    }  else if("cdl".equals(itemDetails)){
-                        listStr.add(df.format(c1.getCdl()));
-                    } else if("cccd".equals(itemDetails)){
-                        listStr.add(df.format(c1.getCzcd()));
-                    } else if("jccd".equals(itemDetails)){
-                        listStr.add(df.format(c1.getJzcd()));
-                    } else if("bgldh".equals(itemDetails)){
-                        listStr.add(df.format(c1.getZlc()==0? 0:100*c1.getHd()/c1.getZlc()));
-//                        listStr.add(df.format(c1.getBglhd()));
-                    } else if("zgl".equals(itemDetails)){
-                        listStr.add(df.format((c1.getSjyylc()+c1.getSjfyylc()+c1.getLjfyylc()+c1.getLjyylc())));
-                    } else if("jhgl".equals(itemDetails)){
-                        listStr.add(df.format(c1.getJhyylc()+c1.getJhfyylc()));
-                    } else if("sjbc".equals(itemDetails)){
-                        listStr.add(c1.getSjyybc()+c1.getSjfyybc()+"");
-                    } else if("jhbc".equals(itemDetails)){
-                        listStr.add(c1.getJhyybc()+c1.getJhfyybc()+"");
-                    }
-                }
-            }
-			allNum = allNum + Double.parseDouble(listStr.get(listStr.size()-1));
-			resList.add(listStr);
-		}
-
-		// 合计列
-		List<String> listEnd = new ArrayList<>();
-		listEnd.add("合计");
-		listEnd.add(df.format(zjCalc.getJhyylc()+zjCalc.getJhfyylc()));
-		listEnd.add(df.format(zjCalc.getSjfyylc()+zjCalc.getSjyylc()+zjCalc.getLjyylc()+zjCalc.getLjfyylc()));//总公里
-//		listEnd.add(df.format(zjCalc.getSjyylc()+zjCalc.getLjyylc()));//营运
-		listEnd.add(df.format(zjCalc.getSjfyylc()+zjCalc.getLjfyylc()));
-		listEnd.add(df.format(zjCalc.getLjfyylc()+zjCalc.getLjyylc()));
-		listEnd.add(df.format(zjCalc.getLblc()));
-		listEnd.add(zjCalc.getTs()+"");
-		double all = 0.0;
-		for (Map<String, CalcWaybillDetail> cmap:dayList) {
-			for (Map.Entry<String, CalcWaybillDetail> cw : cmap.entrySet()) {
-//				System.out.println("key = " + cw.getKey() + ", value = " + cw.getValue());
-				CalcWaybillDetail c1 = cw.getValue();
-				if("jzlAll".equals(itemDetails)){
-					listEnd.add(df.format(c1.getJzl()));
-				} else if("jzl0".equals(itemDetails)){
-					listEnd.add(df.format(c1.getJzl0()));
-				} else if("jzl-10".equals(itemDetails)){
-					listEnd.add(df.format(c1.getJzl10()));
-				} else if("yhl".equals(itemDetails)){
-					listEnd.add(df.format(c1.getYh()));
-				} else if("jccy".equals(itemDetails)){
-					listEnd.add(df.format(c1.getJzyl()));
-				} else if("cccy".equals(itemDetails)){
-					listEnd.add(df.format(c1.getCzyl()));
-				} else if("bglyh".equals(itemDetails)){
-//					listEnd.add(df.format(c1.getBglyh()));
-					listEnd.add(df.format(c1.getZlc()==0? 0:100*c1.getYh()/c1.getZlc()));
-				} else if("dh".equals(itemDetails)){
-					listEnd.add(df.format(c1.getHd()));
-				}  else if("cdl".equals(itemDetails)){
-					listEnd.add(df.format(c1.getCdl()));
-				} else if("cccd".equals(itemDetails)){
-					listEnd.add(df.format(c1.getCzcd()));
-				} else if("jccd".equals(itemDetails)){
-					listEnd.add(df.format(c1.getJzcd()));
-				} else if("bgldh".equals(itemDetails)){
-//					listEnd.add(df.format(c1.getBglhd()));
-					listEnd.add(df.format(c1.getZlc()==0? 0:100*c1.getHd()/c1.getZlc()));
-				} else if("zgl".equals(itemDetails)){
-					listEnd.add((df.format(c1.getSjyylc()+c1.getSjfyylc()+c1.getLjfyylc()+c1.getLjyylc())));
-				} else if("jhgl".equals(itemDetails)){
-					listEnd.add((df.format(c1.getJhyylc()+c1.getJhfyylc())));
-				} else if("sjbc".equals(itemDetails)){
-					listEnd.add(c1.getSjyybc()+c1.getSjfyybc()+"");
-				} else if("jhbc".equals(itemDetails)){
-					listEnd.add((c1.getJhyybc()+c1.getJhfyybc())+"");
-				}
-			}
-			all = all + Double.parseDouble(listEnd.get(listEnd.size()-1));
-		}
-
-		// 百公里电油耗时为平均数
-		if("bgldh".equals(itemDetails) || "bglyh".equals(itemDetails)){
-			allNum = allNum/keyMap.size();
-			all = all/dayList.size();
-		}
-//		listEnd.add(df.format(allNum)+"/"+df.format(all));
-		listEnd.add(df.format(all));
-		resList.add(listEnd);
-
-		return resList;
-	}
-
-	public CalcWaybillDetail initCalcWaybillDetail(){
-		CalcWaybillDetail calc = new CalcWaybillDetail();
-		calc.setJhyybc(0);
-		calc.setJhyylc(0d);
-		calc.setJhfyybc(0);
-		calc.setJhfyylc(0d);
-		calc.setSjyybc(0);
-		calc.setSjyylc(0d);
-		calc.setSjfyybc(0);
-		calc.setSjfyylc(0d);
-		calc.setLbbc(0);
-		calc.setLblc(0d);
-		calc.setLjbc(0);
-		calc.setLjyylc(0d);
-		calc.setZlc(0d);
-		calc.setCzyl(0d);
-		calc.setJzyl(0d);
-		calc.setJzl(0d);
-		calc.setJzl0(0d);
-		calc.setJzl10(0d);
-		calc.setYh(0d);
-		calc.setCzcd(0d);
-		calc.setJzcd(0d);
-		calc.setCdl(0d);
-		calc.setHd(0d);
-		calc.setTs(0);
-		return calc;
-	}
-
-	public CalcWaybillDetail summation(CalcWaybillDetail c1, CalcWaybillDetail c2){
-		c1.setJhyybc(c1.getJhyybc() + c2.getJhyybc());
-		c1.setJhyylc(Arith.add(c1.getJhyylc(), c2.getJhyylc()));
-		c1.setJhfyybc(c1.getJhfyybc() + c2.getJhfyybc());
-		c1.setJhfyylc(Arith.add(c1.getJhfyylc(), c2.getJhfyylc()));
-		c1.setSjyybc(c1.getSjyybc() + c2.getSjyybc());
-		c1.setSjyylc(Arith.add(c1.getSjyylc(), c2.getSjyylc()));
-//		c1.setSjyylc(Arith.add(c1.getSjyylc(), c2.getLjyylc()));// 把临加的也算上了，后面不用加了
-		c1.setSjfyybc(c1.getSjfyybc() + c2.getSjfyybc());
-		c1.setSjfyylc(Arith.add(c1.getSjfyylc(), c2.getSjfyylc()));
-//		c1.setSjfyylc(Arith.add(c1.getSjfyylc(), c2.getLjfyylc()));// 把临加的也算上了，后面不用加了
-		c1.setLbbc(c1.getLbbc() + c2.getLbbc());
-		c1.setLblc(Arith.add(c1.getLblc(), c2.getLblc()));
-		c1.setLjbc(c1.getLjbc() + c2.getLjbc());
-		c1.setLjyylc(Arith.add(c1.getLjyylc(), c2.getLjyylc()));
-		c1.setLjfyylc(Arith.add(c1.getLjfyylc(), c2.getLjfyylc()));
-		c1.setZlc(Arith.add(c1.getZlc(),c2.getZlc()));
-		c1.setCzyl(Arith.add(c1.getCzyl(),c2.getCzyl()));
-		c1.setJzyl(Arith.add(c1.getJzyl(),c2.getJzyl()));
-		c1.setJzl(Arith.add(c1.getJzl(),c2.getJzl()));
-		c1.setJzl0(Arith.add(c1.getJzl0(),c2.getJzl0()));
-		c1.setJzl10(Arith.add(c1.getJzl10(),c2.getJzl10()));
-		c1.setYh(Arith.add(c1.getYh(),c2.getYh()));
-		c1.setHd(Arith.add(c1.getHd(),c2.getHd()));
-		c1.setCzcd(Arith.add(c1.getCzcd(),c2.getCzcd()));
-		c1.setJzcd(Arith.add(c1.getJzcd(),c2.getJzcd()));
-		c1.setCdl(Arith.add(c1.getCdl(),c2.getCdl()));
-		c1.setHd(Arith.add(c1.getHd(),c2.getHd()));
-		c1.setTs(c1.getTs()+c2.getTs());
-//		c1.setDtbc(c1.getDtbc() + c2.getDtbc());
-		return c1;
-	}
-}
-
-class AccountXlbmByping implements Comparator<Map<String, Object>> {
-    @Override
-    public int compare(Map<String, Object> o1, Map<String, Object> o2) {
-        // TODO Auto-generated method stub
-//		 PinyinHelper.convertToPinyinString(ppy.getName(),
-//		 "" , PinyinFormat.WITHOUT_TONE)
-        return o1.get("xlNamePy").toString().compareTo(
-                o2.get("xlNamePy").toString());
-    }
-}
+package com.bsth.service.calc.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.bsth.common.ResponseCode;
+import com.bsth.data.BasicData;
+import com.bsth.entity.Cars;
+import com.bsth.entity.Line;
+import com.bsth.entity.calc.CalcBusMileage;
+import com.bsth.entity.calc.CalcInterval;
+import com.bsth.entity.calc.CalcLineMileage;
+import com.bsth.entity.calc.CalcStatistics;
+import com.bsth.entity.calc.CalcWaybill;
+import com.bsth.entity.calc.CalcWaybillDetail;
+import com.bsth.entity.oil.Dlb;
+import com.bsth.entity.oil.Ylb;
+import com.bsth.entity.realcontrol.ChildTaskPlan;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.sys.Interval;
+import com.bsth.repository.CarsRepository;
+import com.bsth.repository.LineRepository;
+import com.bsth.repository.calc.CalcBusMileageRepository;
+import com.bsth.repository.calc.CalcIntervalRepository;
+import com.bsth.repository.calc.CalcLineMileageRepository;
+import com.bsth.repository.calc.CalcStatisticsRepository;
+import com.bsth.repository.calc.CalcWaybillRepository;
+import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
+import com.bsth.service.LineService;
+import com.bsth.service.calc.CalcToolService;
+import com.bsth.service.calc.CalcWaybillService;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.realcontrol.ScheduleRealInfoService;
+import com.bsth.service.report.CulateMileageService;
+import com.bsth.service.report.ReportService;
+import com.bsth.util.Arith;
+import com.bsth.util.ReportUtils;
+import com.github.stuxuhai.jpinyin.PinyinException;
+import com.github.stuxuhai.jpinyin.PinyinFormat;
+import com.github.stuxuhai.jpinyin.PinyinHelper;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Service;
+
+import javax.transaction.Transactional;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * Created by 17/11/16.
+ */
+@Service
+public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer> implements CalcWaybillService {
+	
+	@Autowired
+	private CalcWaybillRepository calcRepository;
+
+	@Autowired
+	private CalcStatisticsRepository calcStatisticsRepository;
+
+	@Autowired
+	private CalcLineMileageRepository calcLineMileageRepository;
+
+	@Autowired
+	private CalcBusMileageRepository calcBusMileageRepository;
+
+	@Autowired
+	private CalcToolService calcToolService;
+
+    @Autowired
+    private CulateMileageService culateService;
+    
+    @Autowired
+    private ScheduleRealInfoService scheduleRealInfoService;
+    
+    @Autowired
+    private ScheduleRealInfoRepository scheduleRealInfoRepository;
+    
+    @Autowired
+    private CalcIntervalRepository calcIntervalRepository;
+    
+    @Autowired
+    private LineRepository lineRepository;
+    @Autowired
+    private LineService lineService;
+    @Autowired
+    private ReportService reportService;
+    @Autowired
+	CarsRepository carsRepository;
+    
+	@Autowired
+	JdbcTemplate jdbcTemplate;
+
+
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+    
+	
+	public Map<String, Object> autoGenerate(String date, String line) throws Exception {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		List<String> dateList = new ArrayList<String>();
+		if(date == null || date.trim().length() == 0){
+			Date d = new Date();
+			d.setTime(d.getTime() - (4l * 1000 * 60 * 60 * 24));
+			dateList.add(sdf.format(d));
+			d.setTime(d.getTime() - (1l * 1000 * 60 * 60 * 24));
+			dateList.add(sdf.format(d));
+		} else {
+			date = date.trim();
+			dateList.add(date);
+		}
+		if(line == null || line.trim().length() == 0){
+			line = "";
+		} else {
+			line = line.trim();
+		}
+		
+		Map<String, Object> m = new HashMap<String, Object>();
+		for(String d : dateList){
+			try {
+				Map<String, Object> generateNew = generateNew(d, line);
+				m.put("generateNew", generateNew);
+			} catch (Exception e) {
+				// TODO: handle exception
+				logger.info("date="+d+";line="+line+";重新统计保存失败！");
+			}
+			try {
+				Map<String, Object> calcLineMileage = calcLineMileage(d, line);
+				m.put("lineMileage", calcLineMileage);
+			} catch (Exception e) {
+				// TODO: handle exception
+				logger.info("date="+d+";line="+line+";线路公里审计保存失败！");
+			}
+			try {
+				Map<String, Object> calcBusMileage = calcBusMileage(d, line);
+				m.put("busMileage", calcBusMileage);
+			} catch (Exception e) {
+				// TODO: handle exception
+				logger.info("date="+d+";line="+line+";路单数据审计保存失败！");
+			}
+		}
+		
+		return m;
+	}
+	
+	@Transactional
+	@Override
+	public Map<String, Object> generateNew(String date, String line) throws Exception {
+		Map<String, Object> newMap = new HashMap<String, Object>();
+		try {
+			if(date == null){
+				date = "";
+			} else {
+				date = date.trim();
+			}
+			if(line == null){
+				line = "";
+			} else {
+				line = line.trim();
+			}
+			if(date.length() != 0 && line.length() != 0){
+				calcRepository.deleteByDateAndLine(date, line);
+			} else if(date.length() != 0){
+				calcRepository.deleteByDate(date);
+			} else {
+				newMap.put("status", ResponseCode.ERROR);
+				logger.error("save erro.", "日期不能为空");
+				return newMap;
+			}
+			
+			if(date.trim().length() == 0){
+				newMap.put("status", ResponseCode.ERROR);
+				logger.error("save erro.", "日期不能为空");
+				return newMap;
+			}
+			
+//			String sql = "select c.id,c.out_config,c.start_opt,t.line_code from bsth_c_line_config c LEFT JOIN bsth_c_line t on c.line=t.id";
+			String sql="select xl_bm as line_code from bsth_c_s_sp_info_real where schedule_date_str = '"+date+"'";
+	        if(line.trim().length() > 0){
+	        	sql += " and xl_bm = '"+line+"'";
+//				sql += " where t.line_code = " + line;
+	        }
+	        sql += " group by xl_bm";
+			List<Map<String, Object>> listLineConfig = jdbcTemplate.query(sql,
+						new RowMapper<Map<String, Object>>(){
+					@Override
+					public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Map<String, Object> m = new HashMap<String, Object>();
+//						m.put("id", rs.getLong("id"));
+//						m.put("out_config", rs.getString("out_config"));
+//						m.put("start_opt", rs.getString("start_opt"));
+						m.put("line_code", rs.getString("line_code"));
+						return m;
+			}});
+			
+			String xlSql="select line_code,spac_grade from bsth_c_line";
+			if(line.length() != 0){
+				xlSql += " where line_code ='"+line+"'";
+			}
+			List<Map<String, Object>> xlList=jdbcTemplate.query(xlSql, new RowMapper<Map<String, Object>>() {
+				@Override
+				public Map<String, Object> mapRow(ResultSet arg0, int arg1) throws SQLException {
+					Map<String, Object> map=new HashMap<String,Object>();
+					map.put("line",arg0.getString("line_code"));
+					map.put("grade", arg0.getString("spac_grade"));
+					return map;
+			}});
+			Map<String, List<Map<String, Object>>> xlMap = new HashMap<String, List<Map<String, Object>>>();
+			for(Map<String, Object> m : xlList){
+				if(m.containsKey("line") && m.get("line").toString().trim().length() > 0){
+					String key = m.get("line").toString().trim();
+					if(!xlMap.containsKey(key))
+						xlMap.put(key, new ArrayList<Map<String, Object>>());
+					xlMap.get(key).add(m);
+				}
+			}
+			//查询大间隔时间
+			String djgSql="select * from bsth_c_interval";
+			List<Interval> djgList=jdbcTemplate.query(djgSql, new RowMapper<Interval>() {
+				@Override
+				public Interval mapRow(ResultSet arg0, int arg1) throws SQLException {
+					Interval m=new Interval();
+					m.setLevel(arg0.getString("level"));
+					m.setPeak(arg0.getInt("peak"));
+					m.setTrough(arg0.getInt("trough"));
+					return m;
+			}});
+			
+			Map<String, List<ScheduleRealInfo>> scheMap = new HashMap<String, List<ScheduleRealInfo>>();
+			List<ScheduleRealInfo> list = calcRepository.findAllScheduleByDate(date);
+			for(ScheduleRealInfo s : list){
+				String xlBm = s.getXlBm();
+				if(!scheMap.containsKey(xlBm)){
+					scheMap.put(xlBm, new ArrayList<ScheduleRealInfo>());
+				}
+				scheMap.get(xlBm).add(s);
+			}
+			
+			Set<String> lineSet = new HashSet<String>();
+			List<CalcWaybill> all = new ArrayList<CalcWaybill>();
+			for (int i = 0; i < listLineConfig.size(); i++) {
+				Map<String, Object> m =listLineConfig.get(i);
+				String lineCode=m.get("line_code").toString().trim();
+//				String startOpt=m.get("start_opt").toString().trim();
+				if(!lineSet.add(lineCode))
+					continue;
+				
+				List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
+				if(xlMap.containsKey(lineCode) && xlMap.get(lineCode) != null){
+					tempList = xlMap.get(lineCode);
+				}
+				
+				if(!scheMap.containsKey(lineCode))
+					continue;
+				List<CalcWaybill> findAll = calcToolService.findAll(date, lineCode, scheMap.get(lineCode), tempList, djgList);
+				all.addAll(findAll);
+				
+			}
+//			new BatchSaveUtils<CalcWaybill>().saveList2(all, CalcWaybill.class);
+			calcRepository.saveAll(all);
+			
+			newMap.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			// TODO: handle exception
+			newMap.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+			throw e;
+		}
+		
+		return newMap;
+	}
+	
+	@Override
+	public List<Map<String, Object>> statisticsDailyTj(String gsdm,
+			String fgsdm, String line, String date, String date2,
+			String xlName, String type) {
+
+		List<String> keyList = new ArrayList<String>();
+		List<CalcWaybill> list = new ArrayList<CalcWaybill>();
+		List<CalcWaybill> lists = new ArrayList<CalcWaybill>();
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		Map<String, List<CalcWaybill>> keyMap = new HashMap<String, List<CalcWaybill>>();
+		
+		if(line.equals("")){
+            //查询所有线路
+            list = calcRepository.scheduleByDateAndLineTj(line,date,date2,gsdm,fgsdm);
+        }else{
+            //查询单条线路
+            list = calcRepository.scheduleByDateAndLineTj2(line,date,date2);
+        }
+		
+		for(CalcWaybill c : list){
+			String key = c.getXlName();
+			if(!keyMap.containsKey(key)){
+				keyMap.put(key, new ArrayList<CalcWaybill>());
+				keyList.add(key);
+			}
+			keyMap.get(key).add(c);
+		}
+		Collections.sort(keyList, new AccountXlbmStr());
+		for(String key : keyList){
+			CalcWaybill calc = keyMap.get(key).get(0);
+			for(int i = 1; i < keyMap.get(key).size(); i++){
+				CalcWaybill c= keyMap.get(key).get(i);
+				calc.setJhyylc(Arith.add(calc.getJhyylc(), c.getJhyylc()));
+				calc.setJhfyylc(Arith.add(calc.getJhfyylc(), c.getJhfyylc()));
+				calc.setSjyylc(Arith.add(calc.getSjyylc(), c.getSjyylc()));
+				calc.setSjfyylc(Arith.add(calc.getSjfyylc(), c.getSjfyylc()));
+				calc.setLblc(Arith.add(calc.getLblc(), c.getLblc()));
+				calc.setLbbc(calc.getLbbc() + c.getLbbc());
+				calc.setLblcLz(Arith.add(calc.getLblcLz(), c.getLblcLz()));
+				calc.setLblcDm(Arith.add(calc.getLblcDm(), c.getLblcDm()));
+				calc.setLblcGz(Arith.add(calc.getLblcGz(), c.getLblcGz()));
+				calc.setLblcJf(Arith.add(calc.getLblcJf(), c.getLblcJf()));
+				calc.setLblcZs(Arith.add(calc.getLblcZs(), c.getLblcZs()));
+				calc.setLblcQr(Arith.add(calc.getLblcQr(), c.getLblcQr()));
+				calc.setLblcQc(Arith.add(calc.getLblcQc(), c.getLblcQc()));
+				calc.setLblcKx(Arith.add(calc.getLblcKx(), c.getLblcKx()));
+				calc.setLblcQh(Arith.add(calc.getLblcQh(), c.getLblcQh()));
+				calc.setLblcYw(Arith.add(calc.getLblcYw(), c.getLblcYw()));
+				calc.setLblcQt(Arith.add(calc.getLblcQt(), c.getLblcQt()));
+				calc.setLjyylc(Arith.add(calc.getLjyylc(), c.getLjyylc()));
+				calc.setLjfyylc(Arith.add(calc.getLjfyylc(), c.getLjfyylc()));
+				calc.setJhyybc(calc.getJhyybc() + c.getJhyybc());
+				calc.setJhyybczgf(calc.getJhyybczgf() + c.getJhyybczgf());
+				calc.setJhyybcwgf(calc.getJhyybcwgf() + c.getJhyybcwgf());
+				calc.setSjyybc(calc.getSjyybc() + c.getSjyybc());
+				calc.setSjyybczgf(calc.getSjyybczgf() + c.getSjyybczgf());
+				calc.setSjyybcwgf(calc.getSjyybcwgf() + c.getSjyybcwgf());
+				calc.setLjbc(calc.getLjbc() + c.getLjbc());
+				calc.setLjbczgf(calc.getLjbczgf() + c.getLjbczgf());
+				calc.setLjbcwgf(calc.getLjbcwgf() + c.getLjbcwgf());
+				calc.setFzbc(calc.getFzbc() + c.getFzbc());
+				calc.setFzbczgf(calc.getFzbczgf() + c.getFzbczgf());
+				calc.setFzbcwgf(calc.getFzbcwgf() + c.getFzbcwgf());
+				calc.setDtbc(calc.getDtbc() + c.getDtbc());
+				calc.setDtbczgf(calc.getDtbczgf() + c.getDtbczgf());
+				calc.setDtbcwgf(calc.getDtbcwgf() + c.getDtbcwgf());
+			}
+			calc.setSjyylc(Arith.add(calc.getSjyylc(), calc.getLjyylc()));
+			calc.setSjfyylc(Arith.add(calc.getSjfyylc(), calc.getLjfyylc()));
+			lists.add(calc);
+		}
+		CalcWaybill sum = new CalcWaybill();
+		sum.setXlName("合计");
+		for(CalcWaybill c : lists){
+			sum.setJhyylc(Arith.add(sum.getJhyylc()!=null?sum.getJhyylc():0, c.getJhyylc()));
+			sum.setJhfyylc(Arith.add(sum.getJhfyylc()!=null?sum.getJhfyylc():0, c.getJhfyylc()));
+			sum.setSjyylc(Arith.add(sum.getSjyylc()!=null?sum.getSjyylc():0, c.getSjyylc()));
+			sum.setLjyylc(Arith.add(sum.getLjyylc()!=null?sum.getLjyylc():0, c.getLjyylc()));
+			sum.setSjfyylc(Arith.add(sum.getSjfyylc()!=null?sum.getSjfyylc():0, c.getSjfyylc()));
+			sum.setLjfyylc(Arith.add(sum.getLjfyylc()!=null?sum.getLjfyylc():0, c.getLjfyylc()));
+			sum.setLblc(Arith.add(sum.getLblc()!=null?sum.getLblc():0, c.getLblc()));
+			sum.setLbbc(sum.getLbbc() + c.getLbbc());
+			sum.setLblcLz(Arith.add(sum.getLblcLz()!=null?sum.getLblcLz():0, c.getLblcLz()));
+			sum.setLblcDm(Arith.add(sum.getLblcDm()!=null?sum.getLblcDm():0, c.getLblcDm()));
+			sum.setLblcGz(Arith.add(sum.getLblcGz()!=null?sum.getLblcGz():0, c.getLblcGz()));
+			sum.setLblcJf(Arith.add(sum.getLblcJf()!=null?sum.getLblcJf():0, c.getLblcJf()));
+			sum.setLblcZs(Arith.add(sum.getLblcZs()!=null?sum.getLblcZs():0, c.getLblcZs()));
+			sum.setLblcQr(Arith.add(sum.getLblcQr()!=null?sum.getLblcQr():0, c.getLblcQr()));
+			sum.setLblcQc(Arith.add(sum.getLblcQc()!=null?sum.getLblcQc():0, c.getLblcQc()));
+			sum.setLblcKx(Arith.add(sum.getLblcKx()!=null?sum.getLblcKx():0, c.getLblcKx()));
+			sum.setLblcQh(Arith.add(sum.getLblcQh()!=null?sum.getLblcQh():0, c.getLblcQh()));
+			sum.setLblcYw(Arith.add(sum.getLblcYw()!=null?sum.getLblcYw():0, c.getLblcYw()));
+			sum.setLblcQt(Arith.add(sum.getLblcQt()!=null?sum.getLblcQt():0, c.getLblcQt()));
+			sum.setJhyybc(sum.getJhyybc() + c.getJhyybc());
+			sum.setJhyybczgf(sum.getJhyybczgf() + c.getJhyybczgf());
+			sum.setJhyybcwgf(sum.getJhyybcwgf() + c.getJhyybcwgf());
+			sum.setSjyybc(sum.getSjyybc() + c.getSjyybc());
+			sum.setSjyybczgf(sum.getSjyybczgf() + c.getSjyybczgf());
+			sum.setSjyybcwgf(sum.getSjyybcwgf() + c.getSjyybcwgf());
+			sum.setLjbc(sum.getLjbc() + c.getLjbc());
+			sum.setLjbczgf(sum.getLjbczgf() + c.getLjbczgf());
+			sum.setLjbcwgf(sum.getLjbcwgf() + c.getLjbcwgf());
+			sum.setFzbc(sum.getFzbc() + c.getFzbc());
+			sum.setFzbczgf(sum.getFzbczgf() + c.getFzbczgf());
+			sum.setFzbcwgf(sum.getFzbcwgf() + c.getFzbcwgf());
+			sum.setDtbc(sum.getDtbc() + c.getDtbc());
+			sum.setDtbczgf(sum.getDtbczgf() + c.getDtbczgf());
+			sum.setDtbcwgf(sum.getDtbcwgf() + c.getDtbcwgf());
+		}
+		if(lists.size() > 0){
+			lists.add(sum);
+		}
+		
+		for(CalcWaybill c : lists){
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("xlName", c.getXlName());
+			m.put("jhzlc", Arith.add(c.getJhyylc(), c.getJhfyylc()));
+			m.put("jhlc", c.getJhyylc());
+			m.put("jcclc", c.getJhfyylc());
+//			m.put("sjzgl", Arith.add(Arith.add(c.getSjyylc(), c.getLjyylc()), Arith.add(c.getSjfyylc(), c.getLjfyylc())));
+//			m.put("sjgl", Arith.add(c.getSjyylc(), c.getLjyylc()));
+//			m.put("sjksgl", Arith.add(c.getSjfyylc(), c.getLjfyylc()));
+			m.put("sjzgl", Arith.add(c.getSjyylc(), c.getSjfyylc()));
+			m.put("sjgl", c.getSjyylc());
+			m.put("sjksgl", c.getSjfyylc());
+			m.put("ssgl", c.getLblc());
+			m.put("ssbc", c.getLbbc());
+			m.put("ssgl_lz", c.getLblcLz());
+			m.put("ssgl_dm", c.getLblcDm());
+			m.put("ssgl_gz", c.getLblcGz());
+			m.put("ssgl_jf", c.getLblcJf());
+			m.put("ssgl_zs", c.getLblcZs());
+			m.put("ssgl_qr", c.getLblcQr());
+			m.put("ssgl_qc", c.getLblcQc());
+			m.put("ssgl_kx", c.getLblcKx());
+			m.put("ssgl_qh", c.getLblcQh());
+			m.put("ssgl_yw", c.getLblcYw());
+			m.put("ssgl_other", c.getLblcQt());
+			m.put("ljgl", c.getLjyylc());
+			m.put("jhbc", c.getJhyybc());
+			m.put("jhbc_m", c.getJhyybczgf());
+			m.put("jhbc_a", c.getJhyybcwgf());
+			m.put("sjbc", c.getSjyybc());
+			m.put("sjbc_m", c.getSjyybczgf());
+			m.put("sjbc_a", c.getSjyybcwgf());
+			m.put("ljbc", c.getLjbc());
+			m.put("ljbc_m", c.getLjbczgf());
+			m.put("ljbc_a", c.getLjbcwgf());
+			m.put("fzbc", c.getFzbc());
+			m.put("fzbc_m", c.getFzbczgf());
+			m.put("fzbc_a", c.getFzbcwgf());
+			m.put("dtbc", c.getDtbc());
+			m.put("dtbc_m", c.getDtbczgf());
+			m.put("dtbc_a", c.getDtbcwgf());
+			resList.add(m);
+		}
+		
+		if (type != null && type.length() != 0 && type.equals("export")) {
+            SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+                    sdfSimple = new SimpleDateFormat("yyyyMMdd");
+            List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+            Map<String, Object> m = new HashMap<String, Object>();
+            m.put("date", date+"至"+date2);
+            ReportUtils ee = new ReportUtils();
+            try {
+            	String dateTime = "";
+            	if(date.equals(date2)){
+            		dateTime = sdfSimple.format(sdfMonth.parse(date));
+            	} else {
+            		dateTime = sdfSimple.format(sdfMonth.parse(date))
+            				+"-"+sdfSimple.format(sdfMonth.parse(date2));
+            	}
+                listI.add(resList.iterator());
+                String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+                ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_.xls",
+                        path + "export/" + dateTime + "-" + xlName + "-统计日报.xls");
+            } catch (Exception e) {
+                // TODO: handle exception
+                //e.printStackTrace();
+            	logger.info("" , e);
+            }
+        }
+		
+		return resList;
+	}
+
+	/**
+	 * @param rq 格式如：2018-03-22（留空""默认当前日期前四天）
+	 * @param line （留空""默认全部线路）
+	 */
+	@Transactional
+	@Override
+	public String calcDaily(String rq, String line) throws Exception{
+		String result = "";
+		try {
+			List<String> dateList = new ArrayList<String>();
+			if(rq == null || rq.trim().length() == 0){
+				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+				Date dNow = new Date();   //当前时间
+				Date dBefore = new Date();
+				Calendar calendar = Calendar.getInstance(); //得到日历
+				calendar.setTime(dNow);//把当前时间赋给日历
+				calendar.add(Calendar.DAY_OF_MONTH, -4);  //设置为前一天
+				dBefore = calendar.getTime();   //得到前一天的时间
+//				rq = sdf.format(dBefore);
+				dateList.add(sdf.format(dBefore));
+				Date date = new Date();
+				date.setTime(dBefore.getTime() - 1l*1000*60*60*24);
+				dateList.add(sdf.format(date));
+			} else {
+//				rq = rq.trim();
+				dateList.add(rq.trim());
+			}
+			if(line == null || line.trim().length() == 0){
+				line = "";
+			} else {
+				line = line.trim();
+			}
+			
+			for(int j = 0; j < dateList.size(); j++){
+				rq = dateList.get(j);
+			
+		        List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
+		        List<ScheduleRealInfo> list_s = new ArrayList<ScheduleRealInfo>();
+		        List<ScheduleRealInfo> lists = new ArrayList<ScheduleRealInfo>();
+		        
+		        String gsSql="select gs_bm, fgs_bm from bsth_c_s_sp_info_real where schedule_date_str = '"+rq+"'";
+		        if(line.trim().length() > 0)
+		        	gsSql += " and xl_bm = '"+line+"'";
+				gsSql += " group by gs_bm, fgs_bm";
+				List<Map<String, String>> gsList=jdbcTemplate.query(gsSql, new RowMapper<Map<String, String>>() {
+					@Override
+					public Map<String, String> mapRow(ResultSet arg0, int arg1) throws SQLException {
+						Map<String, String> m = new HashMap<String, String>();
+						m.put("gsdm", arg0.getString("gs_bm"));
+						m.put("fgsdm", arg0.getString("fgs_bm"));
+						return m;
+				}});
+	
+		        //查询所有线路
+				for(Map<String, String> m : gsList){
+					list.addAll(calcStatisticsRepository.scheduleByDateAndLine(line, rq, rq, m.get("gsdm"), m.get("fgsdm")));
+				}
+				
+				List<CalcInterval> listInterval=calcIntervalRepository.selectByDateAndCompany(rq, "", "","");
+				Map<String,CalcInterval> mapInterval=new HashMap<String,CalcInterval>();
+				for (int i = 0; i < listInterval.size(); i++) {
+					CalcInterval c=listInterval.get(i);
+					mapInterval.put(c.getXlBm(), c);
+				}
+	
+		        
+		        for (int i = 0; i < list.size(); i++) {
+		            ScheduleRealInfo s=list.get(i);
+		            Set<ChildTaskPlan> cts = s.getcTasks();
+		            if(cts != null && cts.size() > 0){
+		            	 list_s.add(s);
+		            }else{
+			            if(s.getZdsjActual()!=null && s.getFcsjActual()!=null){
+			                list_s.add(s);
+			            }
+		            }
+		        }
+		        List<CalcStatistics> lMap = new ArrayList<CalcStatistics>();
+		        for (int i = 0; i < list.size(); i++) {
+		            if(i<list.size()-1){
+		                if(list.get(i+1).getXlBm().equals(list.get(i).getXlBm())){
+		                    lists.add(list.get(i));
+		                }else{
+		                    lists.add(list.get(i));
+		                    CalcInterval t=null;
+		                    if(mapInterval.get(lists.get(0).getXlBm())!=null){
+		                    	t=mapInterval.get(lists.get(0).getXlBm());
+		                    }
+		                   
+		                    CalcStatistics s=staticTj(lists,t);
+		                    lMap.add(s);
+		                    lists=new ArrayList<ScheduleRealInfo>();
+		                }
+		            }else{
+		                if(list.get(i).getXlBm().equals(list.get(i-1).getXlBm())){
+		                    lists.add(list.get(i));
+		                    CalcInterval t=null;
+		                    if(mapInterval.get(lists.get(0).getXlBm())!=null){
+		                    	t=mapInterval.get(lists.get(0).getXlBm());
+		                    }
+		                    CalcStatistics s=staticTj(lists,t);
+		                    lMap.add(s);
+		                }else{
+		                    lists=new  ArrayList<ScheduleRealInfo>();
+		                    lists.add(list.get(i));
+		                    CalcInterval t=null;
+		                    if(mapInterval.get(lists.get(0).getXlBm())!=null){
+		                    	t=mapInterval.get(lists.get(0).getXlBm());
+		                    }
+		                    CalcStatistics s=staticTj(lists,t);
+		                    lMap.add(s);
+		                }
+		            }
+		        }
+	//	        Collections.sort(lMap,new AccountXlbm());
+		        
+		        if(line.trim().length() > 0){
+		        	calcStatisticsRepository.deleteByDateAndLine(rq, line);
+		        } else {
+		        	calcStatisticsRepository.deleteByDate(rq);
+		        }
+		        calcStatisticsRepository.saveAll(lMap);
+
+			}
+			
+	        result = "success";
+		} catch (Exception e) {
+			// TODO: handle exception
+			throw e;
+		}finally{
+			logger.info("result:"+result);
+		}
+		return result;
+	}
+	
+    public final CalcStatistics staticTj(List<ScheduleRealInfo> list,CalcInterval t){
+        
+        List<ScheduleRealInfo>  lists=new ArrayList<ScheduleRealInfo>();
+        for(int i=0;i<list.size();i++){
+            ScheduleRealInfo s=list.get(i);
+            Set<ChildTaskPlan> cts = s.getcTasks();
+            if(cts != null && cts.size() > 0){
+            	lists.add(s);
+            }else{
+	            if(s.getZdsjActual()!=null&& s.getFcsjActual()!=null){
+	            	lists.add(s);
+	            }
+            }
+        }
+//		Map<String, Object> map = new HashMap<String, Object>();
+        CalcStatistics s = new CalcStatistics();
+    	if(list.size() > 0){
+    		ScheduleRealInfo sche = list.get(0);
+    		s.setXl(sche.getXlBm());
+    		s.setXlName(sche.getXlName());
+    		s.setDate(sche.getScheduleDate());
+    		s.setDateStr(sche.getScheduleDateStr());
+    		s.setGsdm(sche.getGsBm());
+    		s.setFgsdm(sche.getFgsBm());
+    		
+	        double jhyygl=culateService.culateJhgl(list);//计划营运公里
+	        double jhjcclc= culateService.culateJhJccgl(list);//计划进出场公里(计划空驶公里)
+	        s.setJhyylc(jhyygl);
+	        s.setJhkslc(jhjcclc);
+	        s.setJhzlc(Arith.add(jhyygl, jhjcclc));
+	
+	        double ljgl= culateService.culateLjgl(lists);
+	        double sjyygl= culateService.culateSjgl(lists);
+	        double zyygl= Arith.add(sjyygl,ljgl);
+	
+	        double ljksgl= culateService.culateLjksgl(lists);
+	        double sjjccgl=culateService.culateJccgl(lists);
+	        double sjksgl=culateService.culateKsgl(lists);
+	        double zksgl=Arith.add(sjjccgl, sjksgl);
+	        s.setSjyylc(zyygl);
+	        s.setSjkslc(zksgl);
+	        s.setSjzlc(Arith.add(zyygl, zksgl));
+	        
+	        s.setLjkslc(ljksgl);
+	        
+	        s.setSslc(culateService.culateLbgl(list));
+	        s.setSsbc(culateService.culateLbbc(list));
+	        
+	        //计划+临加-少驶=实驶
+//	        double jl=Arith.sub(Arith.add(jhyygl, ljgl),ssgl);
+//	        if(jl==zyygl){
+//	        	map.put("zt", 0);
+//	        }else{
+//	        	map.put("zt", 1);
+//	        }
+	        
+	        s.setLzlc(culateService.culateCJLC(list, "路阻"));
+	        s.setDmlc(culateService.culateCJLC(list, "吊慢"));
+	        s.setGzlc(culateService.culateCJLC(list, "故障"));
+	        s.setJflc(culateService.culateCJLC(list, "纠纷"));
+	        s.setZslc(culateService.culateCJLC(list, "肇事"));
+	        s.setQrlc(culateService.culateCJLC(list, "缺人"));
+	        s.setQclc(culateService.culateCJLC(list, "缺车"));
+	        s.setKxlc(culateService.culateCJLC(list, "客稀"));
+	        s.setQhlc(culateService.culateCJLC(list, "气候"));
+	        s.setYwlc(culateService.culateCJLC(list, "援外"));
+	        double ssgl_pc=culateService.culateCJLC(list, "配车");
+	        double ssgl_by=culateService.culateCJLC(list, "保养");
+	        double ssgl_cj=culateService.culateCJLC(list, "抽减");
+	        double ssgl_qt=culateService.culateCJLC(list, "其他");
+	        s.setQtlc(Arith.add(Arith.add(ssgl_pc, ssgl_by),Arith.add(ssgl_cj, ssgl_qt)));
+	        s.setLjlc(ljgl);
+	        
+	        s.setJhbcq(culateService.culateJhbc(list,""));
+	        s.setJhbcz(culateService.culateJhbc(list, "zgf"));
+	        s.setJhbcw(culateService.culateJhbc(list, "wgf"));
+	        s.setSjbcq(culateService.culateSjbc(lists,""));
+	        s.setSjbcz(culateService.culateSjbc(lists,"zgf"));
+	        s.setSjbcw(culateService.culateSjbc(lists,"wgf"));
+	        s.setLjbcq(culateService.culateLjbc(lists,""));
+	        s.setLjbcz(culateService.culateLjbc(lists,"zgf"));
+	        s.setLjbcw(culateService.culateLjbc(lists,"wgf"));
+	        s.setFzbcq(culateService.culateFzbc(lists, ""));
+	        s.setFzbcz(culateService.culateFzbc(lists, "zgf"));
+	        s.setFzbcw(culateService.culateFzbc(lists, "wgf"));
+	        s.setDtbcq(0);
+	        s.setDtbcz(0);
+	        s.setDtbcw(0);
+	        if(t==null){
+		        Map<String, Object> m_=culateService.culateDjg(lists, list.get(0).getXlBm());
+		        if(m_.containsKey("djgcsq") && m_.get("djgcsq")!=null)
+		        	s.setDjgq(Integer.valueOf(m_.get("djgcsq").toString()));
+		        else
+		        	s.setDjgq(0);
+		        if(m_.containsKey("djgcsz") && m_.get("djgcsz")!=null)
+		        	s.setDjgz(Integer.valueOf(m_.get("djgcsz").toString()));
+		        else
+		        	s.setDjgz(0);
+		        if(m_.containsKey("djgcsw") && m_.get("djgcsw")!=null)
+		        	s.setDjgw(Integer.valueOf(m_.get("djgcsw").toString()));
+		        else
+		        	s.setDjgw(0);
+		        if(m_.containsKey("djgsj") && m_.get("djgsj")!=null)
+		        	s.setDjgsj(Integer.valueOf(m_.get("djgsj").toString()));
+		        else
+		        	s.setDjgsj(0);
+	        }else{
+	        	s.setDjgq(t.getDjgAll());
+	        	s.setDjgz(t.getDjgZgf());
+	        	s.setDjgw(t.getDjgWgf());
+	        	s.setDjgsj(t.getDjgTime());
+	        }
+    	}
+        return s;
+    }
+    
+    class AccountXlbm implements Comparator<Map<String, Object>>{
+   	 @Override
+   		public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+   			// TODO Auto-generated method stub
+//   		 PinyinHelper.convertToPinyinString(ppy.getName(),
+//   		 "" , PinyinFormat.WITHOUT_TONE)
+   			return  o1.get("xlNamePy").toString().compareTo(
+   					o2.get("xlNamePy").toString());
+   		}
+	}
+
+    class AccountXlbmStr implements Comparator<String>{
+   	 @Override
+   		public int compare(String o1, String o2) {
+   			// TODO Auto-generated method stub
+   			return  o1.compareTo(o2);
+   		}
+	}
+
+	@Override
+	public List<CalcStatistics> calcStatisticsDaily(String gsdm, String fgsdm,
+			String line, String date, String date2, String xlName, String type,String nature) {
+		// TODO Auto-generated method stub
+		List<CalcStatistics> listAll = new ArrayList<CalcStatistics>();
+		if(line.length() > 0){
+			listAll = calcStatisticsRepository.selectByDateAndLineTj2(line, date, date2);
+		} else {
+			listAll = calcStatisticsRepository.selectByDateAndLineTj(line, date, date2, gsdm, fgsdm);
+		}
+		Map<String, Boolean> lineMap=lineService.lineNature();
+		List<CalcStatistics> list = new ArrayList<CalcStatistics>();
+		if(nature.equals("0")){
+			list=listAll;
+		}else{
+			for (int i = 0; i < listAll.size(); i++) {
+				CalcStatistics c=listAll.get(i);
+				if(nature.equals("1")){
+					if(lineMap.get(c.getXl())){
+						list.add(c);
+					}
+				}else{
+					if(!lineMap.get(c.getXl())){
+						list.add(c);
+					}
+				}
+			}
+		}
+		List<CalcStatistics> resList = new ArrayList<CalcStatistics>();
+		Map<String, List<CalcStatistics>> keyMap = new HashMap<String, List<CalcStatistics>>();
+		List<String> keyList = new ArrayList<String>();
+		
+		for(CalcStatistics s : list){
+    		try {
+//				String key = PinyinHelper.convertToPinyinString(s.getXl(), "" , PinyinFormat.WITHOUT_TONE);
+				String key =s.getFgsdm()+s.getXl();
+//				if(line.equals("")){
+//					key =s.getFgsdm()+s.getXl();
+//				}else{
+//					key =s.getXl();
+//				}
+    			if(!keyMap.containsKey(key)){
+					keyMap.put(key, new ArrayList<CalcStatistics>());
+					keyList.add(key);
+				}
+				keyMap.get(key).add(s);
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		Collections.sort(keyList, new AccountXlbmStr());
+		
+		for(String key : keyList){
+			if(keyMap.get(key).size() > 0){
+				CalcStatistics s = keyMap.get(key).get(0);
+				if(keyMap.get(key).size() > 1)
+					for(int i = 1; i < keyMap.get(key).size(); i++){
+						CalcStatistics s_ = keyMap.get(key).get(i);
+						s = addStatistics(s, s_);
+					}
+//				if(line.equals("")){
+					s.setFgsName(BasicData.businessFgsCodeNameMap.get(s.getFgsdm()+"_"+s.getGsdm()));
+				/*}else{
+					List<Line> l=lineRepository.findLineByCode(line);
+		        	if(l.size()>0)
+		        		s.setFgsName(BasicData.businessFgsCodeNameMap.get(l.get(0).getBrancheCompany()+"_"+l.get(0).getCompany()));
+				}*/
+				resList.add(s);
+			}
+		}
+		
+		if(resList.size() > 0){
+			CalcStatistics temp = new CalcStatistics();
+			temp.setXlName("合计");
+			temp.setFgsName("");
+			for(CalcStatistics s : resList){
+				temp = addStatistics(temp, s);
+			}
+			resList.add(temp);
+		}
+		
+		List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
+		for(CalcStatistics c : resList){
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("fgsName", c.getFgsName());
+			m.put("xlName", c.getXlName());
+			m.put("jhzlc", c.getJhzlc());
+			m.put("jhlc", c.getJhyylc());
+			m.put("jcclc", c.getJhkslc());
+			m.put("sjzgl", c.getSjzlc());
+			m.put("sjgl", c.getSjyylc());
+			m.put("sjksgl", c.getSjkslc());
+			m.put("ssgl", c.getSslc());
+			m.put("ssbc", c.getSsbc());
+			m.put("ssgl_lz", c.getLzlc());
+			m.put("ssgl_dm", c.getDmlc());
+			m.put("ssgl_gz", c.getGzlc());
+			m.put("ssgl_jf", c.getJflc());
+			m.put("ssgl_zs", c.getZslc());
+			m.put("ssgl_qr", c.getQrlc());
+			m.put("ssgl_qc", c.getQclc());
+			m.put("ssgl_kx", c.getKxlc());
+			m.put("ssgl_qh", c.getQhlc());
+			m.put("ssgl_yw", c.getYwlc());
+			m.put("ssgl_other", c.getQtlc());
+			m.put("ljgl", c.getLjlc());
+			m.put("ljks", c.getLjkslc());
+			m.put("jhbc", c.getJhbcq());
+			m.put("jhbc_m", c.getJhbcz());
+			m.put("jhbc_a", c.getJhbcw());
+			m.put("sjbc", c.getSjbcq());
+			m.put("sjbc_m", c.getSjbcz());
+			m.put("sjbc_a", c.getSjbcw());
+			m.put("ljbc", c.getLjbcq());
+			m.put("ljbc_m", c.getLjbcz());
+			m.put("ljbc_a", c.getLjbcw());
+			m.put("fzbc", c.getFzbcq());
+			m.put("fzbc_m", c.getFzbcz());
+			m.put("fzbc_a", c.getFzbcw());
+			m.put("dtbc", c.getDtbcq());
+			m.put("dtbc_m", c.getDtbcz());
+			m.put("dtbc_a", c.getDtbcw());
+			m.put("djg", c.getDjgq());
+			m.put("djg_m", c.getDjgz());
+			m.put("djg_a", c.getDjgw());
+			m.put("djg_time", c.getDjgsj());
+			mapList.add(m);
+		}
+		
+		if (type != null && type.length() != 0 && type.equals("export")) {
+            SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+                    sdfSimple = new SimpleDateFormat("yyyyMMdd");
+            List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+            Map<String, Object> m = new HashMap<String, Object>();
+            m.put("date", date+"至"+date2);
+            ReportUtils ee = new ReportUtils();
+            try {
+            	String dateTime = "";
+            	if(date.equals(date2)){
+            		dateTime = sdfSimple.format(sdfMonth.parse(date));
+            	} else {
+            		dateTime = sdfSimple.format(sdfMonth.parse(date))
+            				+"-"+sdfSimple.format(sdfMonth.parse(date2));
+            	}
+                listI.add(mapList.iterator());
+                String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+                ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_.xls",
+                        path + "export/" + dateTime + "-" + xlName + "-统计日报.xls");
+            } catch (Exception e) {
+                // TODO: handle exception
+                //e.printStackTrace();
+            	logger.info("" , e);
+            }
+        }
+		
+		return resList;
+	}
+	
+	@Override
+	public List<Map<String, Object>> calcStatisticsDaily2(String gsdm, String fgsdm,
+			String line, String date, String date2, String xlName, String type,String nature) {
+		// TODO Auto-generated method stub
+		SimpleDateFormat dft = new SimpleDateFormat("yyyy-MM-dd");
+		Date beginDate = new Date();
+		Calendar calendar = Calendar.getInstance();
+		calendar.setTime(beginDate);
+		calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 4);
+		String d2 = dft.format(calendar.getTime());  //当前日期前4天
+		calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) +1);
+		String d3= dft.format(calendar.getTime()); //当前日期前3天
+		
+		String d1="";
+		String d4="";
+		try {
+			long t3 = dft.parse(d2).getTime();  
+			long t1=dft.parse(date).getTime();
+			long t2=dft.parse(date2).getTime();
+			
+			if(t1<=t3 && t2>t3){
+				//所选日期区间区间既有实时数据也有历史数据
+				d1=date;
+				d4=date2;
+			} else if (t1>t3&&t2>t3){
+				d1=date;
+				d2=date2;
+				d3=date;
+				d4=date2;
+			}else{
+				d1=date;
+				d2=date2;
+				//实时数据无需
+				d3="";
+				d4="";
+			}
+		} catch (ParseException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+
+		
+		List<CalcStatistics> listAll = new ArrayList<CalcStatistics>();
+		if(line.length() > 0){
+			listAll = calcStatisticsRepository.selectByDateAndLineTj2(line, d1, d2);
+		} else {
+			listAll = calcStatisticsRepository.selectByDateAndLineTj(line, d1, d2, gsdm, fgsdm);
+		}
+		Map<String, Boolean> lineMap=lineService.lineNature();
+		List<CalcStatistics> list=new ArrayList<CalcStatistics>();
+
+		for (int i = 0; i < listAll.size(); i++) {
+			CalcStatistics s=listAll.get(i);
+			if(nature.equals("0")){
+				list.add(s);
+			}else if(nature.equals("1")){
+				if(lineMap.containsKey(s.getXl()) && lineMap.get(s.getXl())){
+					list.add(s);
+				}
+			}else{
+				if(lineMap.containsKey(s.getXl()) && !lineMap.get(s.getXl())){
+					list.add(s);
+				}
+			}
+		}
+		List<CalcStatistics> resList = new ArrayList<CalcStatistics>();
+		Map<String, List<CalcStatistics>> keyMap = new HashMap<String, List<CalcStatistics>>();
+		List<String> keyList = new ArrayList<String>();
+		
+		for(CalcStatistics s : list){
+    		try {
+//				String key = PinyinHelper.convertToPinyinString(s.getXlName(), "" , PinyinFormat.WITHOUT_TONE);
+    			String key =s.getFgsdm()+s.getXl();
+//    			if(line.equals("")){
+//    				key =s.getFgsdm()+s.getXl();
+//				}else{
+//					 key =s.getXl();
+//				}
+    			if(!keyMap.containsKey(key)){
+					keyMap.put(key, new ArrayList<CalcStatistics>());
+					keyList.add(key);
+				}
+				keyMap.get(key).add(s);
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		Collections.sort(keyList, new AccountXlbmStr());
+		
+		for(String key : keyList){
+			if(keyMap.get(key).size() > 0){
+				CalcStatistics s = keyMap.get(key).get(0);
+				if(keyMap.get(key).size() > 1)
+					for(int i = 1; i < keyMap.get(key).size(); i++){
+						CalcStatistics s_ = keyMap.get(key).get(i);
+						s = addStatistics(s, s_);
+					}
+				resList.add(s);
+			}
+		}
+		
+		if(resList.size() > 0){
+			CalcStatistics temp = new CalcStatistics();
+			temp.setXlName("合计");
+			temp.setXl("hj");
+			for(CalcStatistics s : resList){
+				temp = addStatistics(temp, s);
+			}
+			resList.add(temp);
+		}
+		//统计数据
+		List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
+		for(CalcStatistics c : resList){
+			Map<String, Object> m = new HashMap<String, Object>();
+			if(c.getXl().equals("hj")){
+				m.put("fgsName", "");
+				m.put("fgsBm", "");
+			}else{
+				m.put("fgsName", BasicData.businessFgsCodeNameMap.get(c.getFgsdm()+"_"+c.getGsdm()));
+				m.put("fgsBm", c.getFgsdm());
+			}
+			m.put("xlBm", c.getXl());
+			m.put("xlName", c.getXlName());
+			m.put("jhzlc", c.getJhzlc());
+			m.put("jhlc", c.getJhyylc());
+			m.put("jcclc", c.getJhkslc());
+			m.put("sjzgl", c.getSjzlc());
+			m.put("sjgl", c.getSjyylc());
+			m.put("sjksgl", c.getSjkslc());
+			m.put("ssgl", c.getSslc());
+			m.put("ssbc", c.getSsbc());
+			m.put("ssgl_lz", c.getLzlc());
+			m.put("ssgl_dm", c.getDmlc());
+			m.put("ssgl_gz", c.getGzlc());
+			m.put("ssgl_jf", c.getJflc());
+			m.put("ssgl_zs", c.getZslc());
+			m.put("ssgl_qr", c.getQrlc());
+			m.put("ssgl_qc", c.getQclc());
+			m.put("ssgl_kx", c.getKxlc());
+			m.put("ssgl_qh", c.getQhlc());
+			m.put("ssgl_yw", c.getYwlc());
+			m.put("ssgl_other", c.getQtlc());
+			m.put("ljgl", c.getLjlc());
+			m.put("ljks", c.getLjkslc());
+			m.put("jhbc", c.getJhbcq());
+			m.put("jhbc_m", c.getJhbcz());
+			m.put("jhbc_a", c.getJhbcw());
+			m.put("sjbc", c.getSjbcq());
+			m.put("sjbc_m", c.getSjbcz());
+			m.put("sjbc_a", c.getSjbcw());
+			m.put("ljbc", c.getLjbcq());
+			m.put("ljbc_m", c.getLjbcz());
+			m.put("ljbc_a", c.getLjbcw());
+			m.put("fzbc", c.getFzbcq());
+			m.put("fzbc_m", c.getFzbcz());
+			m.put("fzbc_a", c.getFzbcw());
+			m.put("dtbc", c.getDtbcq());
+			m.put("dtbc_m", c.getDtbcz());
+			m.put("dtbc_a", c.getDtbcw());
+			m.put("djg", c.getDjgq());
+			m.put("djg_m", c.getDjgz());
+			m.put("djg_a", c.getDjgw());
+			m.put("djg_time", c.getDjgsj());
+			double jl = Arith.sub(Arith.add(m.get("jhlc"), m.get("ljgl")), m.get("ssgl"));
+            if (jl == Double.parseDouble(m.get("sjgl").toString())) {
+            	m.put("zt", 0);
+            } else {
+            	m.put("zt", 1);
+            }
+			mapList.add(m);
+		}
+
+		//实时数据
+		List<Map<String, Object>>  tjlist=new ArrayList<Map<String, Object>>();
+		if(!d4.equals("")){
+			 tjlist= scheduleRealInfoService.statisticsDailyTjHb(gsdm, fgsdm, line, d3, d4, xlName, type,nature);
+		}
+		List<Map<String, Object>> mapListHj = new ArrayList<Map<String, Object>>();
+//		List<String> lineList=new ArrayList<String>();
+		Map<String, Object> kMap=new HashMap<String,Object>();
+		mapList.addAll(tjlist);
+		for (int i = 0; i < mapList.size(); i++) {
+			Map<String, Object> m =mapList.get(i);
+//			if(line.equals("")){
+				if(kMap.get(m.get("fgsBm")+"_"+m.get("xlBm").toString())==null){
+					kMap.put(m.get("fgsBm")+"_"+m.get("xlBm").toString(), m.get("fgsBm")+"_"+m.get("xlBm").toString());
+				}
+//			}else{
+//				if(kMap.get(m.get("xlBm").toString())==null){
+//					kMap.put(m.get("xlBm").toString(), m.get("xlBm").toString());
+//				}
+//			}
+			
+		}
+		 for (Object xlbm : kMap.keySet()) {  
+				Map<String, Object> hjMap = new HashMap<String, Object>();
+				for (int i = 0; i < mapList.size(); i++) {
+					Map<String, Object> lsMap=mapList.get(i);
+					String xlbm_="";
+//					if(line.equals("")){
+						xlbm_=lsMap.get("fgsBm").toString()+"_"+lsMap.get("xlBm").toString();
+//					}else{
+//						xlbm_=lsMap.get("xlBm").toString();
+//					}
+					if (xlbm_.equals(xlbm)) {
+						if(hjMap.get("xlBm")==null){
+							hjMap.put("xlBm", lsMap.get("xlBm"));
+							hjMap.put("xlName", lsMap.get("xlName"));
+							hjMap.put("fgsName", lsMap.get("fgsName"));
+							 try {
+								 if(lsMap.get("xlBm").toString().equals("hj")){
+									 hjMap.put("xlNamePy", "zzzzz");
+								 }else{
+									 hjMap.put("xlNamePy", PinyinHelper.convertToPinyinString(lsMap.get("fgsBm").toString()+lsMap.get("xlName").toString(), "", PinyinFormat.WITHOUT_TONE));
+								 }
+					         } catch (PinyinException e) {
+					                // TODO Auto-generated catch block
+					                e.printStackTrace();
+					         }
+						}
+						hjMap.put("jhzlc", Arith.add(lsMap.get("jhzlc"), hjMap.get("jhzlc")==null?"0":hjMap.get("jhzlc")));
+						hjMap.put("jhlc", Arith.add(lsMap.get("jhlc"), hjMap.get("jhlc")==null?"0":hjMap.get("jhlc")));
+						hjMap.put("jcclc",Arith.add(lsMap.get("jcclc"), hjMap.get("jcclc")==null?"0":hjMap.get("jcclc")));
+						hjMap.put("sjzgl",Arith.add(lsMap.get("sjzgl"), hjMap.get("sjzgl")==null?"0": hjMap.get("sjzgl")));
+						hjMap.put("sjgl", Arith.add(lsMap.get("sjgl"), hjMap.get("sjgl")==null?"0":hjMap.get("sjgl")));
+						hjMap.put("sjksgl", Arith.add(lsMap.get("sjksgl"), hjMap.get("sjksgl")==null?"0":hjMap.get("sjksgl")));
+						hjMap.put("ssgl", Arith.add(lsMap.get("ssgl"), hjMap.get("ssgl")==null?"0":hjMap.get("ssgl")));
+						hjMap.put("ssbc", Integer.parseInt(lsMap.get("ssbc").toString())+Integer.parseInt(hjMap.get("ssbc")==null?"0":hjMap.get("ssbc").toString()));
+						hjMap.put("ssgl_lz", Arith.add(lsMap.get("ssgl_lz"), hjMap.get("ssgl_lz")==null?"0":hjMap.get("ssgl_lz")));
+						hjMap.put("ssgl_dm", Arith.add(lsMap.get("ssgl_dm"), hjMap.get("ssgl_dm")==null?"0":hjMap.get("ssgl_dm")));
+						hjMap.put("ssgl_gz", Arith.add(lsMap.get("ssgl_gz"), hjMap.get("ssgl_gz")==null?"0":hjMap.get("ssgl_gz")));
+						hjMap.put("ssgl_jf", Arith.add(lsMap.get("ssgl_jf"), hjMap.get("ssgl_jf")==null?"0":hjMap.get("ssgl_jf")));
+						hjMap.put("ssgl_zs", Arith.add(lsMap.get("ssgl_zs"), hjMap.get("ssgl_zs")==null?"0":hjMap.get("ssgl_zs")));
+						hjMap.put("ssgl_qr", Arith.add(lsMap.get("ssgl_qr"), hjMap.get("ssgl_qr")==null?"0":hjMap.get("ssgl_qr")));
+						hjMap.put("ssgl_qc", Arith.add(lsMap.get("ssgl_qc"), hjMap.get("ssgl_qc")==null?"0":hjMap.get("ssgl_qc")));
+						hjMap.put("ssgl_kx", Arith.add(lsMap.get("ssgl_kx"), hjMap.get("ssgl_kx")==null?"0":hjMap.get("ssgl_kx")));
+						hjMap.put("ssgl_qh", Arith.add(lsMap.get("ssgl_qh"), hjMap.get("ssgl_qh")==null?"0":hjMap.get("ssgl_qh")));
+						hjMap.put("ssgl_yw", Arith.add(lsMap.get("ssgl_yw"), hjMap.get("ssgl_yw")==null?"0":hjMap.get("ssgl_yw")));
+						hjMap.put("ssgl_other", Arith.add(lsMap.get("ssgl_other"), hjMap.get("ssgl_other")==null?"0":hjMap.get("ssgl_other")));
+						hjMap.put("ljgl", Arith.add(lsMap.get("ljgl"), hjMap.get("ljgl")==null?"0":hjMap.get("ljgl")));
+						hjMap.put("ljks", Arith.add(lsMap.get("ljks"), hjMap.get("ljks")==null?"0":hjMap.get("ljks")));
+						hjMap.put("jhbc", Integer.parseInt(lsMap.get("jhbc").toString())+ Integer.parseInt(hjMap.get("jhbc")==null?"0":hjMap.get("jhbc").toString()));
+						hjMap.put("jhbc_m", Integer.parseInt(lsMap.get("jhbc_m").toString())+Integer.parseInt(hjMap.get("jhbc_m")==null?"0":hjMap.get("jhbc_m").toString()));
+						hjMap.put("jhbc_a", Integer.parseInt(lsMap.get("jhbc_a").toString())+ Integer.parseInt(hjMap.get("jhbc_a")==null?"0":hjMap.get("jhbc_a").toString()));
+						hjMap.put("sjbc", Integer.parseInt(lsMap.get("sjbc").toString())+ Integer.parseInt(hjMap.get("sjbc")==null?"0":hjMap.get("sjbc").toString()));
+						hjMap.put("sjbc_m",Integer.parseInt(lsMap.get("sjbc_m").toString())+ Integer.parseInt(hjMap.get("sjbc_m")==null?"0":hjMap.get("sjbc_m").toString()));
+						hjMap.put("sjbc_a", Integer.parseInt(lsMap.get("sjbc_a").toString())+ Integer.parseInt(hjMap.get("sjbc_a")==null?"0":hjMap.get("sjbc_a").toString()));
+						hjMap.put("ljbc", Integer.parseInt(lsMap.get("ljbc").toString())+ Integer.parseInt(hjMap.get("ljbc")==null?"0":hjMap.get("ljbc").toString()));
+						hjMap.put("ljbc_m", Integer.parseInt(lsMap.get("ljbc_m").toString())+ Integer.parseInt(hjMap.get("ljbc_m")==null?"0":hjMap.get("ljbc_m").toString()));
+						hjMap.put("ljbc_a", Integer.parseInt(lsMap.get("ljbc_a").toString())+Integer.parseInt(hjMap.get("ljbc_a")==null?"0":hjMap.get("ljbc_a").toString()));
+						hjMap.put("fzbc", Integer.parseInt(lsMap.get("fzbc").toString())+ Integer.parseInt(hjMap.get("fzbc")==null?"0":hjMap.get("fzbc").toString()));
+						hjMap.put("fzbc_m",Integer.parseInt(lsMap.get("fzbc_m").toString())+ Integer.parseInt(hjMap.get("fzbc_m")==null?"0":hjMap.get("fzbc_m").toString()));
+						hjMap.put("fzbc_a",Integer.parseInt(lsMap.get("fzbc_a").toString())+ Integer.parseInt(hjMap.get("fzbc_a")==null?"0":hjMap.get("fzbc_a").toString()));
+						hjMap.put("dtbc", Integer.parseInt(lsMap.get("dtbc").toString())+ Integer.parseInt(hjMap.get("dtbc")==null?"0":hjMap.get("dtbc").toString()));
+						hjMap.put("dtbc_m", Integer.parseInt(lsMap.get("dtbc_m").toString())+ Integer.parseInt(hjMap.get("dtbc_m")==null?"0":hjMap.get("dtbc_m").toString()));
+						hjMap.put("dtbc_a", Integer.parseInt(lsMap.get("dtbc_a").toString())+ Integer.parseInt(hjMap.get("dtbc_a")==null?"0":hjMap.get("dtbc_a").toString()));
+						hjMap.put("djg", Integer.parseInt(lsMap.get("djg").toString())+ Integer.parseInt(hjMap.get("djg")==null?"0":hjMap.get("djg").toString()));
+						hjMap.put("djg_m", Integer.parseInt(lsMap.get("djg_m").toString())+ Integer.parseInt(hjMap.get("djg_m")==null?"0":hjMap.get("djg_m").toString()));
+						hjMap.put("djg_a", Integer.parseInt(lsMap.get("djg_a").toString())+ Integer.parseInt(hjMap.get("djg_a")==null?"0":hjMap.get("djg_a").toString()));
+						if(hjMap.get("djg_time")==null){
+							hjMap.put("djg_time", lsMap.get("djg_time"));
+						}else{
+							if(Arith.add(lsMap.get("djg_time"),0)>Arith.add(hjMap.get("djg_time"), 0)){
+								hjMap.put("djg_time", lsMap.get("djg_time"));
+							}else{
+								hjMap.put("djg_time",hjMap.get("djg_time"));
+							}
+						}
+						double jl = Arith.sub(Arith.add(hjMap.get("jhlc"), hjMap.get("ljgl")), hjMap.get("ssgl"));
+			            if (jl == Double.parseDouble(hjMap.get("sjgl").toString())) {
+			            	hjMap.put("zt", 0);
+			            } else {
+			            	hjMap.put("zt", 1);
+			            }
+					}
+				}
+				mapListHj.add(hjMap);
+		}  
+		
+	        Collections.sort(mapListHj, new AccountXlbmByping());
+
+		/*if(!line.equals("")){
+			for (int i = 0; i < mapListHj.size(); i++) {
+				if(mapListHj.get(i).get("xlBm").equals(line)){
+		        	List<Line> l=lineRepository.findLineByCode(line);
+		        	if(l.size()>0)
+		        		mapListHj.get(i).put("fgsName", BasicData.businessFgsCodeNameMap.get(l.get(0).getBrancheCompany()+"_"+l.get(0).getCompany()));
+				}
+			}
+		}*/
+		if (type != null && type.length() != 0 && type.equals("export")) {
+            SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+                    sdfSimple = new SimpleDateFormat("yyyyMMdd");
+            List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+            Map<String, Object> m = new HashMap<String, Object>();
+            m.put("date", date+"至"+date2);
+            ReportUtils ee = new ReportUtils();
+            try {
+            	String dateTime = "";
+            	if(date.equals(date2)){
+            		dateTime = sdfSimple.format(sdfMonth.parse(date));
+            	} else {
+            		dateTime = sdfSimple.format(sdfMonth.parse(date))
+            				+"-"+sdfSimple.format(sdfMonth.parse(date2));
+            	}
+                listI.add(mapListHj.iterator());
+                String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+                ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_2.xls",
+                        path + "export/" + dateTime + "-" + xlName + "-统计日报.xls");
+            } catch (Exception e) {
+                // TODO: handle exception
+                //e.printStackTrace();
+            	logger.info("" , e);
+            }
+        }
+		
+		return mapListHj;
+	}
+    
+	public CalcStatistics addStatistics(CalcStatistics s, CalcStatistics s_){
+		s.setJhzlc(Arith.add(s.getJhzlc()!=null?s.getJhzlc():0, s_.getJhzlc()));
+		s.setJhyylc(Arith.add(s.getJhyylc()!=null?s.getJhyylc():0, s_.getJhyylc()));
+		s.setJhkslc(Arith.add(s.getJhkslc()!=null?s.getJhkslc():0, s_.getJhkslc()));
+		s.setSjzlc(Arith.add(s.getSjzlc()!=null?s.getSjzlc():0, s_.getSjzlc()));
+		s.setSjyylc(Arith.add(s.getSjyylc()!=null?s.getSjyylc():0, s_.getSjyylc()));
+		s.setSjkslc(Arith.add(s.getSjkslc()!=null?s.getSjkslc():0, s_.getSjkslc()));
+		s.setSslc(Arith.add(s.getSslc()!=null?s.getSslc():0, s_.getSslc()));
+		s.setSsbc(s.getSsbc() + s_.getSsbc());
+		s.setLzlc(Arith.add(s.getLzlc()!=null?s.getLzlc():0, s_.getLzlc()));
+		s.setDmlc(Arith.add(s.getDmlc()!=null?s.getDmlc():0, s_.getDmlc()));
+		s.setGzlc(Arith.add(s.getGzlc()!=null?s.getGzlc():0, s_.getGzlc()));
+		s.setJflc(Arith.add(s.getJflc()!=null?s.getJflc():0, s_.getJflc()));
+		s.setZslc(Arith.add(s.getZslc()!=null?s.getZslc():0, s_.getZslc()));
+		s.setQrlc(Arith.add(s.getQrlc()!=null?s.getQrlc():0, s_.getQrlc()));
+		s.setQclc(Arith.add(s.getQclc()!=null?s.getQclc():0, s_.getQclc()));
+		s.setKxlc(Arith.add(s.getKxlc()!=null?s.getKxlc():0, s_.getKxlc()));
+		s.setQhlc(Arith.add(s.getQhlc()!=null?s.getQhlc():0, s_.getQhlc()));
+		s.setYwlc(Arith.add(s.getYwlc()!=null?s.getYwlc():0, s_.getYwlc()));
+		s.setQtlc(Arith.add(s.getQtlc()!=null?s.getQtlc():0, s_.getQtlc()));
+		s.setLjlc(Arith.add(s.getLjlc()!=null?s.getLjlc():0, s_.getLjlc()));
+		if(s_.getLjkslc() == null){
+			s_.setLjkslc(0d);
+		}
+		s.setLjkslc(Arith.add(s.getLjkslc()!=null?s.getLjkslc():0, s_.getLjkslc()));
+		s.setJhbcq(s.getJhbcq() + s_.getJhbcq());
+		s.setJhbcz(s.getJhbcz() + s_.getJhbcz());
+		s.setJhbcw(s.getJhbcw() + s_.getJhbcw());
+		s.setSjbcq(s.getSjbcq() + s_.getSjbcq());
+		s.setSjbcz(s.getSjbcz() + s_.getSjbcz());
+		s.setSjbcw(s.getSjbcw() + s_.getSjbcw());
+		s.setLjbcq(s.getLjbcq() + s_.getLjbcq());
+		s.setLjbcz(s.getLjbcz() + s_.getLjbcz());
+		s.setLjbcw(s.getLjbcw() + s_.getLjbcw());
+		s.setFzbcq(s.getFzbcq() + s_.getFzbcq());
+		s.setFzbcz(s.getFzbcz() + s_.getFzbcz());
+		s.setFzbcw(s.getFzbcw() + s_.getFzbcw());
+		s.setDtbcq(s.getDtbcq() + s_.getDtbcq());
+		s.setDtbcz(s.getDtbcz() + s_.getDtbcz());
+		s.setDtbcw(s.getDtbcw() + s_.getDtbcw());
+		s.setDjgq(s.getDjgq() + s_.getDjgq());
+		s.setDjgz(s.getDjgz() + s_.getDjgz());
+		s.setDjgw(s.getDjgw() + s_.getDjgw());
+		s.setDjgsj(s.getDjgsj()>s_.getDjgsj()?s.getDjgsj():s_.getDjgsj());
+		return s;
+	}
+
+	@Transactional
+	@Override
+	public Map<String, Object> calcLineMileage(String date, String line) {
+		Map<String, Object> resMap = new HashMap<String, Object>();
+		
+		if(date.length() == 0){
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			Date d = new Date();
+			d.setTime(d.getTime() - 4 * 1000 * 60 * 60 * 24);
+			date = sdf.format(d);
+		}
+		
+		resMap.put("date", date);
+		resMap.put("line", line);
+		if(date == null || date.trim().length() == 0){
+			resMap.put("status", ResponseCode.ERROR);
+			resMap.put("remark", "日期不正确或为空");
+			return resMap;
+		} else {
+			date = date.trim();
+		}
+		if(line == null){
+			line = "";
+		} else {
+			line = line.trim();
+		}
+		
+		Map<String, Object> map = new HashMap<String, Object>();
+		List<CalcLineMileage> list = new ArrayList<CalcLineMileage>();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		Date dateTime = new Date();
+		
+		try {
+			
+			String gsSql="select gs_bm, fgs_bm from bsth_c_s_sp_info_real where schedule_date_str = '"+date+"'";
+	        if(line.trim().length() > 0)
+	        	gsSql += " and xl_bm = '"+line+"'";
+			gsSql += " group by gs_bm, fgs_bm";
+			List<Map<String, String>> gsList=jdbcTemplate.query(gsSql, new RowMapper<Map<String, String>>() {
+				@Override
+				public Map<String, String> mapRow(ResultSet arg0, int arg1) throws SQLException {
+					Map<String, String> m = new HashMap<String, String>();
+					m.put("gsdm", arg0.getString("gs_bm"));
+					m.put("fgsdm", arg0.getString("fgs_bm"));
+					return m;
+			}});
+			
+			map.put("date", date);
+			map.put("date2", date);
+			for(Map<String, String> tempMap : gsList){
+				map.put("gsdm", tempMap.get("gsdm").toString());
+				map.put("fgsdm", tempMap.get("fgsdm").toString());
+				List<Map<String, Object>> countByList = reportService.countByList(map);
+				for(Map<String, Object> m : countByList){
+					if(!m.containsKey("xlName") || m.get("xlName")==null
+							|| m.get("xlName").toString().equals("合计"))
+						continue;
+					CalcLineMileage c = new CalcLineMileage();
+					c.setDate(sdf.parse(date));
+					c.setDateStr(date);
+					c.setGsdm(map.get("gsdm").toString());
+					c.setGsName(m.get("gs").toString());
+					c.setFgsdm(map.get("fgsdm").toString());
+					c.setFgsName(m.get("fgs").toString());
+					c.setXl(m.get("line").toString());
+					c.setXlName(m.get("xlName").toString());
+					c.setJhzlc(Double.valueOf(m.get("jhzlc").toString()));
+					c.setJhlc(Double.valueOf(m.get("jhlc").toString()));
+					c.setJcclc(Double.valueOf(m.get("jcclc").toString()));
+					c.setSjzgl(Double.valueOf(m.get("sjzgl").toString()));
+					c.setJhnlc(Double.valueOf(m.get("jhnlc").toString()));
+					c.setJhwlc(Double.valueOf(m.get("jhwlc").toString()));
+					c.setJhnjcclc(Double.valueOf(m.get("jhnjcclc").toString()));
+					c.setJhwjcclc(Double.valueOf(m.get("jhwjcclc").toString()));
+					c.setJhwjcclcz(Double.valueOf(m.get("jhwjcclc_z").toString()));
+					c.setZrwjcclc(Double.valueOf(m.get("zrwjcclc").toString()));
+					c.setZrwjcclc1(Double.valueOf(m.get("zrwjcclc1").toString()));
+					c.setZrwjcclc2(Double.valueOf(m.get("zrwjcclc2").toString()));
+					c.setZrwjcclcqt(Double.valueOf(m.get("zrwjcclcqt").toString()));
+					c.setKfks(Double.valueOf(m.get("kfks").toString()));
+					c.setLbss(Double.valueOf(m.get("lbss").toString()));
+					c.setSsglLz(Double.valueOf(m.get("ssgl_lz").toString()));
+					c.setSsglDm(Double.valueOf(m.get("ssgl_dm").toString()));
+					c.setSsglGz(Double.valueOf(m.get("ssgl_gz").toString()));
+					c.setSsglJf(Double.valueOf(m.get("ssgl_jf").toString()));
+					c.setSsglZs(Double.valueOf(m.get("ssgl_zs").toString()));
+					c.setSsglQr(Double.valueOf(m.get("ssgl_qr").toString()));
+					c.setSsglQc(Double.valueOf(m.get("ssgl_qc").toString()));
+					c.setSsglKx(Double.valueOf(m.get("ssgl_kx").toString()));
+					c.setSsglQh(Double.valueOf(m.get("ssgl_qh").toString()));
+					c.setSsglYw(Double.valueOf(m.get("ssgl_yw").toString()));
+					c.setSsglOther(Double.valueOf(m.get("ssgl_other").toString()));
+					c.setLjyy(Double.valueOf(m.get("ljyy").toString()));
+					c.setLjjcc(Double.valueOf(m.get("ljjcc").toString()));
+					c.setLjkfks(Double.valueOf(m.get("ljkfks").toString()));
+					c.setCreateDate(dateTime);
+					list.add(c);
+				}
+			}
+			
+			if(line.length() > 0){
+				calcLineMileageRepository.deleteByDateAndLine(date, line);
+			} else {
+				calcLineMileageRepository.deleteByDate(date);
+			}
+			calcLineMileageRepository.saveAll(list);
+
+			resMap.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			// TODO: handle exception
+			resMap.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+			e.printStackTrace();
+		}
+		return resMap;
+	}
+
+	@Transactional
+	@Override
+	public Map<String, Object> calcBusMileage(String date, String line) {
+		Map<String, Object> resMap = new HashMap<String, Object>();
+
+		if(date.length() == 0){
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			Date d = new Date();
+			d.setTime(d.getTime() - 4 * 1000 * 60 * 60 * 24);
+			date = sdf.format(d);
+		}
+		
+		resMap.put("date", date);
+		resMap.put("line", line);
+		if(date == null || date.trim().length() == 0){
+			resMap.put("status", ResponseCode.ERROR);
+			resMap.put("remark", "日期不正确或为空");
+			return resMap;
+		} else {
+			date = date.trim();
+		}
+		if(line == null){
+			line = "";
+		} else {
+			line = line.trim();
+		}
+		
+		Map<String, Object> map = new HashMap<String, Object>();
+		Map<String, Object> xlmap = new HashMap<String, Object>();
+		List<CalcBusMileage> list = new ArrayList<CalcBusMileage>();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		Date dateTime = new Date();
+		
+		try {
+			
+			String gsSql="select gs_bm, max(gs_name) gs_name, fgs_bm from bsth_c_s_sp_info_real"
+					+ " where schedule_date_str = '"+date+"'";
+	        if(line.trim().length() > 0)
+	        	gsSql += " and xl_bm = '"+line+"'";
+			gsSql += " group by gs_bm, fgs_bm";
+			List<Map<String, String>> gsList=jdbcTemplate.query(gsSql, new RowMapper<Map<String, String>>() {
+				@Override
+				public Map<String, String> mapRow(ResultSet arg0, int arg1) throws SQLException {
+					Map<String, String> m = new HashMap<String, String>();
+					m.put("gsdm", arg0.getString("gs_bm"));
+					m.put("gsName", arg0.getString("gs_name"));
+					m.put("fgsdm", arg0.getString("fgs_bm"));
+					return m;
+			}});
+
+			List<Line> xlList = lineRepository.findAllService();
+			for(Line l : xlList){
+				xlmap.put(l.getName(), l.getLineCode());
+			}
+			
+			map.put("date", date);
+			map.put("date2", date);
+			map.put("zs", "js");
+			for(Map<String, String> tempMap : gsList){
+				map.put("gsdm", tempMap.get("gsdm").toString());
+				map.put("fgsdm", tempMap.get("fgsdm").toString());
+				List<Map<String, Object>> countByList = reportService.countByBusList(map);
+				for(Map<String, Object> m : countByList){
+					if(!m.containsKey("xlName") || m.get("xlName")==null
+							|| m.get("xlName").toString().equals("合计"))
+						continue;
+					CalcBusMileage c = new CalcBusMileage();
+					c.setDate(sdf.parse(date));
+					c.setDateStr(date);
+					c.setGsdm(map.get("gsdm").toString());
+					c.setGsName(tempMap.get("gsName").toString());
+					c.setFgsdm(map.get("fgsdm").toString());
+					c.setFgsName(m.get("fgs").toString());
+					c.setXl(xlmap.get(m.get("xlName").toString()).toString());
+					c.setXlName(m.get("xlName").toString());
+					c.setNbbm(m.get("nbbm").toString());
+					c.setjGh(m.get("jGh").toString());
+					c.setjName(m.get("jName").toString());
+					c.setsGh(m.get("sGh").toString());
+					c.setsName(m.get("sName").toString());
+					c.setZlc(Double.valueOf(m.get("zlc").toString()));
+					c.setJhnlc(Double.valueOf(m.get("jhnlc").toString()));
+					c.setJhwlc(Double.valueOf(m.get("jhwlc").toString()));
+					c.setJhnjcclc(Double.valueOf(m.get("jhnjcclc").toString()));
+					c.setJhwjcclc(Double.valueOf(m.get("jhwjcclc").toString()));
+					c.setJhwjcclcz(Double.valueOf(m.get("jhwjcclc_z").toString()));
+					c.setKfks(Double.valueOf(m.get("kfks").toString()));
+					c.setZrwjcclc(Double.valueOf(m.get("zrwjcclc").toString()));
+					c.setZrwjcclc1(Double.valueOf(m.get("zrwjcclc1").toString()));
+					c.setZrwjcclc2(Double.valueOf(m.get("zrwjcclc2").toString()));
+					c.setZrwjcclcqt(Double.valueOf(m.get("zrwjcclcqt").toString()));
+					c.setLjyy(Double.valueOf(m.get("ljyy").toString()));
+					c.setLjjcc(Double.valueOf(m.get("ljjcc").toString()));
+					if(m.containsKey("ljkfks") && m.get("ljkfks") != null){
+						c.setLjkfks(Double.valueOf(m.get("ljkfks").toString()));
+					} else {
+						c.setLjkfks(0d);
+					}
+					c.setDhl(Double.valueOf(m.get("dhl").toString()));
+					c.setCdl(Double.valueOf(m.get("cdl").toString()));
+					c.setYhl(Double.valueOf(m.get("yhl").toString()));
+					c.setJzl(Double.valueOf(m.get("jzl").toString()));
+					c.setHyl(Double.valueOf(m.get("hyl").toString()));
+					c.setJhzlc(Double.valueOf(m.get("jhzlc").toString()));
+					c.setCreateDate(dateTime);
+					list.add(c);
+				}
+			}
+			
+			if(line.length() > 0){
+				calcBusMileageRepository.deleteByDateAndLine(date, line);
+			} else {
+				calcBusMileageRepository.deleteByDate(date);
+			}
+			calcBusMileageRepository.saveAll(list);
+
+			resMap.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			// TODO: handle exception
+			resMap.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+			e.printStackTrace();
+		}
+		return resMap;
+	}
+
+	@Override
+	public List<Map<String, Object>> getLineMileage(String gsdm, String fgsdm, String line,
+			String date, String date2, String xlName, String zt, String by, String type) {
+		List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
+		List<CalcLineMileage> resList = new ArrayList<CalcLineMileage>();
+		List<CalcLineMileage> list = new ArrayList<CalcLineMileage>();
+		List<CalcLineMileage> calcs = new ArrayList<CalcLineMileage>();
+		List<String> keyList = new ArrayList<String>();
+		Map<String, List<CalcLineMileage>> keyMap = new HashMap<String, List<CalcLineMileage>>();
+		
+		if(line == null || line.trim().length() == 0){
+			list = calcLineMileageRepository.selectByDateAndLineTj(line, date, date2, gsdm, fgsdm);
+		} else {
+			list = calcLineMileageRepository.selectByDateAndLineTj2(line, date, date2);
+		}
+		
+		for(CalcLineMileage c : list){
+			String key = c.getXlName();
+			if(!keyMap.containsKey(key)){
+				keyMap.put(key, new ArrayList<CalcLineMileage>());
+				keyList.add(key);
+			}
+			keyMap.get(key).add(c);
+		}
+		
+		for(String key : keyList){
+			CalcLineMileage c1 = keyMap.get(key).get(0);
+			for(int i = 1; i < keyMap.get(key).size(); i++){
+				CalcLineMileage c2 = keyMap.get(key).get(i);
+				c1 = addLineMileage(c1, c2);
+			}
+			calcs.add(c1);
+		}
+		
+		CalcLineMileage temp = new CalcLineMileage();
+		temp.setXlName("合计");
+		for(CalcLineMileage c : calcs){
+			temp = addLineMileage(temp, c);
+			resList.add(c);
+		}
+		if(resList.size() > 0)
+			resList.add(temp);
+		
+		for(CalcLineMileage c : resList){
+			Map<String, Object> m = new HashMap<String, Object>();
+			if(c.getXlName().equals("合计")){
+				m.put("gsdm", "");
+				m.put("gs", "");
+				m.put("fgsdm", "");
+				m.put("fgs", "");
+			} else {
+				m.put("gsdm", c.getGsdm());
+				m.put("gs", c.getGsName());
+				m.put("fgsdm", c.getFgsdm());
+				m.put("fgs", c.getFgsName());
+			}
+			m.put("xlName", c.getXlName());
+			m.put("jhzlc", c.getJhzlc());
+			m.put("jhlc", c.getJhlc());
+			m.put("jcclc", c.getJcclc());
+			m.put("sjzgl", c.getSjzgl());
+			m.put("jhnlc", c.getJhnlc());
+			m.put("jhwlc", c.getJhwlc());
+			m.put("jhnjcclc", c.getJhnjcclc());
+			m.put("jhwjcclc", c.getJhwjcclc());
+			m.put("jhwjcclc_z", c.getJhwjcclcz());
+			m.put("zrwjcclc", c.getZrwjcclc());
+			m.put("zrwjcclc1", c.getZrwjcclc1());
+			m.put("zrwjcclc2", c.getZrwjcclc2());
+			m.put("zrwjcclcqt", c.getZrwjcclcqt());
+			m.put("kfks", c.getKfks());
+			m.put("lbss", c.getLbss());
+			m.put("ssgl_lz", c.getSsglLz());
+			m.put("ssgl_dm", c.getSsglDm());
+			m.put("ssgl_gz", c.getSsglGz());
+			m.put("ssgl_jf", c.getSsglJf());
+			m.put("ssgl_zs", c.getSsglZs());
+			m.put("ssgl_qr", c.getSsglQr());
+			m.put("ssgl_qc", c.getSsglQc());
+			m.put("ssgl_kx", c.getSsglKx());
+			m.put("ssgl_qh", c.getSsglQh());
+			m.put("ssgl_yw", c.getSsglYw());
+			m.put("ssgl_other", c.getSsglOther());
+			m.put("ljyy", c.getLjyy());
+			m.put("ljjcc", c.getLjjcc());
+			m.put("ljkfks", c.getLjkfks());
+			lMap.add(m);
+		}
+		
+		if(type.equals("export")){
+			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+                    sdfSimple = new SimpleDateFormat("yyyyMMdd");
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("date", date);
+			m.put("date1", date2);
+//			String by=map.get("by").toString();
+			String xls="";
+			if(by.equals("sj")){
+				xls="countByLine.xls";
+			}else{
+				xls="countByLines.xls";
+			}
+			ReportUtils ee = new ReportUtils();
+			try {
+				String dateTime = "";
+				if(date.equals(date2)){
+					dateTime = sdfSimple.format(sdfMonth.parse(date));
+				} else {
+					dateTime = sdfSimple.format(sdfMonth.parse(date))
+							+"-"+sdfSimple.format(sdfMonth.parse(date2));
+				}
+				listI.add(lMap.iterator());
+				String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+				ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls,
+						path + "export/"+dateTime+"-"+xlName+"-线路公里统计表.xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
+		
+		return lMap;
+	}
+
+	@Override
+	public List<Map<String, Object>> getBusMileage(String line, String date,
+			String date2, String xlName, String zt, String by, String type) {
+		List<CalcBusMileage> resList = new ArrayList<CalcBusMileage>();
+		List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
+		List<CalcBusMileage> list = calcBusMileageRepository.selectByDateAndLineTj2(line, date, date2);
+		
+		if(zt.equals("zbh")){
+			List<String> keyList = new ArrayList<String>();
+			Map<String, List<CalcBusMileage>> keyMap = new HashMap<>();
+			for(CalcBusMileage c : list){
+				String nbbm = c.getNbbm();
+				if(!keyMap.containsKey(nbbm)){
+					keyMap.put(nbbm, new ArrayList<CalcBusMileage>());
+					keyList.add(nbbm);
+				}
+				keyMap.get(nbbm).add(c);
+			}
+			for(String key : keyList){
+				CalcBusMileage c1 = keyMap.get(key).get(0);
+				for(int i = 1; i < keyMap.get(key).size(); i++){
+					CalcBusMileage c2 = keyMap.get(key).get(i);
+					c1.setZlc(Arith.add(c1.getZlc(), c2.getZlc()));
+					c1.setJhnlc(Arith.add(c1.getJhnlc(), c2.getJhnlc()));
+					c1.setJhwlc(Arith.add(c1.getJhwlc(), c2.getJhwlc()));
+					c1.setJhnjcclc(Arith.add(c1.getJhnjcclc(), c2.getJhnjcclc()));
+					c1.setJhwjcclc(Arith.add(c1.getJhwjcclc(), c2.getJhwjcclc()));
+					c1.setKfks(Arith.add(c1.getKfks(), c2.getKfks()));
+					c1.setZrwjcclc(Arith.add(c1.getZrwjcclc(), c2.getZrwjcclc()));
+					c1.setZrwjcclc1(Arith.add(c1.getZrwjcclc1(), c2.getZrwjcclc1()));
+					c1.setZrwjcclc2(Arith.add(c1.getZrwjcclc2(), c2.getZrwjcclc2()));
+					c1.setZrwjcclcqt(Arith.add(c1.getZrwjcclcqt(), c2.getZrwjcclcqt()));
+					c1.setLjyy(Arith.add(c1.getLjyy(), c2.getLjyy()));
+					c1.setLjjcc(Arith.add(c1.getLjjcc(), c2.getLjjcc()));
+					c1.setLjkfks(Arith.add(c1.getLjkfks(), c2.getLjkfks()));
+					c1.setDhl(Arith.add(c1.getDhl(), c2.getDhl()));
+					c1.setCdl(Arith.add(c1.getCdl(), c2.getCdl()));
+					c1.setYhl(Arith.add(c1.getYhl(), c2.getYhl()));
+					c1.setJzl(Arith.add(c1.getJzl(), c2.getJzl()));
+					c1.setHyl(Arith.add(c1.getHyl(), c2.getHyl()));
+					c1.setJhzlc(Arith.add(c1.getJhzlc(), c2.getJhzlc()));
+				}
+				resList.add(c1);
+			}
+		} else {
+			List<String> keyList = new ArrayList<String>();
+			Map<String, List<CalcBusMileage>> keyMap = new HashMap<>();
+			for(CalcBusMileage c : list){
+				String key = c.getNbbm() + c.getjGh() + c.getjName() + c.getsGh() + c.getsName();
+				if(!keyMap.containsKey(key)){
+					keyMap.put(key, new ArrayList<CalcBusMileage>());
+					keyList.add(key);
+				}
+				keyMap.get(key).add(c);
+			}
+			for(String key : keyList){
+				CalcBusMileage c1 = keyMap.get(key).get(0);
+				for(int i = 1; i < keyMap.get(key).size(); i++){
+					CalcBusMileage c2 = keyMap.get(key).get(i);
+					c1.setZlc(Arith.add(c1.getZlc(), c2.getZlc()));
+					c1.setJhnlc(Arith.add(c1.getJhnlc(), c2.getJhnlc()));
+					c1.setJhwlc(Arith.add(c1.getJhwlc(), c2.getJhwlc()));
+					c1.setJhnjcclc(Arith.add(c1.getJhnjcclc(), c2.getJhnjcclc()));
+					c1.setJhwjcclc(Arith.add(c1.getJhwjcclc(), c2.getJhwjcclc()));
+					c1.setKfks(Arith.add(c1.getKfks(), c2.getKfks()));
+					c1.setZrwjcclc(Arith.add(c1.getZrwjcclc(), c2.getZrwjcclc()));
+					c1.setZrwjcclc1(Arith.add(c1.getZrwjcclc1(), c2.getZrwjcclc1()));
+					c1.setZrwjcclc2(Arith.add(c1.getZrwjcclc2(), c2.getZrwjcclc2()));
+					c1.setZrwjcclcqt(Arith.add(c1.getZrwjcclcqt(), c2.getZrwjcclcqt()));
+					c1.setLjyy(Arith.add(c1.getLjyy(), c2.getLjyy()));
+					c1.setLjjcc(Arith.add(c1.getLjjcc(), c2.getLjjcc()));
+					c1.setLjkfks(Arith.add(c1.getLjkfks(), c2.getLjkfks()));
+					c1.setDhl(Arith.add(c1.getDhl(), c2.getDhl()));
+					c1.setCdl(Arith.add(c1.getCdl(), c2.getCdl()));
+					c1.setYhl(Arith.add(c1.getYhl(), c2.getYhl()));
+					c1.setJzl(Arith.add(c1.getJzl(), c2.getJzl()));
+					c1.setHyl(Arith.add(c1.getHyl(), c2.getHyl()));
+					c1.setJhzlc(Arith.add(c1.getJhzlc(), c2.getJhzlc()));
+				}
+				resList.add(c1);
+			}
+		}
+		
+		for(CalcBusMileage c : resList){
+			Map<String, Object> m = new HashMap<String, Object>();
+			if(date.equals(date2)){
+				m.put("rq", date);
+			} else {
+				m.put("rq", date + "至" + date2);
+			}
+			m.put("fgs", c.getFgsName());
+			m.put("xlName", c.getXlName());
+			m.put("nbbm", c.getNbbm());
+			m.put("jGh", c.getjGh());
+			m.put("jName", c.getjName());
+			m.put("sGh", c.getsGh());
+			m.put("sName", c.getsName());
+			m.put("zlc", c.getZlc());
+			m.put("jhnlc", c.getJhnlc());
+			m.put("jhwlc", c.getJhwlc());
+			m.put("jhnjcclc", c.getJhnjcclc());
+			m.put("jhwjcclc", c.getJhwjcclc());
+			m.put("jhwjcclc_z", c.getJhwjcclcz());
+			m.put("kfks", c.getKfks());
+			m.put("zrwjcclc", c.getZrwjcclc());
+			m.put("zrwjcclc1", c.getZrwjcclc1());
+			m.put("zrwjcclc2", c.getZrwjcclc2());
+			m.put("zrwjcclcqt", c.getZrwjcclcqt());
+			m.put("ljyy", c.getLjyy());
+			m.put("ljjcc", c.getLjjcc());
+			m.put("ljkfks", c.getLjkfks());
+			m.put("dhl", c.getDhl());
+			m.put("cdl", c.getCdl());
+			m.put("yhl", c.getYhl());
+			m.put("jzl", c.getJzl());
+			m.put("hyl", c.getYhl());
+			m.put("jhzlc", c.getJhzlc());
+			lMap.add(m);
+		}
+		
+		if(type.equals("export")){
+			SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+                    sdfSimple = new SimpleDateFormat("yyyyMMdd");
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("date", date);
+			m.put("date1", date2);
+			String xls="";
+//			String by=map.get("by").toString();
+
+			if(zt.equals("zbh")){
+				if(by.equals("sj")){
+					xls="countByBus1.xls";
+				}else{
+					xls="countByBus1s.xls";
+				}
+			}else{
+
+				if(by.equals("sj")){
+					xls="countByBus2.xls";
+				}else{
+					xls="countByBus2s.xls";
+				}
+			}
+			ReportUtils ee = new ReportUtils();
+			try {
+				String dateTime = "";
+				if(date.equals(date2)){
+					dateTime = sdfSimple.format(sdfMonth.parse(date));
+				} else {
+					dateTime = sdfSimple.format(sdfMonth.parse(date))
+							+"-"+sdfSimple.format(sdfMonth.parse(date2));
+				}
+				listI.add(lMap.iterator());
+				String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+				ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls,
+						path + "export/"+dateTime+"-"+xlName+"-路单数据统计表.xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
+		
+		return lMap;
+	}
+	
+	public CalcLineMileage addLineMileage(CalcLineMileage temp, CalcLineMileage c){
+		temp.setJhzlc(Arith.add(temp.getJhzlc()!=null?temp.getJhzlc():0, c.getJhzlc()));
+		temp.setJhlc(Arith.add(temp.getJhlc()!=null?temp.getJhlc():0, c.getJhlc()));
+		temp.setJcclc(Arith.add(temp.getJcclc()!=null?temp.getJcclc():0, c.getJcclc()));
+		temp.setSjzgl(Arith.add(temp.getSjzgl()!=null?temp.getSjzgl():0, c.getSjzgl()));
+		temp.setJhnlc(Arith.add(temp.getJhnlc()!=null?temp.getJhnlc():0, c.getJhnlc()));
+		temp.setJhwlc(Arith.add(temp.getJhwlc()!=null?temp.getJhwlc():0, c.getJhwlc()));
+		temp.setJhnjcclc(Arith.add(temp.getJhnjcclc()!=null?temp.getJhnjcclc():0, c.getJhnjcclc()));
+		temp.setJhwjcclc(Arith.add(temp.getJhwjcclc()!=null?temp.getJhwjcclc():0, c.getJhwjcclc()));
+		temp.setJhwjcclcz(Arith.add(temp.getJhwjcclcz()!=null?temp.getJhwjcclcz():0, c.getJhwjcclcz()));
+		temp.setZrwjcclc(Arith.add(temp.getZrwjcclc()!=null?temp.getZrwjcclc():0, c.getZrwjcclc()));
+		temp.setZrwjcclc1(Arith.add(temp.getZrwjcclc1()!=null?temp.getZrwjcclc1():0, c.getZrwjcclc1()));
+		temp.setZrwjcclc2(Arith.add(temp.getZrwjcclc2()!=null?temp.getZrwjcclc2():0, c.getZrwjcclc2()));
+		temp.setZrwjcclcqt(Arith.add(temp.getZrwjcclcqt()!=null?temp.getZrwjcclcqt():0, c.getZrwjcclcqt()));
+		temp.setKfks(Arith.add(temp.getKfks()!=null?temp.getKfks():0, c.getKfks()));
+		temp.setLbss(Arith.add(temp.getLbss()!=null?temp.getLbss():0, c.getLbss()));
+		temp.setSsglLz(Arith.add(temp.getSsglLz()!=null?temp.getSsglLz():0, c.getSsglLz()));
+		temp.setSsglDm(Arith.add(temp.getSsglDm()!=null?temp.getSsglDm():0, c.getSsglDm()));
+		temp.setSsglGz(Arith.add(temp.getSsglGz()!=null?temp.getSsglGz():0, c.getSsglGz()));
+		temp.setSsglJf(Arith.add(temp.getSsglJf()!=null?temp.getSsglJf():0, c.getSsglJf()));
+		temp.setSsglZs(Arith.add(temp.getSsglZs()!=null?temp.getSsglZs():0, c.getSsglZs()));
+		temp.setSsglQr(Arith.add(temp.getSsglQr()!=null?temp.getSsglQr():0, c.getSsglQr()));
+		temp.setSsglQc(Arith.add(temp.getSsglQc()!=null?temp.getSsglQc():0, c.getSsglQc()));
+		temp.setSsglKx(Arith.add(temp.getSsglKx()!=null?temp.getSsglKx():0, c.getSsglKx()));
+		temp.setSsglQh(Arith.add(temp.getSsglQh()!=null?temp.getSsglQh():0, c.getSsglQh()));
+		temp.setSsglYw(Arith.add(temp.getSsglYw()!=null?temp.getSsglYw():0, c.getSsglYw()));
+		temp.setSsglOther(Arith.add(temp.getSsglOther()!=null?temp.getSsglOther():0, c.getSsglOther()));
+		temp.setLjyy(Arith.add(temp.getLjyy()!=null?temp.getLjyy():0, c.getLjyy()));
+		temp.setLjjcc(Arith.add(temp.getLjjcc()!=null?temp.getLjjcc():0, c.getLjjcc()));
+		temp.setLjkfks(Arith.add(temp.getLjkfks()!=null?temp.getLjkfks():0, c.getLjkfks()));
+		return temp;
+	}
+
+	@Override
+	public List<List<String>> calcDetailMonthly(Map<String, Object> map) {
+		List<Integer> destroy= new ArrayList<>();
+		String destroyStr = "";
+		if(map.get("destroy")!=null){
+			destroyStr = map.get("destroy").toString().trim();
+			String[] destroys = destroyStr.split(",");
+			for (int i = 0; i < destroys.length; i++){
+				destroy.add(Integer.parseInt(destroys[i]));
+			}
+		}
+		List<String> gsdm= new ArrayList<>();
+		String gsdmStr = "";
+		if(map.get("gsdm")!=null){
+			gsdmStr = map.get("gsdm").toString().trim();
+			String[] gsdms = gsdmStr.split(",");
+			for (int i = 0; i < gsdms.length; i++){
+				gsdm.add(gsdms[i]);
+			}
+		}
+		List<String> fgsdm= new ArrayList<>();
+		String fgsdmStr = "";
+		if(map.get("fgsdm")!=null){
+			fgsdmStr = map.get("fgsdm").toString().trim();
+			String[] fgsdms = fgsdmStr.split(",");
+			for (int i = 0; i < fgsdms.length; i++){
+				fgsdm.add(fgsdms[i]);
+			}
+		}
+//		String line= null;
+		List<String> line= new ArrayList<>();
+		String lineStr = "";
+		if(map.get("lineCode")!=null){
+			lineStr = map.get("lineCode").toString().trim();
+			String[] lines = lineStr.split(",");
+			for (int i = 0; i < lines.length; i++){
+				line.add(lines[i]);
+			}
+		}
+		String startDate="";
+		if(map.get("startDate")!=null){
+			startDate=map.get("startDate").toString().trim();
+		}
+		String endDate="";
+		if(map.get("endDate")!=null){
+			endDate=map.get("endDate").toString().trim();
+		}
+		String type="";
+		if(map.get("type")!=null){
+			type=map.get("type").toString().trim();
+		}
+		String statisticalObj="";
+		if(map.get("statisticalObj")!=null){
+			statisticalObj=map.get("statisticalObj").toString().trim();
+		}
+		String itemDetails="";
+		if(map.get("itemDetails")!=null){
+			itemDetails=map.get("itemDetails").toString().trim();
+		}
+//		Boolean item=false;
+		/*String item="";
+		if(map.get("item")!=null){
+			if("dh".equals(map.get("item").toString().trim()))
+				item=" where c.sfdc = 1";
+//				item=false;
+			else if ("dh".equals(map.get("item").toString().trim()))
+				item=" where c.sfdc = 0";
+//				item=true;
+			else
+				item="";
+		}*/
+		String timeType=map.get("timeType").toString().trim();
+
+		List<List<String>> resList = new ArrayList<>();
+		List<CalcWaybill> list = new ArrayList<CalcWaybill>();
+//		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		// 右边可变天数
+		TreeMap<String, List<CalcWaybillDetail>> keyMapList = new TreeMap<String, List<CalcWaybillDetail>>();
+		// 左边固定列
+		TreeMap<String, CalcWaybillDetail> keyMap = new TreeMap<String, CalcWaybillDetail>();
+
+		List<Map<String, CalcWaybillDetail>> dayList = new ArrayList<>();
+		int day = 0, day2 = 0;
+		if("m".equals(timeType)){
+			day = Integer.parseInt(startDate.substring(8,10));
+			day2 = Integer.parseInt(endDate.substring(8,10));
+			for(int i=day; i<=day2; i++){
+				Map<String, CalcWaybillDetail> daym = new HashMap<>();
+				daym.put(startDate.substring(0,7)+"-"+(i<10?"0"+i:i),this.initCalcWaybillDetail());
+				dayList.add(daym);
+			}
+		} else if("y".equals(timeType)){
+			day = Integer.parseInt(startDate.substring(5,7));
+			day2 = Integer.parseInt(endDate.substring(5,7));
+			for(int i=day; i<=day2; i++){
+				Map<String, CalcWaybillDetail> daym = new HashMap<>();
+				daym.put(startDate.substring(0,5)+(i<10?"0"+i:i),this.initCalcWaybillDetail());
+				dayList.add(daym);
+			}
+			startDate += "-01";
+			endDate += "-31";
+		}
+
+		int flag = 0;
+		if("jsy".equals(statisticalObj)){
+			flag = 1;
+			list = calcRepository.scheduleByJsy2(line, startDate, endDate, gsdm, fgsdm, destroy);
+		} else if("cwy".equals(statisticalObj)){
+			flag = 2;
+			list = calcRepository.scheduleBySpy2(line, startDate, endDate, gsdm, fgsdm, destroy);
+		} else if("cl".equals(statisticalObj)){
+			flag = 3;
+			list = calcRepository.scheduleByZbh2(line, startDate, endDate, gsdm, fgsdm, destroy);
+		} else if("xl".equals(statisticalObj)){
+			flag = 4;
+			list = calcRepository.scheduleByDateAndLineTjPx(line,startDate,endDate,gsdm,fgsdm, destroy);
+			/*if(line.equals("")){
+				//查询所有线路
+			}else{
+				//查询单条线路
+				list = calcRepository.scheduleByDateAndLineTjPx2(line,startDate,endDate);
+			}*/
+		}
+
+
+		// List类转换
+		final List<CalcWaybillDetail> listNew = JSONArray.parseArray(JSON.toJSONString(list), CalcWaybillDetail.class);
+
+		if(listNew.size() <= 0){
+			return resList;
+		}
+		Map<String,Ylb> ylbMap = new HashMap<>();
+		Map<String,Ylb> ylbCLMap = new HashMap<>();
+		Map<String,Dlb> dlbMap = new HashMap<>();
+		Map<String,Dlb> dlbCLMap = new HashMap<>();
+
+        final SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd");
+
+		// 只有在选择 车辆，驾驶员查询时才有
+		// 把油量和电量数据查出来，封装成Map，计算时直接取
+		if(flag != 2 ){
+			String linesql="";
+			if(!lineStr.equals("")){
+				linesql +=" and xlbm in("+lineStr+") ";
+			}
+			if(!gsdmStr.equals("")){
+				linesql +=" and ssgsdm in("+gsdmStr+") ";
+			}
+			if(!fgsdmStr.equals("")){
+				linesql +=" and fgsdm in("+fgsdmStr+") ";
+			}
+			String ylsql="SELECT * FROM bsth_c_ylb"
+//			String ylsql="SELECT id,xlbm,nbbm,jsy,jzl,czyl,jzyl,yh,sh,fgsdm FROM bsth_c_ylb"
+					+ " WHERE rq >= '"+startDate+"' and rq <= '"+endDate+"' "
+					+ linesql;
+			String dlSal=  " SELECT * FROM bsth_c_dlb"
+//			String dlSal=  " SELECT id,xlbm,nbbm,jsy,cdl,czcd,jzcd,hd,sh,fgsdm FROM bsth_c_dlb"
+					+ " WHERE rq >= '"+startDate+"' and rq <= '"+endDate+"' "
+					+ linesql;
+			List<Ylb> ylbList = jdbcTemplate.query(ylsql, new RowMapper<Ylb>() {
+				@Override
+				public Ylb mapRow(ResultSet arg0, int arg1) throws SQLException{
+					Ylb ylb = new Ylb();
+                    Date rq = null;
+					try{
+                        rq = ft.parse(arg0.getString("rq"));
+                    } catch (ParseException e){
+					    logger.error(e.toString(),e);
+                    }
+//					Date rq = ft.parse(arg0.getString("rq"));
+					ylb.setXlbm(arg0.getString("xlbm"));
+					ylb.setJsy(arg0.getString("jsy"));
+					ylb.setJname(arg0.getString("jname"));
+					ylb.setNbbm(arg0.getString("nbbm"));
+					ylb.setZlc(Double.parseDouble(arg0.getString("zlc")));
+					ylb.setJzl(Double.parseDouble(arg0.getString("jzl")));
+					ylb.setJzyl(Double.parseDouble(arg0.getString("jzyl")));
+					ylb.setCzyl(Double.parseDouble(arg0.getString("czyl")));
+					ylb.setYh(Double.parseDouble(arg0.getString("yh")));
+					ylb.setSh(Double.parseDouble(arg0.getString("sh")));
+					ylb.setRylx(arg0.getString("rylx"));
+					ylb.setFgsdm(arg0.getString("fgsdm"));
+					ylb.setRq(rq);
+					return ylb;
+				}
+			});
+			List<Dlb> dlbList = jdbcTemplate.query(dlSal, new RowMapper<Dlb>() {
+				@Override
+				public Dlb mapRow(ResultSet arg0, int arg1) throws SQLException {
+					Dlb dlb = new Dlb();Date rq = null;
+                    try{
+                        rq = ft.parse(arg0.getString("rq"));
+                    } catch (ParseException e){
+                        logger.error(e.toString(),e);
+                    }
+					dlb.setXlbm(arg0.getString("xlbm"));
+					dlb.setJsy(arg0.getString("jsy"));
+					dlb.setJname(arg0.getString("jname"));
+					dlb.setNbbm(arg0.getString("nbbm"));
+					dlb.setZlc(Double.parseDouble(arg0.getString("zlc")));
+					dlb.setCdl(Double.parseDouble(arg0.getString("cdl")));
+					dlb.setJzcd(Double.parseDouble(arg0.getString("jzcd")));
+					dlb.setCzcd(Double.parseDouble(arg0.getString("czcd")));
+					dlb.setHd(Double.parseDouble(arg0.getString("hd")));
+					dlb.setSh(Double.parseDouble(arg0.getString("sh")));
+					dlb.setFgsdm(arg0.getString("fgsdm"));
+					dlb.setRq(rq);
+					return dlb;
+				}
+			});
+
+			for (Ylb y:ylbList) {
+			    if(ylbMap.containsKey(y.getRq().getTime()+"_"+y.getXlbm()+"_"+y.getJsy()+"_"+y.getNbbm())){
+                    Ylb yo = ylbMap.get(y.getRq().getTime()+"_"+y.getXlbm()+"_"+y.getJsy()+"_"+y.getNbbm());
+                    yo.setZlc(Arith.add(yo.getZlc(),y.getZlc()));
+                    yo.setCzyl(Arith.add(yo.getCzyl(),y.getCzyl()));
+                    yo.setJzyl(Arith.add(yo.getJzyl(),y.getJzyl()));
+                    yo.setJzl(Arith.add(yo.getJzl(),y.getJzl()));
+                    yo.setYh(Arith.add(yo.getYh(),y.getYh()));
+                } else
+				    ylbMap.put(y.getRq().getTime()+"_"+y.getXlbm()+"_"+y.getJsy()+"_"+y.getNbbm(),y);
+
+//				ylbMap.put(y.getRq().getTime()+"_"+y.getXlbm()+"_"+y.getJsy()+"_"+y.getJname()+"_"+y.getNbbm(),y);
+//				ylbCLMap.put(y.getRq().getTime()+"_"+y.getXlbm()+"_"+y.getNbbm(),y);
+			}
+			for (Dlb d:dlbList) {
+			    if(dlbMap.containsKey(d.getRq().getTime()+"_"+d.getXlbm()+"_"+d.getJsy()+"_"+d.getNbbm())){
+                    Dlb dold = dlbMap.get(d.getRq().getTime()+"_"+d.getXlbm()+"_"+d.getJsy()+"_"+d.getNbbm());
+                    dold.setZlc(Arith.add(dold.getZlc(),d.getZlc()));
+                    dold.setHd(Arith.add(dold.getHd(),d.getHd()));
+                    dold.setCzcd(Arith.add(dold.getCzcd(),d.getCzcd()));
+                    dold.setJzcd(Arith.add(dold.getJzcd(),d.getJzcd()));
+                    dold.setCdl(Arith.add(dold.getCdl(),d.getCdl()));
+                    dold.setHd(Arith.add(dold.getHd(),d.getHd()));
+                } else
+				    dlbMap.put(d.getRq().getTime()+"_"+d.getXlbm()+"_"+d.getJsy()+"_"+d.getNbbm(),d);
+//				dlbMap.put(d.getRq().getTime()+"_"+d.getXlbm()+"_"+d.getJsy()+"_"+d.getJname()+"_"+d.getNbbm(),d);
+//				dlbCLMap.put(d.getRq().getTime()+"_"+d.getXlbm()+"_"+d.getNbbm(),d);
+			}
+		}
+
+		CalcWaybillDetail zjCalc = this.initCalcWaybillDetail();
+		zjCalc.setjName("合计");
+		// 横向数据的第几天下标
+		int dayIndex = 0;
+		int dayIndexPrev = -1;
+		// 报表纵向列数据生成
+		for (int i = 0; listNew.size() > i; i++) {
+			CalcWaybillDetail cw = listNew.get(i);
+
+			CalcWaybillDetail cwNext = new CalcWaybillDetail();
+			if(i<listNew.size()-1){
+				cwNext = listNew.get(i+1);
+			}
+			String xl = cw.getXl();
+			String jsy = cw.getjGh();
+			String cwy = cw.getsGh();
+			String cl = cw.getCl();
+
+			Ylb y = new Ylb();
+			Dlb d = new Dlb();
+			// 统计类型不同统计的左边列不同
+			// 赋值油、电量
+			if(flag != 2){
+				// 取了之后删除，防止重复取，应为添加的时候已经合并了
+				y = ylbMap.get(cw.getRq().getTime()+"_"+cw.getXl()+"_"+cw.getjGh()+"_"+cw.getCl());
+				ylbMap.remove(cw.getRq().getTime()+"_"+cw.getXl()+"_"+cw.getjGh()+"_"+cw.getCl());
+				d = dlbMap.get(cw.getRq().getTime()+"_"+cw.getXl()+"_"+cw.getjGh()+"_"+cw.getCl());
+				dlbMap.remove(cw.getRq().getTime()+"_"+cw.getXl()+"_"+cw.getjGh()+"_"+cw.getCl());
+				if(y != null){
+					cw.setZlc(y.getZlc());
+					cw.setYh(y.getYh());
+					cw.setJzl(y.getJzl());
+					if("0".equals(y.getRylx())){
+						cw.setJzl0(y.getJzl());
+					}else if("1".equals(y.getRylx())){
+						cw.setJzl10(y.getJzl());
+					}
+					cw.setJzyl(y.getJzyl());
+					cw.setCzyl(y.getCzyl());
+					cw.setRylx(y.getRylx());
+					cw.setBglyh((y.getZlc()==0? 0:100*y.getYh()/y.getZlc()));
+				}
+				if(d != null) {
+					cw.setZlc(d.getZlc());
+					cw.setHd(d.getHd());
+					cw.setJzcd(d.getJzcd());
+					cw.setCzcd(d.getCzcd());
+					cw.setCdl(d.getCdl());
+					cw.setBglyh((d.getZlc()==0? 0:100*d.getHd()/d.getZlc()));
+				}
+			}
+
+			String key = "",keyNext = "";
+			if(flag == 1){
+				if(cw.getjGh() != null && cw.getjName() != null)
+					key += cw.getjGh() + "/" + cw.getjName();
+				if(cwNext.getjGh() != null && cwNext.getjName() != null)
+					keyNext += cwNext.getjGh() + "/" + cwNext.getjName();
+			} else if(flag == 2){
+				if(cw.getsGh() != null && cw.getsName() != null)
+					key += cw.getsGh() + "/" + cw.getsName();
+				if(cwNext.getsGh() != null && cwNext.getsName() != null)
+					keyNext += cwNext.getsGh() + "/" + cwNext.getsName();
+			} else if(flag == 3){
+				if(cw.getCl() != null)
+					key += cw.getCl();
+				if(cwNext.getCl() != null)
+					keyNext += cwNext.getCl();
+			}
+			key = cw.getFgsdm()+"/"+cw.getXl() + "/" + key;
+			keyNext = cw.getFgsdm()+"/"+cwNext.getXl() + "/" + keyNext;
+			CalcWaybillDetail calc = new CalcWaybillDetail();
+			List<CalcWaybillDetail> calcList = new ArrayList<>();
+			// 是否一行数据的第一个、生成key，calc为刚添加，不去和cw相加
+			boolean ifFirst = false;
+			if(keyMapList.containsKey(key)){
+				calc = keyMap.get(key);
+				calcList = keyMapList.get(key);
+			} else {
+				// 深度拷贝对象
+				BeanUtils.copyProperties(cw,calc);
+				keyMap.put(key, calc);
+				dayIndex = 0;
+                ifFirst = true;
+			}
+
+			CalcWaybillDetail dayc = null;
+			if("m".equals(timeType)){
+				while (!dayList.get(dayIndex).containsKey(cw.getRqStr())){
+					calcList.add(new CalcWaybillDetail());
+					dayIndex++;
+				}
+				dayc = dayList.get(dayIndex).get(cw.getRqStr());
+			} else if("y".equals(timeType)){
+				while (!dayList.get(dayIndex).containsKey(cw.getRqStr().substring(0,7))){
+					calcList.add(new CalcWaybillDetail());
+					dayIndex++;
+				}
+				dayc = dayList.get(dayIndex).get(cw.getRqStr().substring(0,7));
+			}
+
+
+			// 天数相加
+			this.summation(dayc, cw);
+			// 左边固定列数据相加
+			if(!ifFirst)
+				this.summation(calc, cw);
+			// 左边合计相加
+			this.summation(zjCalc, cw);
+
+
+            if(dayIndexPrev == dayIndex){
+				CalcWaybillDetail cwPrev = calcList.get(dayIndex);
+				this.summation(cwPrev, cw);
+			} else {
+				CalcWaybillDetail cwd = new CalcWaybillDetail();
+				// 深度拷贝对象
+				BeanUtils.copyProperties(cw,cwd);
+				calcList.add(cwd);
+				calc.setTs(calc.getTs()+1);
+				zjCalc.setTs(zjCalc.getTs()+1);
+			}
+
+			// 把下标
+			dayIndexPrev = dayIndex;
+            // timeType 为m 月报表时，日期不一样就换列，为y 年报表是，月份不一样换列
+			if("m".equals(timeType) && cwNext != null && key.equals(keyNext) && !cw.getRqStr().equals(cwNext.getRqStr())){
+				dayIndex++;
+			} else if("y".equals(timeType) && cwNext != null && key.equals(keyNext) && !cw.getRqStr().substring(0,7).equals(cwNext.getRqStr().substring(0,7))){
+				dayIndex++;
+			} else if(!key.equals(keyNext)){
+				// 满数据的不用补空格
+                while (dayList.size() > dayIndex+1){
+                    calcList.add(new CalcWaybillDetail());
+                    dayIndex++;
+                }
+                // 换列了从头开始，上一个下标赋值为初始
+				dayIndexPrev = -1;
+			}
+			// 右边可变列添加数据
+			keyMapList.put(key,calcList);
+		}
+
+		// 表头和数据
+		Iterator iter = keyMap.entrySet().iterator();
+
+		List<String> list1 = new ArrayList<>();
+		list1.add("序号");
+		list1.add("所属公司");
+		list1.add("线路");
+		if(flag==1 ||flag==2 ){
+			list1.add("工号");
+			list1.add("姓名");
+		} else if(flag==3){
+			list1.add("自编号");
+			list1.add("车牌号");
+			list1.add("燃油类型");
+		}
+		list1.add("计划公里");
+		list1.add("总公里");
+		list1.add("空驶公里");
+		list1.add("临加公里");
+		list1.add("烂班公里");
+		list1.add("m".equals(timeType)?"天数":"月数");
+		for(int i=day; i<=day2; i++){
+			list1.add((i<10?"0"+i:i)+("m".equals(timeType)?"日":"月"));
+		}
+		if("bgldh".equals(itemDetails) || "bglyh".equals(itemDetails)){
+			list1.add("平均");
+		} else
+			list1.add("合计");
+		resList.add(list1);
+
+		Map<String, String> carsMap = new HashMap<>();
+		List<Cars> carsList = carsRepository.findCars();
+		for (Cars c:carsList) {
+			String sfdc = c.getSfdc()+"";
+			carsMap.put(c.getInsideCode(), sfdc.equals("true")?"纯电动":"柴油");
+		}
+
+		int i=1;
+        DecimalFormat df = new DecimalFormat("0.00");//格式化小数
+		double allNum = 0.0;
+		while (iter.hasNext()) {
+			Map.Entry entry = (Map.Entry) iter.next();
+			// 获取key
+			String key = (String) entry.getKey();
+			// 获取value
+			CalcWaybillDetail c = (CalcWaybillDetail) entry.getValue();
+
+			List<CalcWaybillDetail> cList = keyMapList.get(key);
+
+			List<String> listStr = new ArrayList<>();
+			listStr.add(i+"");
+			i++;
+			listStr.add(c.getFgsname());
+			listStr.add(c.getXlName());
+			if("jsy".equals(statisticalObj)){
+				listStr.add(c.getjGh());
+				listStr.add(c.getjName());
+			} else if("cwy".equals(statisticalObj)){
+				listStr.add(c.getsGh());
+				listStr.add(c.getsName());
+			} else if("cl".equals(statisticalObj)){
+				listStr.add(c.getCl());
+				listStr.add(BasicData.nbbmCompanyPlateMap.get(c.getCl())+"");
+				listStr.add(carsMap.get(c.getCl()));
+			} else if("xl".equals(statisticalObj)){
+
+			}
+			listStr.add(df.format(c.getJhyylc()+c.getJhfyylc()));
+			listStr.add(df.format(c.getSjyylc()+c.getSjfyylc()+c.getLjyylc()+c.getLjfyylc()));
+//			listStr.add(df.format(c.getSjyylc()+c.getLjyylc()));
+			listStr.add(df.format(c.getSjfyylc()+c.getLjfyylc()));
+			listStr.add(df.format(c.getLjyylc()+c.getLjfyylc()));
+			listStr.add(df.format(c.getLblc()));
+			listStr.add(c.getTs()+"");
+			c.setBglhd(c.getBglhd()/c.getTs());
+			c.setBglyh(c.getBglyh()/c.getTs());
+			// 把列合计的数添加到最后一个
+			cList.add(c);
+			// DecimalFormat df = new DecimalFormat("0.00");//格式化小数
+            for (CalcWaybillDetail c1:cList) {
+                if(StringUtils.isEmpty(c1.getXl())) {
+                    listStr.add("");
+                } else{
+                    if("jzlAll".equals(itemDetails)){
+                        listStr.add(df.format(c1.getJzl()));
+                    }else if("jzl0".equals(itemDetails)){
+                        listStr.add(df.format(c1.getJzl0()));
+                    } else if("jzl-10".equals(itemDetails)){
+                        listStr.add(df.format(c1.getJzl10()));
+                    } else if("yhl".equals(itemDetails)){
+                        listStr.add(df.format(c1.getYh()));
+                    } else if("jccy".equals(itemDetails)){
+                        listStr.add(df.format(c1.getJzyl()));
+                    } else if("cccy".equals(itemDetails)){
+                        listStr.add(df.format(c1.getCzyl()));
+                    } else if("bglyh".equals(itemDetails)){
+                        listStr.add(df.format(c1.getZlc()==0? 0:100*c1.getYh()/c1.getZlc()));
+                    } else if("dh".equals(itemDetails)){
+                        listStr.add(df.format(c1.getHd()));
+                    }  else if("cdl".equals(itemDetails)){
+                        listStr.add(df.format(c1.getCdl()));
+                    } else if("cccd".equals(itemDetails)){
+                        listStr.add(df.format(c1.getCzcd()));
+                    } else if("jccd".equals(itemDetails)){
+                        listStr.add(df.format(c1.getJzcd()));
+                    } else if("bgldh".equals(itemDetails)){
+                        listStr.add(df.format(c1.getZlc()==0? 0:100*c1.getHd()/c1.getZlc()));
+//                        listStr.add(df.format(c1.getBglhd()));
+                    } else if("zgl".equals(itemDetails)){
+                        listStr.add(df.format((c1.getSjyylc()+c1.getSjfyylc()+c1.getLjfyylc()+c1.getLjyylc())));
+                    } else if("jhgl".equals(itemDetails)){
+                        listStr.add(df.format(c1.getJhyylc()+c1.getJhfyylc()));
+                    } else if("sjbc".equals(itemDetails)){
+                        listStr.add(c1.getSjyybc()+c1.getSjfyybc()+"");
+                    } else if("jhbc".equals(itemDetails)){
+                        listStr.add(c1.getJhyybc()+c1.getJhfyybc()+"");
+                    }
+                }
+            }
+			allNum = allNum + Double.parseDouble(listStr.get(listStr.size()-1));
+			resList.add(listStr);
+		}
+
+		// 合计列
+		List<String> listEnd = new ArrayList<>();
+		listEnd.add("合计");
+		listEnd.add(df.format(zjCalc.getJhyylc()+zjCalc.getJhfyylc()));
+		listEnd.add(df.format(zjCalc.getSjfyylc()+zjCalc.getSjyylc()+zjCalc.getLjyylc()+zjCalc.getLjfyylc()));//总公里
+//		listEnd.add(df.format(zjCalc.getSjyylc()+zjCalc.getLjyylc()));//营运
+		listEnd.add(df.format(zjCalc.getSjfyylc()+zjCalc.getLjfyylc()));
+		listEnd.add(df.format(zjCalc.getLjfyylc()+zjCalc.getLjyylc()));
+		listEnd.add(df.format(zjCalc.getLblc()));
+		listEnd.add(zjCalc.getTs()+"");
+		double all = 0.0;
+		for (Map<String, CalcWaybillDetail> cmap:dayList) {
+			for (Map.Entry<String, CalcWaybillDetail> cw : cmap.entrySet()) {
+//				System.out.println("key = " + cw.getKey() + ", value = " + cw.getValue());
+				CalcWaybillDetail c1 = cw.getValue();
+				if("jzlAll".equals(itemDetails)){
+					listEnd.add(df.format(c1.getJzl()));
+				} else if("jzl0".equals(itemDetails)){
+					listEnd.add(df.format(c1.getJzl0()));
+				} else if("jzl-10".equals(itemDetails)){
+					listEnd.add(df.format(c1.getJzl10()));
+				} else if("yhl".equals(itemDetails)){
+					listEnd.add(df.format(c1.getYh()));
+				} else if("jccy".equals(itemDetails)){
+					listEnd.add(df.format(c1.getJzyl()));
+				} else if("cccy".equals(itemDetails)){
+					listEnd.add(df.format(c1.getCzyl()));
+				} else if("bglyh".equals(itemDetails)){
+					listEnd.add(df.format(c1.getZlc()==0? 0:100*c1.getYh()/c1.getZlc()));
+				} else if("dh".equals(itemDetails)){
+					listEnd.add(df.format(c1.getHd()));
+				}  else if("cdl".equals(itemDetails)){
+					listEnd.add(df.format(c1.getCdl()));
+				} else if("cccd".equals(itemDetails)){
+					listEnd.add(df.format(c1.getCzcd()));
+				} else if("jccd".equals(itemDetails)){
+					listEnd.add(df.format(c1.getJzcd()));
+				} else if("bgldh".equals(itemDetails)){
+//					listEnd.add(df.format(c1.getBglhd()));
+					listEnd.add(df.format(c1.getZlc()==0? 0:100*c1.getHd()/c1.getZlc()));
+				} else if("zgl".equals(itemDetails)){
+					listEnd.add((df.format(c1.getSjyylc()+c1.getSjfyylc()+c1.getLjfyylc()+c1.getLjyylc())));
+				} else if("jhgl".equals(itemDetails)){
+					listEnd.add((df.format(c1.getJhyylc()+c1.getJhfyylc())));
+				} else if("sjbc".equals(itemDetails)){
+					listEnd.add(c1.getSjyybc()+c1.getSjfyybc()+"");
+				} else if("jhbc".equals(itemDetails)){
+					listEnd.add((c1.getJhyybc()+c1.getJhfyybc())+"");
+				}
+			}
+			all = all + Double.parseDouble(listEnd.get(listEnd.size()-1));
+		}
+
+		// 百公里电油耗时为平均数
+		if("bgldh".equals(itemDetails) || "bglyh".equals(itemDetails)){
+			allNum = allNum/keyMap.size();
+			all = all/dayList.size();
+		}
+//		listEnd.add(df.format(allNum)+"/"+df.format(all));
+		listEnd.add(df.format(all));
+		resList.add(listEnd);
+
+		return resList;
+	}
+
+	public CalcWaybillDetail initCalcWaybillDetail(){
+		CalcWaybillDetail calc = new CalcWaybillDetail();
+		calc.setJhyybc(0);
+		calc.setJhyylc(0d);
+		calc.setJhfyybc(0);
+		calc.setJhfyylc(0d);
+		calc.setSjyybc(0);
+		calc.setSjyylc(0d);
+		calc.setSjfyybc(0);
+		calc.setSjfyylc(0d);
+		calc.setLbbc(0);
+		calc.setLblc(0d);
+		calc.setLjbc(0);
+		calc.setLjyylc(0d);
+		calc.setZlc(0d);
+		calc.setCzyl(0d);
+		calc.setJzyl(0d);
+		calc.setJzl(0d);
+		calc.setJzl0(0d);
+		calc.setJzl10(0d);
+		calc.setYh(0d);
+		calc.setCzcd(0d);
+		calc.setJzcd(0d);
+		calc.setCdl(0d);
+		calc.setHd(0d);
+		calc.setTs(0);
+		return calc;
+	}
+
+	public CalcWaybillDetail summation(CalcWaybillDetail c1, CalcWaybillDetail c2){
+		c1.setJhyybc(c1.getJhyybc() + c2.getJhyybc());
+		c1.setJhyylc(Arith.add(c1.getJhyylc(), c2.getJhyylc()));
+		c1.setJhfyybc(c1.getJhfyybc() + c2.getJhfyybc());
+		c1.setJhfyylc(Arith.add(c1.getJhfyylc(), c2.getJhfyylc()));
+		c1.setSjyybc(c1.getSjyybc() + c2.getSjyybc());
+		c1.setSjyylc(Arith.add(c1.getSjyylc(), c2.getSjyylc()));
+//		c1.setSjyylc(Arith.add(c1.getSjyylc(), c2.getLjyylc()));// 把临加的也算上了，后面不用加了
+		c1.setSjfyybc(c1.getSjfyybc() + c2.getSjfyybc());
+		c1.setSjfyylc(Arith.add(c1.getSjfyylc(), c2.getSjfyylc()));
+//		c1.setSjfyylc(Arith.add(c1.getSjfyylc(), c2.getLjfyylc()));// 把临加的也算上了，后面不用加了
+		c1.setLbbc(c1.getLbbc() + c2.getLbbc());
+		c1.setLblc(Arith.add(c1.getLblc(), c2.getLblc()));
+		c1.setLjbc(c1.getLjbc() + c2.getLjbc());
+		c1.setLjyylc(Arith.add(c1.getLjyylc(), c2.getLjyylc()));
+		c1.setLjfyylc(Arith.add(c1.getLjfyylc(), c2.getLjfyylc()));
+		c1.setZlc(Arith.add(c1.getZlc(),c2.getZlc()));
+		c1.setCzyl(Arith.add(c1.getCzyl(),c2.getCzyl()));
+		c1.setJzyl(Arith.add(c1.getJzyl(),c2.getJzyl()));
+		c1.setJzl(Arith.add(c1.getJzl(),c2.getJzl()));
+		c1.setJzl0(Arith.add(c1.getJzl0(),c2.getJzl0()));
+		c1.setJzl10(Arith.add(c1.getJzl10(),c2.getJzl10()));
+		c1.setYh(Arith.add(c1.getYh(),c2.getYh()));
+		c1.setHd(Arith.add(c1.getHd(),c2.getHd()));
+		c1.setCzcd(Arith.add(c1.getCzcd(),c2.getCzcd()));
+		c1.setJzcd(Arith.add(c1.getJzcd(),c2.getJzcd()));
+		c1.setCdl(Arith.add(c1.getCdl(),c2.getCdl()));
+		c1.setTs(c1.getTs()+c2.getTs());
+//		c1.setDtbc(c1.getDtbc() + c2.getDtbc());
+		return c1;
+	}
+}
+
+class AccountXlbmByping implements Comparator<Map<String, Object>> {
+    @Override
+    public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+        // TODO Auto-generated method stub
+//		 PinyinHelper.convertToPinyinString(ppy.getName(),
+//		 "" , PinyinFormat.WITHOUT_TONE)
+        return o1.get("xlNamePy").toString().compareTo(
+                o2.get("xlNamePy").toString());
+    }
+}