LGF

娄高锋
1 parent 22cdb082
Showing 3 changed files with 40 additions and 8 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/resources/static/pages/forms/mould/statisticsDaily_.xls
src/main/resources/static/pages/forms/statement/lbStatuAnaly.html
@@ -1393,8 +1393,14 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		String[] date1 = startDate.split("-");
 		String[] date2 = endDate.split("-");
-		startDate = date1[0] + "年" + date1[1] + "月" + date1[2] + "日";
-		endDate = date2[0] + "年" + date2[1] + "月" + date2[2] + "日";
+//		startDate = date1[0] + "年" + date1[1] + "月" + date1[2] + "日";
+//		endDate = date2[0] + "年" + date2[1] + "月" + date2[2] + "日";
+		String Date = "";
+		if(startDate.equals(endDate))
+			Date = date1[0] + "年" + date1[1] + "月" + date1[2] + "日";
+		else
+			Date = date1[0] + "年" + date1[1] + "月" + date1[2] + "日"
+				 + date2[0] + "年" + date2[1] + "月" + date2[2] + "日";
 		String[] split = times.split("-");
 		int startTime = Integer.valueOf(split[0].split(":")[0])*60 + Integer.valueOf(split[0].split(":")[1]);
@@ -1472,10 +1478,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					}
 				}
 			}
-			if(startDate.equals(endDate))
-				tempMap.put("date", startDate);
-			else
-				tempMap.put("date", startDate + "--" + endDate);
+			tempMap.put("date", Date);
 			tempMap.put("company", companyName);
 			tempMap.put("subCompany", subCompanyName);
 			tempMap.put("times", times);
@@ -1523,6 +1526,24 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			resList.add(tempMap);
 		}
+		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>();
+			ReportUtils ee = new ReportUtils();
+			try {
+				listI.add(resList.iterator());
+				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+				ee.excelReplace(listI, new Object[] { m }, path+"mould/lbStatuAnaly.xls",
+						path+"export/烂班情况分析表" + sdfSimple.format(sdfMonth.parse(startDate)) 
+						+ "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
+		
 		return resList;
 	}
@@ -257,8 +257,19 @@
 		}
 		$("#export").on("click", function(){
-			$get('/pcpc/workDaily',{line:line,date:date,type:'export'},function(result){
-				window.open("/downloadFile/download?fileName=营运服务日报表"+moment(date).format("YYYYMMDD"));
+			var params = {};
+			params['line'] = line;
+			params['startDate'] = startDate;
+			params['endDate'] = endDate;
+			params['model'] = model;
+			params['times'] = times;
+			params['company'] = company;
+			params['subCompany'] = subCompany;
+			params['type'] = "export";
+			$get('/busInterval/lbStatuAnaly', params, function(result){
+				window.open("/downloadFile/download?fileName=烂班情况分析表"
+							+ moment(startDate).format("YYYYMMDD"))
+						+"-"+ moment(endDate).format("YYYYMMDD");
 			});
 		});