LGF 导出报错修改

娄高锋
1 parent 03466fc6
Showing 8 changed files with 65 additions and 20 deletions
src/main/java/com/bsth/controller/DownloadController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/PeopleCarPlanServiceImpl.java
src/main/resources/static/pages/forms/mould/account.xls
src/main/resources/static/pages/forms/mould/historyMessage.xls
src/main/resources/static/pages/forms/statement/correctForm.html
@@ -2,6 +2,7 @@ package com.bsth.controller;
 import java.io.File;  
 import java.io.IOException;  
+import java.net.URLDecoder;
 import org.apache.commons.io.FileUtils;
 import org.springframework.context.annotation.Scope;  
@@ -35,7 +36,7 @@ public class DownloadController
         File file=new File(moudelPath);  
         HttpHeaders headers = new HttpHeaders();    
         String realFileName=new String(fileName.getBytes("UTF-8"),"iso-8859-1");//为了解决中文名称乱码问题  
-        headers.setContentDispositionFormData("attachment", realFileName);   
+        headers.setContentDispositionFormData("attachment", URLDecoder.decode(realFileName,"utf-8"));   
         headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);   
         return new ResponseEntity<byte[]>(FileUtils.readFileToByteArray(file),    
                                           headers, HttpStatus.CREATED);    
@@ -338,8 +338,8 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	@RequestMapping(value = "/correctForm")
 	public List<ScheduleRealInfo> correctForm(@RequestParam String line, @RequestParam String startDate,
-			@RequestParam String endDate,@RequestParam String lpName,@RequestParam String code) {
-		return scheduleRealInfoService.correctForm(line, startDate, endDate, lpName, code);
+			@RequestParam String endDate, @RequestParam String lpName, @RequestParam String code, @RequestParam String type) {
+		return scheduleRealInfoService.correctForm(line, startDate, endDate, lpName, code, type);
 	}
 	/**
 	 * @Title queryListWaybill
@@ -95,7 +95,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<Map<String,Object>> account(String line,String date,String code,String xlName, String type);
-	List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName,String code);
+	List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName,String code, String type);
 	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date,String type);
@@ -46,6 +46,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import java.net.URLEncoder;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -1302,8 +1303,28 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	@Override
 	public List<ScheduleRealInfo> correctForm(String line, String startDate,
-			String endDate, String lpName, String code) {
+			String endDate, String lpName, String code, String type) {
 		List<ScheduleRealInfo> list = scheduleRealInfoRepository.correctForm(line,startDate,endDate,lpName,code);
+		
+		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();
+			m.put("startDate", startDate);
+			m.put("endDate", endDate);
+			try {
+				listI.add(list.iterator());
+				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
+				ee.excelReplace(listI, new Object[] { m }, path+"mould\\correctForm.xls",
+						path+"export\\" + URLEncoder.encode("修正报表", "UTF-8") + sdfSimple.format(sdfMonth.parse(startDate)) + "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
+		
 		return list;
 	}
 package com.bsth.service.schedule;
 import java.math.BigDecimal;
+import java.net.URLEncoder;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.DecimalFormat;
@@ -463,7 +464,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				listI.add(resList.iterator());
 				String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
 				ee.excelReplace(listI, new Object[] { m }, path+"mould\\workDaily.xls",
-						path+"export\\营运服务日报表" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+						path+"export\\营运服务日报表"+ sdfSimple.format(sdfMonth.parse(date))+".xls");
 			} catch (Exception e) {
 				// TODO: handle exception
 				e.printStackTrace();
@@ -937,7 +938,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				tempMap.put("sjfcFirst0", "/");
 				tempMap.put("delayFirst0", "/");
 			}
-			if(moban0.getZdsjActual() != null){
+			if(moban0.getFcsjActual() != null){
 				String[] split = moban0.getFcsjActual().split(":");
 				long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
 				long delay = moban0.getFcsjT() - min;
@@ -963,7 +964,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				tempMap.put("sjfcFirst1", "/");
 				tempMap.put("delayFirst1", "/");
 			}
-			if(moban1.getZdsjActual() != null){
+			if(moban1.getFcsjActual() != null){
 				String[] split = moban1.getFcsjActual().split(":");
 				long min = Integer.valueOf(split[0])*60 + Integer.valueOf(split[1]);
 				long delay = moban1.getFcsjT() - min;
@@ -67,7 +67,8 @@
 								<td rowspan="2">线路名</td>
 								<td rowspan="2">路牌</td>
 								<td rowspan="2">车号</td>
-								<td colspan="2">车号</td>
+								<td rowspan="2">司机</td>
+								<td rowspan="2">售票员</td>
 								<td colspan="2">发车时间</td>
 								<td colspan="2">结束时间</td>
 								<td rowspan="2">修改人</td>
@@ -75,8 +76,6 @@
 								<td rowspan="2">备注</td>
 							</tr>
 							<tr>
-								<td>司机</td>
-								<td>售票员</td>
 								<td>计划</td>
 								<td>实际</td>
 								<td>计划</td>
@@ -97,7 +96,10 @@
 </div>
 <script>
-	$(function(){
+	$(function(){
+		$("#export").attr('disabled',"true");
+		
+		
 		// 关闭左侧栏
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
@@ -196,14 +198,20 @@
                }
             }
         });
-		
+
+	    var line = $("#line").val();
+	    var startDate = $("#startDate").val();
+	    var endDate = $("#endDate").val();
+	    var lpName = $("#lpName").val();
+	    var code = $("#code").val();
 		$("#query").on("click",function(){
-		    var line = $("#line").val();
-		    var startDate = $("#startDate").val();
-		    var endDate = $("#endDate").val();
-		    var lpName = $("#lpName").val();
-		    var code = $("#code").val();
-		    $post("/realSchedule/correctForm",{line:line,startDate:startDate,endDate:endDate,lpName:lpName,code:code},function(result){
+		    line = $("#line").val();
+		    startDate = $("#startDate").val();
+		    endDate = $("#endDate").val();
+		    lpName = $("#lpName").val();
+		    code = $("#code").val();
+		    var type = "query";
+		    $post("/realSchedule/correctForm",{line:line,startDate:startDate,endDate:endDate,lpName:lpName,code:code,type:type},function(result){
 		        $("#sDate").text(startDate);
 		        $("#eDate").text(endDate);
 		        var temp = {};
@@ -228,8 +236,22 @@
                 /* 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
+					$("#export").removeAttr("disabled");
+                
 		    });
-		});
+		});
+		
+		$("#export").on("click",function(){
+			var type = "export";
+			$get('/realSchedule/correctForm',{line:line,startDate:startDate,endDate:endDate,lpName:lpName,code:code,type:type},function(result){
+				window.open("/downloadFile/download?fileName=修正报表"+moment(startDate).format("YYYYMMDD")+"-"+moment(endDate).format("YYYYMMDD"));
+			});
+		});
+		
 	});
 </script>
 <script type="text/html" id="list_correctForm">