时刻表分析导出优化

娄高锋
1 parent cb8fc807
Showing 4 changed files with 30 additions and 30 deletions
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
src/main/java/com/bsth/util/ReportUtils.java
src/main/resources/static/pages/forms/mould/scheduleAnaly.xls
@@ -101,12 +101,17 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
  
 	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() - (4 * 1000 * 60 * 60 * 24));
-			date = sdf.format(d);
+			d.setTime(d.getTime() - (4l * 1000 * 60 * 60 * 24));
+			for(long i = 0; i < 3; i++){
+				d.setTime(d.getTime() + (i * 1000 * 60 * 60 * 24));
+				dateList.add(sdf.format(d));
+			}
 		} else {
 			date = date.trim();
+			dateList.add(date);
 		}
 		if(line == null || line.trim().length() == 0){
 			line = "";
@@ -115,26 +120,28 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		}
  
 		Map<String, Object> m = new HashMap<String, Object>();
-		try {
-			Map<String, Object> generateNew = generateNew(date, line);
-			m.put("generateNew", generateNew);
-		} catch (Exception e) {
-			// TODO: handle exception
-			logger.info("重新统计保存失败！");
-		}
-		try {
-			Map<String, Object> calcLineMileage = calcLineMileage(date, line);
-			m.put("lineMileage", calcLineMileage);
-		} catch (Exception e) {
-			// TODO: handle exception
-			logger.info("线路公里审计保存失败！");
-		}
-		try {
-			Map<String, Object> calcBusMileage = calcBusMileage(date, line);
-			m.put("busMileage", calcBusMileage);
-		} catch (Exception e) {
-			// TODO: handle exception
-			logger.info("路单数据审计保存失败！");
+		for(String d : dateList){
+			try {
+				Map<String, Object> generateNew = generateNew(d, line);
+				m.put("generateNew", generateNew);
+			} catch (Exception e) {
+				// TODO: handle exception
+				logger.info("重新统计保存失败！");
+			}
+			try {
+				Map<String, Object> calcLineMileage = calcLineMileage(d, line);
+				m.put("lineMileage", calcLineMileage);
+			} catch (Exception e) {
+				// TODO: handle exception
+				logger.info("线路公里审计保存失败！");
+			}
+			try {
+				Map<String, Object> calcBusMileage = calcBusMileage(d, line);
+				m.put("busMileage", calcBusMileage);
+			} catch (Exception e) {
+				// TODO: handle exception
+				logger.info("路单数据审计保存失败！");
+			}
 		}
  
 		return m;
@@ -867,13 +867,6 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
  
 		//导出
 		if(type.equals("export")){
-			for(Map<String, Object> m : resList){
-				if(m.get("lp") != null){
-					if(m.get("lp").toString().contains("+") || m.get("lp").toString().contains("-")){
-						m.put("lp", "\'" + m.get("lp").toString().trim());
-					}
-				}
-			}
 			String lineName = "";
 			if(map.containsKey("lineName"))
 				lineName = map.get("lineName").toString();
@@ -603,7 +603,7 @@ public class ReportUtils {
 		for (Iterator<Cell> cellIt = fromRow.cellIterator(); cellIt.hasNext();) {
 			HSSFCell tmpCell = (HSSFCell) cellIt.next();
 			HSSFCell newCell = toRow.createCell(tmpCell.getColumnIndex(), 0);
-			copyCell(wb, tmpCell, newCell, copyValueFlag, style);
+			copyCell(wb, tmpCell, newCell, copyValueFlag, tmpCell.getCellStyle());
 		}
 	}