统一导出的excel表名

娄高锋
1 parent 6e357b38
Showing 5 changed files with 14 additions and 9 deletions
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/forms/statement/correctForm.html
src/main/resources/static/pages/report/inoutstation.html
@@ -53,6 +53,7 @@ public class ReportController {
 			Map<String, Object> m = new HashMap<String, Object>();
 			m.put("i", i);
 			m.put("nbbm", a.getNbbm());
+			m.put("pzh", a.getPzh());
 			m.put("stopName", a.getStopName());
 			m.put("jzsj", a.getJzsj());
 			m.put("czsj", a.getCzsj());
@@ -118,8 +119,7 @@ public class ReportController {
 			@RequestParam String zdlx,@RequestParam String fcsj,@RequestParam String ddsj){
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
 		ReportUtils ee = new ReportUtils();
-//		List<ArrivalInfo> list=service.queryListClzd(line,zd,zdlx,fcsj,ddsj);
-		List<ArrivalInfo> list = new ArrayList<ArrivalInfo>();
+		List<ArrivalInfo> list=service.queryListClzd(line,zd,zdlx,fcsj,ddsj);
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		int i=1;
 		for (ArrivalInfo a:list ) {
@@ -2226,10 +2226,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                  tempList.add(tempMap);
              }
              try {
+            	 String dateTime = sdfSimple.format(sdfMonth.parse(date));
+            	 String lineName = BasicData.lineCode2NameMap.get(line);
                  listI.add(tempList.iterator());
                  String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
                  ee.excelReplace(listI, new Object[]{m}, path + "mould/correctForm.xls",
-                         path + "export/修正报表" + date+ ".xls");
+                         path + "export/" + dateTime + "-" + lineName + "-修正报表.xls");
              } catch (Exception e) {
                  // TODO: handle exception
                  e.printStackTrace();
@@ -229,7 +229,7 @@ public class ReportServiceImpl implements ReportService{
 	public List<ArrivalInfo> load2(String line,Long date1,Long date2,Date dates1,Date dates2,String zd,String zdlx,String fcsj){
-		List<ArrivalInfo> list = null;
+		List<ArrivalInfo> list = new ArrayList<ArrivalInfo>();
 		Calendar cal = Calendar.getInstance();
 		cal.setTime(dates1);
 		//周数，表分区字段
@@ -249,9 +249,9 @@
                 /* var list_correctForm_statistics = template('list_correctForm_statistics',temp);
                 $('#forms .list_correctForm_statistics').html(list_correctForm_statistics); */
-                if(result.length == 0)
-					$("#export").attr('disabled',"true");
-				else
+//                 if(result.length == 0)
+// 					$("#export").attr('disabled',"true");
+// 				else
 					$("#export").removeAttr("disabled");
 		    });
@@ -260,7 +260,10 @@
 		$("#export").on("click",function(){
 			var type = "export";
 			$get('/realSchedule/correctForm',{line:line,date:date,endDate:endDate,lpName:lpName,code:code,type:type,changType:changType},function(result){
-				window.open("/downloadFile/download?fileName=修正报表"+date);
+				
+				window.open("/downloadFile/download?fileName="
+						+moment(date).format("YYYYMMDD")
+						+"-"+date+"-修正报表");
 			});
 		});
@@ -485,7 +485,7 @@
 			}else{
 				$get('/report/exportQueryListZdxx',{clzbh:nbbm,date:rq,line:line,fcsj:fcsj,ddsj:ddsj},function(result){
 					window.open("/downloadFile/download?fileName="
-							+moment(date).format("YYYYMMDD")
+							+moment(rq).format("YYYYMMDD")
 							+"-"+pzh+"-班次到离站");
 				});
 			}